media/base/mock_filters.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/base/mock_filters.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/base/mock_filters.h

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

--- media/base/mock_filters.h (revision 277175)

+++ media/base/mock_filters.h (working copy)

@@ -76,10 +76,9 @@

virtual ~MockVideoDecoder();

// VideoDecoder implementation.

- MOCK_METHOD4(Initialize, void(const VideoDecoderConfig& config,

+ MOCK_METHOD3(Initialize, void(const VideoDecoderConfig& config,

bool low_delay,

- const PipelineStatusCB& status_cb,

- const OutputCB& output_cb));

+ const PipelineStatusCB&));

MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,

const DecodeCB&));

MOCK_METHOD1(Reset, void(const base::Closure&));

@@ -96,10 +95,8 @@

virtual ~MockAudioDecoder();

// AudioDecoder implementation.

- MOCK_METHOD3(Initialize,

- void(const AudioDecoderConfig& config,

- const PipelineStatusCB& status_cb,

- const OutputCB& output_cb));

+ MOCK_METHOD2(Initialize, void(const AudioDecoderConfig& config,

+ const PipelineStatusCB&));

MOCK_METHOD2(Decode,

void(const scoped_refptr<DecoderBuffer>& buffer,

const DecodeCB&));

« no previous file with comments | « media/base/audio_decoder.cc ('k') | media/base/video_decoder.h » ('j') | no next file with comments »