media/filters/gpu_video_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/gpu_video_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/filters/android/media_codec_audio_decoder.cc ('k') | media/gpu/android_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/gpu_video_decoder.cc

diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc

index 54fa866c2bd657b09da80deb71453c9b87458832..6a4bcadfb15b58efcbe3998ab138be091ddaba53 100644

--- a/media/filters/gpu_video_decoder.cc

+++ b/media/filters/gpu_video_decoder.cc

@@ -357,8 +357,8 @@ void GpuVideoDecoder::CompleteInitialization(int surface_id) {

VideoDecodeAccelerator::Config vda_config;

vda_config.profile = config_.profile();

vda_config.cdm_id = cdm_id_;

- vda_config.is_encrypted = config_.is_encrypted();

vda_config.surface_id = surface_id;

+ vda_config.encryption_scheme = config_.encryption_scheme();

vda_config.is_deferred_initialization_allowed = true;

vda_config.initial_expected_coded_size = config_.coded_size();