media/base/ipc/media_param_traits_macros.h - Issue 2058113002: Add 'cbcs' encryption scheme support in Android media.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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: 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 unified diff | Download patch

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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_	5 #ifndef MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_

6 #define MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_	6 #define MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_

7	7

8 #include "ipc/ipc_message_macros.h"	8 #include "ipc/ipc_message_macros.h"

9 #include "media/base/audio_parameters.h"	9 #include "media/base/audio_parameters.h"

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

10 #include "media/base/video_capture_types.h"	11 #include "media/base/video_capture_types.h"

11 #include "media/base/video_types.h"	12 #include "media/base/video_types.h"

12	13

13 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,	14 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,

14 media::AudioParameters::AUDIO_FORMAT_LAST)	15 media::AudioParameters::AUDIO_FORMAT_LAST)

15 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)	16 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)

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

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

	19 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,

	20 media::EncryptionScheme::CIPHER_MODE_MAX);

18	21

19 #endif // MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_	22 #endif // MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_

OLD	NEW