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

Unified Diff: media/base/android/media_codec_bridge.cc

Issue 1422643002: Pass DecryptConfig parameters over IPC and use it in AVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed MediaCodec.CodecException that was added only at level 21 (Android L) Created 5 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
« no previous file with comments | « media/base/android/media_codec_bridge.h ('k') | media/base/bitstream_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 51df6d4ad2f8010f257911e802a2ea94ffc4e9aa..9bae69edd36f1d72d57318f82f220be973df71e2 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -345,6 +345,23 @@ MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
int index,
const uint8* data,
size_t data_size,
+ const std::string& key_id,
+ const std::string& iv,
+ const std::vector<SubsampleEntry>& subsamples,
+ const base::TimeDelta& presentation_time) {
+ return QueueSecureInputBuffer(
+ index, data, data_size, reinterpret_cast<const uint8_t*>(key_id.data()),
+ key_id.size(), reinterpret_cast<const uint8_t*>(iv.data()), iv.size(),
+ subsamples.empty() ? nullptr : &subsamples[0], subsamples.size(),
+ presentation_time);
+}
+
+// TODO(timav): Combine this and above methods together keeping only the first
+// interface after we switch to Spitzer pipeline.
+MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
+ int index,
+ const uint8* data,
+ size_t data_size,
const uint8* key_id,
int key_id_size,
const uint8* iv,
« no previous file with comments | « media/base/android/media_codec_bridge.h ('k') | media/base/bitstream_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698