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

Unified Diff: media/tools/player_x11/player_x11.cc

Issue 12989009: Remove reference counting from media::VideoDecoder and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 808626aa266301c5a26425ff2de6db7e11dddfcb..282f1711dc55ac99356b17475d021959baec4539 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -113,12 +113,13 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source,
need_key_cb));
- collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
- message_loop));
- // Create our video renderer and save a reference to it for painting.
+
+ ScopedVector<media::VideoDecoder> video_decoders;
+ video_decoders.push_back(new media::FFmpegVideoDecoder(message_loop));
scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererBase(
message_loop,
+ video_decoders.Pass(),
media::SetDecryptorReadyCB(),
base::Bind(&Paint, paint_message_loop, paint_cb),
base::Bind(&SetOpaque),

Powered by Google App Engine
This is Rietveld 408576698