webkit/media/filter_helpers.h - Issue 10834183: Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor.

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: webkit/media/filter_helpers.h

Issue 10834183: Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed CR comments Created 8 years, 4 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: webkit/media/filter_helpers.h

diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h

index b28063c7cff34a38a1cf16560218e4796256f503..b130ddf87f62398a40f120b554af9fb01e3ae549 100644

--- a/webkit/media/filter_helpers.h

+++ b/webkit/media/filter_helpers.h

@@ -44,8 +44,7 @@ bool BuildMediaSourceCollection(

media::ChunkDemuxerClient* client,

media::MessageLoopFactory* message_loop_factory,

media::FilterCollection* filter_collection,

- media::Decryptor* decryptor,

- scoped_refptr<media::FFmpegVideoDecoder>* video_decoder);

+ media::Decryptor* decryptor);

// Builds the required filters for handling regular URLs and adds them to

// |filter_collection| and fills |video_decoder| returning true if successful.

@@ -53,8 +52,7 @@ void BuildDefaultCollection(

const scoped_refptr<media::DataSource>& data_source,

media::MessageLoopFactory* message_loop_factory,

media::FilterCollection* filter_collection,

- media::Decryptor* decryptor,

- scoped_refptr<media::FFmpegVideoDecoder>* video_decoder);

+ media::Decryptor* decryptor);

} // webkit_media

« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »