Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(864)

Issues Search
    My Issues | Starred     Open | Closed | All

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: rebase 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/gpu_video_encode_accelerator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error, 57 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,
58 media::VideoEncodeAccelerator::kErrorMax) 58 media::VideoEncodeAccelerator::kErrorMax)
59 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format, 59 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format,
60 media::VideoFrame::FORMAT_MAX) 60 media::VideoFrame::FORMAT_MAX)
61 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, 61 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
62 media::VIDEO_CODEC_PROFILE_MIN, 62 media::VIDEO_CODEC_PROFILE_MIN,
63 media::VIDEO_CODEC_PROFILE_MAX) 63 media::VIDEO_CODEC_PROFILE_MAX)
64 IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::CollectInfoResult, 64 IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::CollectInfoResult,
65 gpu::kCollectInfoNone, 65 gpu::kCollectInfoNone,
66 gpu::kCollectInfoFatalFailure) 66 gpu::kCollectInfoFatalFailure)
67 IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::VideoCodecProfile,
68 gpu::VIDEO_CODEC_PROFILE_MIN,
69 gpu::VIDEO_CODEC_PROFILE_MAX)
67 70
68 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig) 71 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)
69 IPC_STRUCT_MEMBER(int32, share_group_id) 72 IPC_STRUCT_MEMBER(int32, share_group_id)
70 IPC_STRUCT_MEMBER(std::vector<int>, attribs) 73 IPC_STRUCT_MEMBER(std::vector<int>, attribs)
71 IPC_STRUCT_MEMBER(GURL, active_url) 74 IPC_STRUCT_MEMBER(GURL, active_url)
72 IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference) 75 IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference)
73 IPC_STRUCT_END() 76 IPC_STRUCT_END()
74 77
75 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params) 78 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params)
76 IPC_STRUCT_MEMBER(int32, surface_id) 79 IPC_STRUCT_MEMBER(int32, surface_id)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 IPC_STRUCT_TRAITS_END() 134 IPC_STRUCT_TRAITS_END()
132 135
133 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice) 136 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice)
134 IPC_STRUCT_TRAITS_MEMBER(vendor_id) 137 IPC_STRUCT_TRAITS_MEMBER(vendor_id)
135 IPC_STRUCT_TRAITS_MEMBER(device_id) 138 IPC_STRUCT_TRAITS_MEMBER(device_id)
136 IPC_STRUCT_TRAITS_MEMBER(active) 139 IPC_STRUCT_TRAITS_MEMBER(active)
137 IPC_STRUCT_TRAITS_MEMBER(vendor_string) 140 IPC_STRUCT_TRAITS_MEMBER(vendor_string)
138 IPC_STRUCT_TRAITS_MEMBER(device_string) 141 IPC_STRUCT_TRAITS_MEMBER(device_string)
139 IPC_STRUCT_TRAITS_END() 142 IPC_STRUCT_TRAITS_END()
140 143
141 IPC_STRUCT_TRAITS_BEGIN(media::VideoEncodeAccelerator::SupportedProfile) 144 IPC_STRUCT_TRAITS_BEGIN(gpu::VideoEncodeAcceleratorSupportedProfile)
142 IPC_STRUCT_TRAITS_MEMBER(profile) 145 IPC_STRUCT_TRAITS_MEMBER(profile)
143 IPC_STRUCT_TRAITS_MEMBER(max_resolution) 146 IPC_STRUCT_TRAITS_MEMBER(max_resolution)
144 IPC_STRUCT_TRAITS_MEMBER(max_framerate_numerator) 147 IPC_STRUCT_TRAITS_MEMBER(max_framerate_numerator)
145 IPC_STRUCT_TRAITS_MEMBER(max_framerate_denominator) 148 IPC_STRUCT_TRAITS_MEMBER(max_framerate_denominator)
146 IPC_STRUCT_TRAITS_END() 149 IPC_STRUCT_TRAITS_END()
147 150
148 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo) 151 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo)
149 IPC_STRUCT_TRAITS_MEMBER(initialization_time) 152 IPC_STRUCT_TRAITS_MEMBER(initialization_time)
150 IPC_STRUCT_TRAITS_MEMBER(optimus) 153 IPC_STRUCT_TRAITS_MEMBER(optimus)
151 IPC_STRUCT_TRAITS_MEMBER(amd_switchable) 154 IPC_STRUCT_TRAITS_MEMBER(amd_switchable)
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 int32 /* bitstream_buffer_id */, 729 int32 /* bitstream_buffer_id */,
727 uint32 /* payload_size */, 730 uint32 /* payload_size */,
728 bool /* key_frame */) 731 bool /* key_frame */)
729 732
730 // Report error condition. 733 // Report error condition.
731 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError, 734 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError,
732 media::VideoEncodeAccelerator::Error /* error */) 735 media::VideoEncodeAccelerator::Error /* error */)
733 736
734 // Send destroy request to the encoder. 737 // Send destroy request to the encoder.
735 IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy) 738 IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy)
OLDNEW
« no previous file with comments | « content/common/gpu/client/gpu_video_encode_accelerator_host.cc ('k') | content/common/gpu/media/gpu_video_encode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698