media/base/android/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/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: Created 4 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

« media/base/android/java/src/org/chromium/media/MediaCodecUtil.java ('K') | « media/base/android/media_codec_bridge.h ('k') | media/base/android/media_codec_decoder.cc » ('j') | media/base/android/sdk_media_codec_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/media_codec_bridge.cc

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

index 8beb1a2c803cfe7a4c338098a737524b26433f38..8fbaa58c3aa4f1807ffd3209cd148c898ef349f6 100644

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

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

@@ -34,12 +34,14 @@ MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(

const std::string& key_id,

const std::string& iv,

const std::vector<SubsampleEntry>& subsamples,

+ const EncryptionScheme& encryption_scheme,

const base::TimeDelta& presentation_time) {

const std::vector<char> key_vec(key_id.begin(), key_id.end());

const std::vector<char> iv_vec(iv.begin(), iv.end());

return QueueSecureInputBuffer(index, data, data_size, key_vec, iv_vec,

subsamples.empty() ? nullptr : &subsamples[0],

- subsamples.size(), presentation_time);

+ subsamples.size(), encryption_scheme,

+ presentation_time);

}

MediaCodecStatus MediaCodecBridge::CopyFromOutputBuffer(int index,