media/base/android/mock_media_codec_bridge.cc - 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.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 Created 4 years 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/MediaCodecUtil.java ('K') | « media/base/android/mock_media_codec_bridge.h ('k') | media/base/android/ndk_media_codec_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/mock_media_codec_bridge.cc

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

index 50ef75d85852e151ccc0a889b94ca1351e8015b3..79c62d644456b653995c5adbc4c4ebca6594106c 100644

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

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

@@ -4,6 +4,7 @@

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

+#include "media/base/encryption_scheme.h"

#include "media/base/subsample_entry.h"

using ::testing::_;