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

Unified Diff: content/common/gpu/media/v4l2_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/v4l2_video_encode_accelerator.cc
diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.cc b/content/common/gpu/media/v4l2_video_encode_accelerator.cc
index 12f88d0329d1835c5d5e5c6ca6c9c12deabd2e66..5e9342175209653cc05340b849e72aaf08e0dee5 100644
--- a/content/common/gpu/media/v4l2_video_encode_accelerator.cc
+++ b/content/common/gpu/media/v4l2_video_encode_accelerator.cc
@@ -280,15 +280,15 @@ void V4L2VideoEncodeAccelerator::Destroy() {
delete this;
}
-std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
V4L2VideoEncodeAccelerator::GetSupportedProfiles() {
return GetSupportedProfilesStatic();
}
-std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
V4L2VideoEncodeAccelerator::GetSupportedProfilesStatic() {
- std::vector<SupportedProfile> profiles;
- SupportedProfile profile;
+ std::vector<gpu::VideoEncodeAcceleratorSupportedProfile> profiles;
+ gpu::VideoEncodeAcceleratorSupportedProfile profile;
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->HasSwitch(switches::kEnableWebRtcHWVp8Encoding)) {

Powered by Google App Engine
This is Rietveld 408576698