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

Unified Diff: media/base/android/media_codec_decoder.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/media_codec_decoder.cc
diff --git a/media/base/android/media_codec_decoder.cc b/media/base/android/media_codec_decoder.cc
index a89beceb91c9800560d5d96569ed28da45ded6f7..d930fddc7fba3a3c45c344578082adcf6442b671 100644
--- a/media/base/android/media_codec_decoder.cc
+++ b/media/base/android/media_codec_decoder.cc
@@ -9,6 +9,7 @@
#include "base/callback_helpers.h"
#include "base/logging.h"
#include "media/base/android/media_codec_bridge.h"
+#include "media/base/media_util.h"
namespace media {
@@ -767,7 +768,7 @@ bool MediaCodecDecoder::EnqueueInputBuffer() {
status = media_codec_bridge_->QueueSecureInputBuffer(
index, memory, unit->data.size(), unit->key_id, unit->iv,
unit->subsamples.empty() ? nullptr : &unit->subsamples[0],
- unit->subsamples.size(), unit->timestamp);
+ unit->subsamples.size(), AesCtrEncryptionScheme(), unit->timestamp);
}
switch (status) {

Powered by Google App Engine
This is Rietveld 408576698