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

Unified Diff: media/filters/video_frame_stream.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/skcanvas_video_renderer_unittest.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_frame_stream.cc
diff --git a/media/filters/video_frame_stream.cc b/media/filters/video_frame_stream.cc
index e68046bd2ef0edf962a26c6dc61a1097c14934fd..ad24952526154b98a3ca95a75cd02d91a879abea 100644
--- a/media/filters/video_frame_stream.cc
+++ b/media/filters/video_frame_stream.cc
@@ -216,7 +216,7 @@ void VideoFrameStream::OnFrameReady(const VideoDecoder::Status status,
DCHECK(!read_cb_.is_null());
if (status != VideoDecoder::kOk) {
- DCHECK(!frame);
+ DCHECK(!frame.get());
state_ = STATE_ERROR;
base::ResetAndReturn(&read_cb_).Run(status, NULL);
return;
@@ -246,7 +246,7 @@ void VideoFrameStream::OnBufferReady(
DCHECK(message_loop_->BelongsToCurrentThread());
// VideoFrameStream reads from demuxer stream only when in NORMAL state.
DCHECK_EQ(state_, STATE_NORMAL) << state_;
- DCHECK_EQ(buffer != NULL, status == DemuxerStream::kOk) << status;
+ DCHECK_EQ(buffer.get() != NULL, status == DemuxerStream::kOk) << status;
if (status == DemuxerStream::kConfigChanged) {
DVLOG(2) << "OnBufferReady() - kConfigChanged";
« no previous file with comments | « media/filters/skcanvas_video_renderer_unittest.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698