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

Unified Diff: media/filters/android/media_codec_audio_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/filters/android/media_codec_audio_decoder.cc
diff --git a/media/filters/android/media_codec_audio_decoder.cc b/media/filters/android/media_codec_audio_decoder.cc
index d8f91dfda4cd091de88a9c0879f0ea012d83568f..725a37bef1ab9e7ccb3df14985ad52c6071860ef 100644
--- a/media/filters/android/media_codec_audio_decoder.cc
+++ b/media/filters/android/media_codec_audio_decoder.cc
@@ -13,6 +13,7 @@
#include "media/base/audio_buffer.h"
#include "media/base/audio_timestamp_helper.h"
#include "media/base/bind_to_current_loop.h"
+#include "media/base/media_util.h"
#include "media/base/timestamp_constants.h"
namespace media {
@@ -455,7 +456,8 @@ bool MediaCodecAudioDecoder::EnqueueInputBuffer(
status = media_codec_->QueueSecureInputBuffer(
input_info.buf_index, memory, decoder_buffer->data_size(),
decrypt_config->key_id(), decrypt_config->iv(),
- decrypt_config->subsamples(), decoder_buffer->timestamp());
+ decrypt_config->subsamples(), config_.encryption_scheme(),
+ decoder_buffer->timestamp());
} else {
DVLOG(2) << __FUNCTION__ << ": QueueInputBuffer:"

Powered by Google App Engine
This is Rietveld 408576698