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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/video_decoder_selector.cc

Issue 16274005: Separate DemuxerStream and VideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: VideoFrameStream ready for review. Created 7 years, 6 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
« media/base/decoder_buffer.h ('K') | « media/filters/gpu_video_decoder.cc ('k') | media/filters/video_frame_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_decoder_selector.cc
diff --git a/media/filters/video_decoder_selector.cc b/media/filters/video_decoder_selector.cc
index e77606173bfd4d4a556f66b180e762fd169f438c..5dc5632e3f4d5eebc46c2fcb240aaf004ae1ecf1 100644
--- a/media/filters/video_decoder_selector.cc
+++ b/media/filters/video_decoder_selector.cc
@@ -68,7 +68,7 @@ void VideoDecoderSelector::SelectVideoDecoder(
message_loop_, set_decryptor_ready_cb_));
video_decoder_->Initialize(
- input_stream_,
+ input_stream_->video_decoder_config(),
BindToCurrentLoop(base::Bind(
&VideoDecoderSelector::DecryptingVideoDecoderInitDone,
weak_ptr_factory_.GetWeakPtr())),
@@ -122,7 +122,7 @@ void VideoDecoderSelector::InitializeDecoder(
}
(*iter)->Initialize(
- input_stream_,
+ input_stream_->video_decoder_config(),
BindToCurrentLoop(base::Bind(
&VideoDecoderSelector::DecoderInitDone,
weak_ptr_factory_.GetWeakPtr(),
« media/base/decoder_buffer.h ('K') | « media/filters/gpu_video_decoder.cc ('k') | media/filters/video_frame_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698