Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1171)

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 9cd6e62808a4ea00d3c301f11bc3c27ad4c72f1f..1ab2bfef702dda8cd094eb8dedcf525458d6a2b2 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -233,7 +233,7 @@ void FFmpegVideoDecoder::BufferReady(
DCHECK(message_loop_->BelongsToCurrentThread());
DCHECK_NE(state_, kDecodeFinished);
DCHECK_NE(state_, kError);
- DCHECK_EQ(status != DemuxerStream::kOk, !buffer) << status;
+ DCHECK_EQ(status != DemuxerStream::kOk, !buffer.get()) << status;
if (state_ == kUninitialized)
return;
@@ -264,7 +264,7 @@ void FFmpegVideoDecoder::DecodeBuffer(
DCHECK_NE(state_, kError);
DCHECK(reset_cb_.is_null());
DCHECK(!read_cb_.is_null());
- DCHECK(buffer);
+ DCHECK(buffer.get());
// During decode, because reads are issued asynchronously, it is possible to
// receive multiple end of stream buffers since each read is acked. When the
@@ -313,7 +313,7 @@ void FFmpegVideoDecoder::DecodeBuffer(
statistics_cb_.Run(statistics);
}
- if (!video_frame) {
+ if (!video_frame.get()) {
if (state_ == kFlushCodec) {
DCHECK(buffer->IsEndOfStream());
state_ = kDecodeFinished;
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698