media/filters/video_decoder_selector.cc - Issue 16274005: Separate DemuxerStream and VideoDecoder.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: GVD: return drained frames before starting over 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:

Index: media/filters/video_decoder_selector.cc

diff --git a/media/filters/video_decoder_selector.cc b/media/filters/video_decoder_selector.cc

index d62b295a4ad36b5a75f76d22bc34e306453e3602..1c222f537471bd9b9e15020a5b407fa9d7ea2e73 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(),