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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_	5 #ifndef MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_

6 #define MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_	6 #define MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_

7	7

8 #include "gpu/config/gpu_info.h"	8 #include "gpu/config/gpu_info.h"

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

10 #include "media/base/ipc/media_param_traits_macros.h"	10 #include "media/base/ipc/media_param_traits.h"

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

12 #include "media/video/jpeg_decode_accelerator.h"	12 #include "media/video/jpeg_decode_accelerator.h"

13 #include "media/video/video_decode_accelerator.h"	13 #include "media/video/video_decode_accelerator.h"

14 #include "media/video/video_encode_accelerator.h"	14 #include "media/video/video_encode_accelerator.h"

15 #include "ui/gfx/ipc/geometry/gfx_param_traits.h"	15 #include "ui/gfx/ipc/geometry/gfx_param_traits.h"

16	16

17 IPC_ENUM_TRAITS_MAX_VALUE(media::JpegDecodeAccelerator::Error,	17 IPC_ENUM_TRAITS_MAX_VALUE(media::JpegDecodeAccelerator::Error,

18 media::JpegDecodeAccelerator::LARGEST_ERROR_ENUM)	18 media::JpegDecodeAccelerator::LARGEST_ERROR_ENUM)

19 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,	19 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,

20 media::VideoEncodeAccelerator::kErrorMax)	20 media::VideoEncodeAccelerator::kErrorMax)

21	21

22 IPC_STRUCT_TRAITS_BEGIN(media::VideoDecodeAccelerator::Config)	22 IPC_STRUCT_TRAITS_BEGIN(media::VideoDecodeAccelerator::Config)

23 IPC_STRUCT_TRAITS_MEMBER(profile)	23 IPC_STRUCT_TRAITS_MEMBER(profile)

24 IPC_STRUCT_TRAITS_MEMBER(is_encrypted)	24 IPC_STRUCT_TRAITS_MEMBER(encryption_scheme)

25 IPC_STRUCT_TRAITS_MEMBER(cdm_id)	25 IPC_STRUCT_TRAITS_MEMBER(cdm_id)

26 IPC_STRUCT_TRAITS_MEMBER(is_deferred_initialization_allowed)	26 IPC_STRUCT_TRAITS_MEMBER(is_deferred_initialization_allowed)

27 IPC_STRUCT_TRAITS_MEMBER(surface_id)	27 IPC_STRUCT_TRAITS_MEMBER(surface_id)

28 IPC_STRUCT_TRAITS_MEMBER(initial_expected_coded_size)	28 IPC_STRUCT_TRAITS_MEMBER(initial_expected_coded_size)

29 IPC_STRUCT_TRAITS_MEMBER(supported_output_formats)	29 IPC_STRUCT_TRAITS_MEMBER(supported_output_formats)

30 IPC_STRUCT_TRAITS_MEMBER(sps)	30 IPC_STRUCT_TRAITS_MEMBER(sps)

31 IPC_STRUCT_TRAITS_MEMBER(pps)	31 IPC_STRUCT_TRAITS_MEMBER(pps)

32 IPC_STRUCT_TRAITS_END()	32 IPC_STRUCT_TRAITS_END()

33	33

34 IPC_STRUCT_TRAITS_BEGIN(media::CreateVideoEncoderParams)	34 IPC_STRUCT_TRAITS_BEGIN(media::CreateVideoEncoderParams)

35 IPC_STRUCT_TRAITS_MEMBER(input_format)	35 IPC_STRUCT_TRAITS_MEMBER(input_format)

36 IPC_STRUCT_TRAITS_MEMBER(input_visible_size)	36 IPC_STRUCT_TRAITS_MEMBER(input_visible_size)

37 IPC_STRUCT_TRAITS_MEMBER(output_profile)	37 IPC_STRUCT_TRAITS_MEMBER(output_profile)

38 IPC_STRUCT_TRAITS_MEMBER(initial_bitrate)	38 IPC_STRUCT_TRAITS_MEMBER(initial_bitrate)

39 IPC_STRUCT_TRAITS_MEMBER(encoder_route_id)	39 IPC_STRUCT_TRAITS_MEMBER(encoder_route_id)

40 IPC_STRUCT_TRAITS_END()	40 IPC_STRUCT_TRAITS_END()

41	41

42 #endif // MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_	42 #endif // MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_

OLD	NEW