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

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

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
Index: media/base/android/media_codec_bridge.h
diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h
index 99ac6e8e9994c9963f950766cac643c9182d83ed..73f070d81de9cb44542d0d050c6f0d71c6c46e0d 100644
--- a/media/base/android/media_codec_bridge.h
+++ b/media/base/android/media_codec_bridge.h
@@ -129,6 +129,19 @@ class MEDIA_EXPORT MediaCodecBridge {
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);
+
+ // Same QueueSecureInputBuffer overriden for the use with MediaSourcePlayer
+ // and MediaCodecPlayer.
+ // TODO(timav): remove this method and keep only the one above after we
+ // switch to the Spitzer pipeline.
+ MediaCodecStatus 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/java/src/org/chromium/media/MediaCodecBridge.java ('k') | media/base/android/media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698