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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/base/android/mock_media_codec_bridge.cc

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 unified diff | Download patch

« media/base/android/java/src/org/chromium/media/MediaCodecBridge.java ('K') | « media/base/android/mock_media_codec_bridge.h ('k') | media/base/android/ndk_media_codec_bridge.h » ('j') | media/base/android/sdk_media_codec_bridge.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/base/android/mock_media_codec_bridge.h"	5 #include "media/base/android/mock_media_codec_bridge.h"

6	6

	7 #include "media/base/encryption_scheme.h"
	xhwang 2016/10/20 23:52:07 OOC, why do you need this? OOC, why do you need this? dougsteed 2016/10/21 17:15:05 incomplete type problems otherwise. Show quoted text On 2016/10/20 23:52:07, xhwang wrote: > OOC, why do you need this? incomplete type problems otherwise.
7 #include "media/base/subsample_entry.h"	8 #include "media/base/subsample_entry.h"

8	9

9 using ::testing::_;	10 using ::testing::_;

10 using ::testing::Return;	11 using ::testing::Return;

11	12

12 namespace media {	13 namespace media {

13	14

14 MockMediaCodecBridge::MockMediaCodecBridge() {	15 MockMediaCodecBridge::MockMediaCodecBridge() {

15 ON_CALL(*this, DequeueInputBuffer(_, _))	16 ON_CALL(*this, DequeueInputBuffer(_, _))

16 .WillByDefault(Return(MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER));	17 .WillByDefault(Return(MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER));

17 ON_CALL(*this, DequeueOutputBuffer(_, _, _, _, _, _, _))	18 ON_CALL(*this, DequeueOutputBuffer(_, _, _, _, _, _, _))

18 .WillByDefault(Return(MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER));	19 .WillByDefault(Return(MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER));

19 }	20 }

20	21

21 MockMediaCodecBridge::~MockMediaCodecBridge() {}	22 MockMediaCodecBridge::~MockMediaCodecBridge() {}

22	23

23 } // namespace media	24 } // namespace media

OLD	NEW