content/common/gpu/media/gpu_video_encode_accelerator.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: content/common/gpu/media/gpu_video_encode_accelerator.cc

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

Download patch

« no previous file with comments | « content/common/gpu/media/gpu_video_encode_accelerator.h ('k') | content/common/gpu/media/v4l2_video_encode_accelerator.h » ('j') | gpu/config/gpu_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/gpu_video_encode_accelerator.cc

diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc

index 1f4c395cb17a121747fc45d13009751b41125534..df011fd49ce97944918ea356db674fd9ad568b50 100644

--- a/content/common/gpu/media/gpu_video_encode_accelerator.cc

+++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc

@@ -163,7 +163,7 @@ void GpuVideoEncodeAccelerator::OnWillDestroyStub() {

}

// static

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

+std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>

GpuVideoEncodeAccelerator::GetSupportedProfiles() {

#if defined(OS_CHROMEOS) && defined(USE_X11) && defined(ARCH_CPU_ARMEL)

// This is a work-around for M39 because the video device is not ready at

@@ -173,7 +173,7 @@ GpuVideoEncodeAccelerator::GetSupportedProfiles() {

#endif

scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder();

if (!encoder)

- return std::vector<media::VideoEncodeAccelerator::SupportedProfile>();

+ return std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>();

return encoder->GetSupportedProfiles();

}