media/base/android/mock_media_codec_bridge.h - Issue 2058113002: Add 'cbcs' encryption scheme support in Android media.

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/android/mock_media_codec_bridge.h

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase redux Created 4 years, 2 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/android/java/src/org/chromium/media/MediaCodecBridge.java ('K') | « media/base/android/media_codec_loop.cc ('k') | media/base/android/mock_media_codec_bridge.cc » ('j') | media/base/android/mock_media_codec_bridge.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/mock_media_codec_bridge.h

diff --git a/media/base/android/mock_media_codec_bridge.h b/media/base/android/mock_media_codec_bridge.h

index dfb52233432a0fc64ea086e63832c88bc32c1c0b..bcf9bc05ad0ca0bba31ee3c2a76d3d900bbf8f34 100644

--- a/media/base/android/mock_media_codec_bridge.h

+++ b/media/base/android/mock_media_codec_bridge.h

@@ -24,15 +24,16 @@ class MockMediaCodecBridge : public MediaCodecBridge {

MOCK_METHOD1(GetOutputChannelCount, MediaCodecStatus(int*));

MOCK_METHOD4(QueueInputBuffer,

MediaCodecStatus(int, const uint8_t*, size_t, base::TimeDelta));

- MOCK_METHOD7(QueueSecureInputBuffer,

+ MOCK_METHOD8(QueueSecureInputBuffer,

MediaCodecStatus(int,

const uint8_t*,

size_t,

const std::string&,

const std::vector<SubsampleEntry>&,

+ const EncryptionScheme& encryption_scheme,

base::TimeDelta));

- MOCK_METHOD8(QueueSecureInputBuffer,

+ MOCK_METHOD9(QueueSecureInputBuffer,

MediaCodecStatus(int,

const uint8_t*,

size_t,

@@ -40,6 +41,7 @@ class MockMediaCodecBridge : public MediaCodecBridge {

const std::vector<char>&,

const SubsampleEntry*,

int,

+ const EncryptionScheme& encryption_scheme,

base::TimeDelta));

MOCK_METHOD1(QueueEOS, void(int));

MOCK_METHOD2(DequeueInputBuffer, MediaCodecStatus(base::TimeDelta, int*));