media/filters/android/media_codec_audio_decoder.cc - Issue 2058113002: Add 'cbcs' encryption scheme support in Android media.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase Created 4 years 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

« media/base/android/java/src/org/chromium/media/MediaCodecUtil.java ('K') | « media/base/ipc/media_param_traits.cc ('k') | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 79744ea13fa41c3d9c4ca54f34810cc63292214f..a38e57a3770d17ad947a4fed7eada3b0b9349f9b 100644

--- a/media/filters/android/media_codec_audio_decoder.cc

+++ b/media/filters/android/media_codec_audio_decoder.cc

@@ -275,10 +275,10 @@ MediaCodecLoop::InputData MediaCodecAudioDecoder::ProvideInputData() {

input_data.length = decoder_buffer->data_size();

const DecryptConfig* decrypt_config = decoder_buffer->decrypt_config();

if (decrypt_config && decrypt_config->is_encrypted()) {

- input_data.is_encrypted = true;

input_data.key_id = decrypt_config->key_id();

input_data.iv = decrypt_config->iv();

input_data.subsamples = decrypt_config->subsamples();

+ input_data.encryption_scheme = config_.encryption_scheme();

}

input_data.presentation_time = decoder_buffer->timestamp();

}