content/common/gpu/gpu_messages.h - Issue 148553003: Clean up histogram'd media enum max values.

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

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix naming collision Created 6 years, 9 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 | « cc/resources/video_resource_updater.cc ('k') | content/renderer/media/rtc_video_encoder.cc » ('j') | no next file with comments »

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 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 gfx::GpuPreferenceLast)	47 gfx::GpuPreferenceLast)

48 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SurfaceType,	48 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SurfaceType,

49 gfx::SURFACE_TYPE_LAST)	49 gfx::SURFACE_TYPE_LAST)

50 IPC_ENUM_TRAITS_MAX_VALUE(gpu::MemoryAllocation::PriorityCutoff,	50 IPC_ENUM_TRAITS_MAX_VALUE(gpu::MemoryAllocation::PriorityCutoff,

51 gpu::MemoryAllocation::CUTOFF_LAST)	51 gpu::MemoryAllocation::CUTOFF_LAST)

52 IPC_ENUM_TRAITS_MAX_VALUE(gpu::error::ContextLostReason,	52 IPC_ENUM_TRAITS_MAX_VALUE(gpu::error::ContextLostReason,

53 gpu::error::kContextLostReasonLast)	53 gpu::error::kContextLostReasonLast)

54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,	54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,

55 media::VideoEncodeAccelerator::kErrorMax)	55 media::VideoEncodeAccelerator::kErrorMax)

56 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format,	56 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format,

57 media::VideoFrame::HISTOGRAM_MAX)	57 media::VideoFrame::FORMAT_MAX)

58 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,	58 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,

59 media::VIDEO_CODEC_PROFILE_MIN,	59 media::VIDEO_CODEC_PROFILE_MIN,

60 media::VIDEO_CODEC_PROFILE_MAX)	60 media::VIDEO_CODEC_PROFILE_MAX)

61	61

62 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)	62 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)

63 IPC_STRUCT_MEMBER(int32, share_group_id)	63 IPC_STRUCT_MEMBER(int32, share_group_id)

64 IPC_STRUCT_MEMBER(std::vector<int>, attribs)	64 IPC_STRUCT_MEMBER(std::vector<int>, attribs)

65 IPC_STRUCT_MEMBER(GURL, active_url)	65 IPC_STRUCT_MEMBER(GURL, active_url)

66 IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference)	66 IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference)

67 IPC_STRUCT_END()	67 IPC_STRUCT_END()

(...skipping 703 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
771	771

772 // Notify the renderer that an output buffer has been filled with encoded data.	772 // Notify the renderer that an output buffer has been filled with encoded data.

773 IPC_MESSAGE_ROUTED3(AcceleratedVideoEncoderHostMsg_BitstreamBufferReady,	773 IPC_MESSAGE_ROUTED3(AcceleratedVideoEncoderHostMsg_BitstreamBufferReady,

774 int32 /* bitstream_buffer_id */,	774 int32 /* bitstream_buffer_id */,

775 uint32 /* payload_size */,	775 uint32 /* payload_size */,

776 bool /* key_frame */)	776 bool /* key_frame */)

777	777

778 // Report error condition.	778 // Report error condition.

779 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError,	779 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError,

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

OLD	NEW