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

Unified Diff: media/filters/decrypting_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
Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index 583926fef233cd72e431d7c24ec1cd2cc6986dfe..ee632d14eb136b2c7b1602c6eaa346d2b9612a4c 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -225,7 +225,7 @@ void DecryptingVideoDecoder::DecryptAndDecodeBuffer(
DCHECK_EQ(state_, kPendingDemuxerRead) << state_;
DCHECK(!read_cb_.is_null());
- DCHECK_EQ(buffer != NULL, status == DemuxerStream::kOk) << status;
+ DCHECK_EQ(buffer.get() != NULL, status == DemuxerStream::kOk) << status;
if (!reset_cb_.is_null()) {
base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
@@ -277,7 +277,7 @@ void DecryptingVideoDecoder::DeliverFrame(
DCHECK_EQ(state_, kPendingDecode) << state_;
DCHECK(!read_cb_.is_null());
- DCHECK(pending_buffer_to_decode_);
+ DCHECK(pending_buffer_to_decode_.get());
bool need_to_try_again_if_nokey_is_returned = key_added_while_decode_pending_;
key_added_while_decode_pending_ = false;
@@ -292,7 +292,7 @@ void DecryptingVideoDecoder::DeliverFrame(
return;
}
- DCHECK_EQ(status == Decryptor::kSuccess, frame != NULL);
+ DCHECK_EQ(status == Decryptor::kSuccess, frame.get() != NULL);
if (status == Decryptor::kError) {
DVLOG(2) << "DeliverFrame() - kError";
« no previous file with comments | « media/filters/decrypting_demuxer_stream_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698