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

Unified Diff: media/filters/ffmpeg_audio_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/fake_video_decoder_unittest.cc ('k') | media/filters/ffmpeg_audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_audio_decoder.cc
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index b927e1ecc40b60d4d42cb664d641d9f455b85c85..6ec4483120217a3f3c2d65312d9f479b329c2069 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -144,16 +144,16 @@ void FFmpegAudioDecoder::BufferReady(
DCHECK(message_loop_->BelongsToCurrentThread());
DCHECK(!read_cb_.is_null());
DCHECK(queued_audio_.empty());
- DCHECK_EQ(status != DemuxerStream::kOk, !input) << status;
+ DCHECK_EQ(status != DemuxerStream::kOk, !input.get()) << status;
if (status == DemuxerStream::kAborted) {
- DCHECK(!input);
+ DCHECK(!input.get());
base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
return;
}
if (status == DemuxerStream::kConfigChanged) {
- DCHECK(!input);
+ DCHECK(!input.get());
// Send a "end of stream" buffer to the decode loop
// to output any remaining data still in the decoder.
@@ -180,7 +180,7 @@ void FFmpegAudioDecoder::BufferReady(
}
DCHECK_EQ(status, DemuxerStream::kOk);
- DCHECK(input);
+ DCHECK(input.get());
// Make sure we are notified if http://crbug.com/49709 returns. Issue also
// occurs with some damaged files.
@@ -491,7 +491,7 @@ void FFmpegAudioDecoder::RunDecodeLoop(
output = DataBuffer::CreateEOSBuffer();
}
- if (output) {
+ if (output.get()) {
QueuedAudioBuffer queue_entry = { kOk, output };
queued_audio_.push_back(queue_entry);
}
« no previous file with comments | « media/filters/fake_video_decoder_unittest.cc ('k') | media/filters/ffmpeg_audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698