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

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

« 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 »

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_MEDIA_PARAM_TRAITS_MACROS_H_	5 #ifndef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_

6 #define MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_	6 #define MEDIA_BASE_IPC_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_codecs.h"	9 #include "media/base/audio_codecs.h"

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

11 #include "media/base/buffering_state.h"	11 #include "media/base/buffering_state.h"

12 #include "media/base/channel_layout.h"	12 #include "media/base/channel_layout.h"

13 #include "media/base/decode_status.h"	13 #include "media/base/decode_status.h"

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

14 #include "media/base/sample_format.h"	15 #include "media/base/sample_format.h"

15 #include "media/base/subsample_entry.h"	16 #include "media/base/subsample_entry.h"

16 #include "media/base/video_capture_types.h"	17 #include "media/base/video_capture_types.h"

17 #include "media/base/video_codecs.h"	18 #include "media/base/video_codecs.h"

18 #include "media/base/video_types.h"	19 #include "media/base/video_types.h"

19	20

20 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)	21 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)

21	22

22 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,	23 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,

23 media::AudioLatency::LATENCY_COUNT)	24 media::AudioLatency::LATENCY_COUNT)

(...skipping 15 matching lines...) Expand all Loading...
39	40

40 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)	41 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)

41	42

42 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,	43 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,

43 media::VIDEO_CODEC_PROFILE_MIN,	44 media::VIDEO_CODEC_PROFILE_MIN,

44 media::VIDEO_CODEC_PROFILE_MAX)	45 media::VIDEO_CODEC_PROFILE_MAX)

45	46

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

47	48

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

	50 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,

	51 media::EncryptionScheme::CIPHER_MODE_MAX);
	xhwang 2016/10/20 17:33:57 You need to rebase since I recently changed this p You need to rebase since I recently changed this part as well.
49	52

50 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)	53 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)

51 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)	54 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)

52 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)	55 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)

53 IPC_STRUCT_TRAITS_END()	56 IPC_STRUCT_TRAITS_END()

54	57

55 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_	58 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_

OLD	NEW