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

Unified Diff: media/base/android/media_decoder_job.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_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index 8b1ccc4ad1f0359979df14436406fc3b4e25ebe9..f0663e0722cfe1f1fa75f93625cf16b134e571f8 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -11,6 +11,7 @@
#include "base/trace_event/trace_event.h"
#include "media/base/android/media_drm_bridge.h"
#include "media/base/bind_to_current_loop.h"
+#include "media/base/media_util.h"
#include "media/base/timestamp_constants.h"
namespace media {
@@ -284,7 +285,7 @@ MediaCodecStatus MediaDecoderJob::QueueInputBuffer(const AccessUnit& unit) {
MediaCodecStatus status = media_codec_bridge_->QueueSecureInputBuffer(
input_buf_index, &unit.data[0], unit.data.size(), unit.key_id, unit.iv,
unit.subsamples.empty() ? NULL : &unit.subsamples[0],
- unit.subsamples.size(), unit.timestamp);
+ unit.subsamples.size(), AesCtrEncryptionScheme(), unit.timestamp);
// In case of MEDIA_CODEC_NO_KEY, we must reuse the |input_buf_index_|.
// Otherwise MediaDrm will report errors.

Powered by Google App Engine
This is Rietveld 408576698