content/common/gpu/media/v4l2_video_encode_accelerator.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/media/v4l2_video_encode_accelerator.h

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.cc ('k') | content/common/gpu/media/v4l2_video_encode_accelerator.cc » ('j') | gpu/config/gpu_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/v4l2_video_encode_accelerator.h

diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.h b/content/common/gpu/media/v4l2_video_encode_accelerator.h

index 900eb6b227ed02f4b27b93a89ea69e85adae24fa..c2222dde1b795bd037c545dc20e50b8bd9eec475 100644

--- a/content/common/gpu/media/v4l2_video_encode_accelerator.h

+++ b/content/common/gpu/media/v4l2_video_encode_accelerator.h

@@ -45,12 +45,12 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator

explicit V4L2VideoEncodeAccelerator(scoped_ptr<V4L2Device> device);

virtual ~V4L2VideoEncodeAccelerator();

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

- GetSupportedProfilesStatic();

+ static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>

+ GetSupportedProfilesStatic();

// media::VideoEncodeAccelerator implementation.

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

- GetSupportedProfiles() override;

+ virtual std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>

+ GetSupportedProfiles() override;

virtual bool Initialize(media::VideoFrame::Format format,

const gfx::Size& input_visible_size,

media::VideoCodecProfile output_profile,