Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Unified Diff: content/common/gpu/media/vaapi_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
Index: content/common/gpu/media/vaapi_video_encode_accelerator.cc
diff --git a/content/common/gpu/media/vaapi_video_encode_accelerator.cc b/content/common/gpu/media/vaapi_video_encode_accelerator.cc
index 14ffe34355012f74e4ce4e72c13f24ae8b915b7a..8aa2f9470feaf8ee468756fd936c4ef4837b36cf 100644
--- a/content/common/gpu/media/vaapi_video_encode_accelerator.cc
+++ b/content/common/gpu/media/vaapi_video_encode_accelerator.cc
@@ -104,9 +104,9 @@ struct VaapiVideoEncodeAccelerator::BitstreamBufferRef {
const size_t size;
};
-std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
VaapiVideoEncodeAccelerator::GetSupportedProfiles() {
- std::vector<SupportedProfile> profiles;
+ std::vector<gpu::VideoEncodeAcceleratorSupportedProfile> profiles;
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode))
@@ -116,7 +116,7 @@ VaapiVideoEncodeAccelerator::GetSupportedProfiles() {
VaapiWrapper::GetSupportedEncodeProfiles(
x_display_, base::Bind(&base::DoNothing));
- media::VideoEncodeAccelerator::SupportedProfile profile;
+ gpu::VideoEncodeAcceleratorSupportedProfile profile;
profile.max_resolution.SetSize(1920, 1088);
profile.max_framerate_numerator = kDefaultFramerate;
profile.max_framerate_denominator = 1;

Powered by Google App Engine
This is Rietveld 408576698