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

Unified Diff: media/filters/opus_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/gpu_video_decoder.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/opus_audio_decoder.cc
diff --git a/media/filters/opus_audio_decoder.cc b/media/filters/opus_audio_decoder.cc
index 548289d193fa1aae6fbf4319edc8b36acfe7cf5e..e725ee7fbf7e39994a2e2c45ba9dacc1b834ff15 100644
--- a/media/filters/opus_audio_decoder.cc
+++ b/media/filters/opus_audio_decoder.cc
@@ -329,16 +329,16 @@ void OpusAudioDecoder::BufferReady(
const scoped_refptr<DecoderBuffer>& input) {
DCHECK(message_loop_->BelongsToCurrentThread());
DCHECK(!read_cb_.is_null());
- 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());
DVLOG(1) << "Config changed.";
if (!ConfigureDecoder()) {
@@ -352,7 +352,7 @@ void OpusAudioDecoder::BufferReady(
}
DCHECK_EQ(status, DemuxerStream::kOk);
- DCHECK(input);
+ DCHECK(input.get());
// Libopus does not buffer output. Decoding is complete when an end of stream
// input buffer is received.
@@ -390,7 +390,7 @@ void OpusAudioDecoder::BufferReady(
return;
}
- if (output_buffer) {
+ if (output_buffer.get()) {
// Execute callback to return the decoded audio.
base::ResetAndReturn(&read_cb_).Run(kOk, output_buffer);
} else {
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698