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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: fix typo 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 side-by-side diff with in-line comments

Download patch

« content/common/gpu/client/gpu_video_encode_accelerator_host.cc ('K') | « 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_messages.h

diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h

index 3e253023e97733885fa3b7036a7547bdcd590877..25ae1ae07f1313f6ae73be52d87c3066f9367540 100644

--- a/content/common/gpu/gpu_messages.h

+++ b/content/common/gpu/gpu_messages.h

@@ -64,6 +64,9 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,

IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::CollectInfoResult,

gpu::kCollectInfoNone,

gpu::kCollectInfoFatalFailure)

+IPC_ENUM_TRAITS_MIN_MAX_VALUE(gpu::VideoCodecProfile,

+ gpu::VIDEO_CODEC_PROFILE_MIN,

+ gpu::VIDEO_CODEC_PROFILE_MAX)

IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)

IPC_STRUCT_MEMBER(int32, share_group_id)

@@ -138,7 +141,7 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice)

IPC_STRUCT_TRAITS_MEMBER(device_string)

IPC_STRUCT_TRAITS_END()

-IPC_STRUCT_TRAITS_BEGIN(media::VideoEncodeAccelerator::SupportedProfile)

+IPC_STRUCT_TRAITS_BEGIN(gpu::VideoEncodeAcceleratorSupportedProfile)

IPC_STRUCT_TRAITS_MEMBER(profile)

IPC_STRUCT_TRAITS_MEMBER(max_resolution)

IPC_STRUCT_TRAITS_MEMBER(max_framerate_numerator)