media/base/ipc/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/base/ipc/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: change Android version probing Created 4 years, 2 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/ipc/media_param_traits_macros.h

diff --git a/media/base/ipc/media_param_traits_macros.h b/media/base/ipc/media_param_traits_macros.h

index 6b949bcb735d549e42e0dfd02e2014d3b76ce4cf..f3647b18f1ba11468aac7fe0a5573b7d34b35061 100644

--- a/media/base/ipc/media_param_traits_macros.h

+++ b/media/base/ipc/media_param_traits_macros.h

@@ -11,6 +11,7 @@

#include "media/base/buffering_state.h"

#include "media/base/channel_layout.h"

#include "media/base/decode_status.h"

+#include "media/base/encryption_scheme.h"

#include "media/base/sample_format.h"

#include "media/base/subsample_entry.h"

#include "media/base/video_capture_types.h"

@@ -46,6 +47,8 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,

IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)

IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)

+IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,

+ media::EncryptionScheme::CIPHER_MODE_MAX);

xhwang 2016/10/20 17:33:57 You need to rebase since I recently changed this p

IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)

IPC_STRUCT_TRAITS_MEMBER(clear_bytes)

« no previous file with comments | « media/base/ipc/media_param_traits.cc ('k') | media/filters/android/media_codec_audio_decoder.cc » ('j') | no next file with comments »