| Index: media/filters/vpx_video_decoder.cc
|
| diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
|
| index 13b7e7a18ebb861703cc679f04ca2304ba42ed55..35f889bb64a5b3a9daeebccc3530c4adcdf7226d 100644
|
| --- a/media/filters/vpx_video_decoder.cc
|
| +++ b/media/filters/vpx_video_decoder.cc
|
| @@ -225,7 +225,7 @@ void VpxVideoDecoder::DoDecryptOrDecodeBuffer(
|
| const scoped_refptr<DecoderBuffer>& buffer) {
|
| DCHECK(message_loop_->BelongsToCurrentThread());
|
| DCHECK_NE(state_, kDecodeFinished);
|
| - DCHECK_EQ(status != DemuxerStream::kOk, !buffer) << status;
|
| + DCHECK_EQ(status != DemuxerStream::kOk, !buffer.get()) << status;
|
|
|
| if (state_ == kUninitialized)
|
| return;
|
| @@ -256,7 +256,7 @@ void VpxVideoDecoder::DecodeBuffer(
|
| DCHECK_NE(state_, kError);
|
| DCHECK(reset_cb_.is_null());
|
| DCHECK(!read_cb_.is_null());
|
| - DCHECK(buffer);
|
| + DCHECK(buffer.get());
|
|
|
| // Transition to kDecodeFinished on the first end of stream buffer.
|
| if (state_ == kNormal && buffer->IsEndOfStream()) {
|
| @@ -280,7 +280,7 @@ void VpxVideoDecoder::DecodeBuffer(
|
| }
|
|
|
| // If we didn't get a frame we need more data.
|
| - if (!video_frame) {
|
| + if (!video_frame.get()) {
|
| ReadFromDemuxerStream();
|
| return;
|
| }
|
| @@ -395,26 +395,26 @@ void VpxVideoDecoder::CopyVpxImageTo(
|
| CopyYPlane(vpx_image->planes[VPX_PLANE_Y],
|
| vpx_image->stride[VPX_PLANE_Y],
|
| vpx_image->d_h,
|
| - *video_frame);
|
| + video_frame->get());
|
| CopyUPlane(vpx_image->planes[VPX_PLANE_U],
|
| vpx_image->stride[VPX_PLANE_U],
|
| vpx_image->d_h / 2,
|
| - *video_frame);
|
| + video_frame->get());
|
| CopyVPlane(vpx_image->planes[VPX_PLANE_V],
|
| vpx_image->stride[VPX_PLANE_V],
|
| vpx_image->d_h / 2,
|
| - *video_frame);
|
| + video_frame->get());
|
| if (!vpx_codec_alpha_)
|
| return;
|
| if (!vpx_image_alpha) {
|
| - MakeOpaqueAPlane(vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h,
|
| - *video_frame);
|
| + MakeOpaqueAPlane(
|
| + vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
|
| return;
|
| }
|
| CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
|
| vpx_image->stride[VPX_PLANE_Y],
|
| vpx_image->d_h,
|
| - *video_frame);
|
| + video_frame->get());
|
| }
|
|
|
| } // namespace media
|
|
|