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

Unified Diff: media/filters/video_renderer_base.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/video_frame_stream_unittest.cc ('k') | media/filters/video_renderer_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_base.cc
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 84e48c4e64c2dca2537e1d23a7be25fd9c63dcec..a39c8b09848ea07fe6fc04071e8bfb9cd261e948 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -341,7 +341,7 @@ void VideoRendererBase::FrameReady(VideoDecoder::Status status,
pending_read_ = false;
if (status != VideoDecoder::kOk) {
- DCHECK(!frame);
+ DCHECK(!frame.get());
PipelineStatus error = PIPELINE_ERROR_DECODE;
if (status == VideoDecoder::kDecryptError)
error = PIPELINE_ERROR_DECRYPT;
@@ -366,7 +366,7 @@ void VideoRendererBase::FrameReady(VideoDecoder::Status status,
return;
}
- if (!frame) {
+ if (!frame.get()) {
// Abort preroll early for a NULL frame because we won't get more frames.
// A new preroll will be requested after this one completes so there is no
// point trying to collect more frames.
« no previous file with comments | « media/filters/video_frame_stream_unittest.cc ('k') | media/filters/video_renderer_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698