gpu/config/gpu_info.cc - 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: gpu/config/gpu_info.cc

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 side-by-side diff with in-line comments

Download patch

Index: gpu/config/gpu_info.cc

diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc

index c7951f9d61105750407f5a01028b65bba22949f5..f1f67cee9178fce094c4532877a53ea22888e90b 100644

--- a/gpu/config/gpu_info.cc

+++ b/gpu/config/gpu_info.cc

@@ -19,7 +19,7 @@ void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator,

void EnumerateVideoEncodeAcceleratorSupportedProfile(

gpu::GPUInfo::Enumerator* enumerator,

- const media::VideoEncodeAccelerator::SupportedProfile profile) {

+ const gpu::VideoEncodeAcceleratorSupportedProfile profile) {

enumerator->BeginVideoEncodeAcceleratorSupportedProfile();

enumerator->AddInt("profile", profile.profile);

enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width());

@@ -101,7 +101,7 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {

CollectInfoResult dx_diagnostics_info_state;

DxDiagNode dx_diagnostics;

#endif

- std::vector<media::VideoEncodeAccelerator::SupportedProfile>

+ std::vector<VideoEncodeAcceleratorSupportedProfile>

video_encode_accelerator_supported_profiles;

};

« no previous file with comments | « gpu/config/gpu_info.h ('k') | media/base/video_decoder_config.h » ('j') | no next file with comments »