media/gpu/ipc/common/media_param_traits_macros.h - 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/gpu/ipc/common/media_param_traits_macros.h

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/gpu/fake_video_decode_accelerator.cc ('k') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/gpu/ipc/common/media_param_traits_macros.h

diff --git a/media/gpu/ipc/common/media_param_traits_macros.h b/media/gpu/ipc/common/media_param_traits_macros.h

index e650f05368f8f14f7748da31a09d313eee309cec..6904202d9a2b9d3ba556fdf3101068bab7943091 100644

--- a/media/gpu/ipc/common/media_param_traits_macros.h

+++ b/media/gpu/ipc/common/media_param_traits_macros.h

@@ -7,7 +7,7 @@

#include "gpu/config/gpu_info.h"

#include "ipc/ipc_message_macros.h"

-#include "media/base/ipc/media_param_traits_macros.h"

+#include "media/base/ipc/media_param_traits.h"

#include "media/gpu/ipc/common/create_video_encoder_params.h"

#include "media/video/jpeg_decode_accelerator.h"

#include "media/video/video_decode_accelerator.h"

@@ -21,7 +21,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,

IPC_STRUCT_TRAITS_BEGIN(media::VideoDecodeAccelerator::Config)

IPC_STRUCT_TRAITS_MEMBER(profile)

- IPC_STRUCT_TRAITS_MEMBER(is_encrypted)

+ IPC_STRUCT_TRAITS_MEMBER(encryption_scheme)

IPC_STRUCT_TRAITS_MEMBER(cdm_id)

IPC_STRUCT_TRAITS_MEMBER(is_deferred_initialization_allowed)

IPC_STRUCT_TRAITS_MEMBER(surface_id)