media/filters/decoder_selector.h - Issue 331863004: Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

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/decoder_selector.h

Issue 331863004: Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2049/src/

Patch Set: Created 6 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

Index: media/filters/decoder_selector.h

===================================================================

--- media/filters/decoder_selector.h (revision 277175)

+++ media/filters/decoder_selector.h (working copy)

@@ -64,8 +64,7 @@

// the |select_decoder_cb|.

void SelectDecoder(DemuxerStream* stream,

bool low_delay,

- const SelectDecoderCB& select_decoder_cb,

- const typename Decoder::OutputCB& output_cb);

+ const SelectDecoderCB& select_decoder_cb);

// Aborts pending Decoder selection and fires |select_decoder_cb| with

// NULL and NULL immediately if it's pending.

@@ -85,7 +84,6 @@

DemuxerStream* input_stream_;

bool low_delay_;

SelectDecoderCB select_decoder_cb_;

- typename Decoder::OutputCB output_cb_;

scoped_ptr<Decoder> decoder_;

scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;

« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »