content/common/gpu/gpu_messages.h - Issue 668633002: Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h.

Side by Side Diff: content/common/gpu/gpu_messages.h

Issue 668633002: Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 | « content/common/gpu/client/gpu_video_encode_accelerator_host.cc ('k') | content/common/gpu/media/android_video_encode_accelerator.h » ('j') | gpu/config/gpu_info.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 // Multiply-included message file, hence no include guard here, but see below	5 // Multiply-included message file, hence no include guard here, but see below

6 // for a much smaller-than-usual include guard section.	6 // for a much smaller-than-usual include guard section.

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 IPC_STRUCT_TRAITS_END()	131 IPC_STRUCT_TRAITS_END()

132	132

133 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice)	133 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice)

134 IPC_STRUCT_TRAITS_MEMBER(vendor_id)	134 IPC_STRUCT_TRAITS_MEMBER(vendor_id)

135 IPC_STRUCT_TRAITS_MEMBER(device_id)	135 IPC_STRUCT_TRAITS_MEMBER(device_id)

136 IPC_STRUCT_TRAITS_MEMBER(active)	136 IPC_STRUCT_TRAITS_MEMBER(active)

137 IPC_STRUCT_TRAITS_MEMBER(vendor_string)	137 IPC_STRUCT_TRAITS_MEMBER(vendor_string)

138 IPC_STRUCT_TRAITS_MEMBER(device_string)	138 IPC_STRUCT_TRAITS_MEMBER(device_string)

139 IPC_STRUCT_TRAITS_END()	139 IPC_STRUCT_TRAITS_END()

140	140

141 IPC_STRUCT_TRAITS_BEGIN(media::VideoEncodeAccelerator::SupportedProfile)	141 IPC_STRUCT_TRAITS_BEGIN(gpu::VideoEncodeAcceleratorSupportedProfile)

142 IPC_STRUCT_TRAITS_MEMBER(profile)	142 IPC_STRUCT_TRAITS_MEMBER(profile)

143 IPC_STRUCT_TRAITS_MEMBER(max_resolution)	143 IPC_STRUCT_TRAITS_MEMBER(max_resolution)

144 IPC_STRUCT_TRAITS_MEMBER(max_framerate_numerator)	144 IPC_STRUCT_TRAITS_MEMBER(max_framerate_numerator)

145 IPC_STRUCT_TRAITS_MEMBER(max_framerate_denominator)	145 IPC_STRUCT_TRAITS_MEMBER(max_framerate_denominator)

146 IPC_STRUCT_TRAITS_END()	146 IPC_STRUCT_TRAITS_END()

147	147

148 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo)	148 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo)

149 IPC_STRUCT_TRAITS_MEMBER(initialization_time)	149 IPC_STRUCT_TRAITS_MEMBER(initialization_time)

150 IPC_STRUCT_TRAITS_MEMBER(optimus)	150 IPC_STRUCT_TRAITS_MEMBER(optimus)

151 IPC_STRUCT_TRAITS_MEMBER(amd_switchable)	151 IPC_STRUCT_TRAITS_MEMBER(amd_switchable)

(...skipping 572 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
724 int32 /* bitstream_buffer_id */,	724 int32 /* bitstream_buffer_id */,

725 uint32 /* payload_size */,	725 uint32 /* payload_size */,

726 bool /* key_frame */)	726 bool /* key_frame */)

727	727

728 // Report error condition.	728 // Report error condition.

729 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError,	729 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError,

730 media::VideoEncodeAccelerator::Error /* error */)	730 media::VideoEncodeAccelerator::Error /* error */)

731	731

732 // Send destroy request to the encoder.	732 // Send destroy request to the encoder.

733 IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy)	733 IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy)

OLD	NEW