content/common/gpu/media/gpu_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/gpu_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: 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/gpu_messages.h ('k') | content/common/gpu/media/gpu_video_encode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a2b325ac9ab045274dea365bb32188ef2bf5bea7..4f4a356cdd9a1ec98ec2e2854a60ec426e9d4e57 100644

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

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

@@ -10,6 +10,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "content/common/gpu/gpu_command_buffer_stub.h"

+#include "gpu/config/gpu_info.h"

#include "ipc/ipc_listener.h"

#include "media/video/video_encode_accelerator.h"

#include "ui/gfx/size.h"

@@ -58,8 +59,11 @@ class GpuVideoEncodeAccelerator

// Static query for supported profiles. This query calls the appropriate

// platform-specific version.

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

- GetSupportedProfiles();

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

+ GetSupportedProfiles();

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

+ ConvertMediaToGpuProfiles(const std::vector<

+ media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);

private:

// Create the appropriate platform-specific VEA.