Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: media/base/android/sdk_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
Index: media/base/android/sdk_media_codec_bridge.cc
diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
index 840f57724c06560fdfbe78e21d7b7eaa038ecf04..e309b7df586953fe51fe564c81396080cd25d893 100644
--- a/media/base/android/sdk_media_codec_bridge.cc
+++ b/media/base/android/sdk_media_codec_bridge.cc
@@ -178,6 +178,7 @@ MediaCodecStatus SdkMediaCodecBridge::QueueSecureInputBuffer(
const std::vector<char>& iv,
const SubsampleEntry* subsamples,
int subsamples_size,
+ const EncryptionScheme& encryption_scheme,
const base::TimeDelta& presentation_time) {
DVLOG(3) << __PRETTY_FUNCTION__ << index << ": " << data_size;
if (data_size >
@@ -230,6 +231,9 @@ MediaCodecStatus SdkMediaCodecBridge::QueueSecureInputBuffer(
Java_MediaCodecBridge_queueSecureInputBuffer(
env, j_media_codec_.obj(), index, 0, j_iv.obj(), j_key_id.obj(),
clear_array.obj(), cypher_array.obj(), new_subsamples_size,
+ static_cast<int>(encryption_scheme.mode()),
+ static_cast<int>(encryption_scheme.pattern().encrypt_blocks()),
+ static_cast<int>(encryption_scheme.pattern().skip_blocks()),
presentation_time.InMicroseconds()));
}

Powered by Google App Engine
This is Rietveld 408576698