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

Unified Diff: content/common/gpu/media/android_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/android_video_encode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_encode_accelerator.cc b/content/common/gpu/media/android_video_encode_accelerator.cc
index 2507ea41c1f9b3c6782adc3681186827433da991..ff8e8d3f50d9543f5663e35090a58ff9e9cf2546 100644
--- a/content/common/gpu/media/android_video_encode_accelerator.cc
+++ b/content/common/gpu/media/android_video_encode_accelerator.cc
@@ -77,12 +77,12 @@ AndroidVideoEncodeAccelerator::~AndroidVideoEncodeAccelerator() {
DCHECK(thread_checker_.CalledOnValidThread());
}
-std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
AndroidVideoEncodeAccelerator::GetSupportedProfiles() {
std::vector<MediaCodecBridge::CodecsInfo> codecs_info =
MediaCodecBridge::GetCodecsInfo();
- std::vector<SupportedProfile> profiles;
+ std::vector<gpu::VideoEncodeAcceleratorSupportedProfile> profiles;
#if defined(ENABLE_WEBRTC)
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
@@ -98,7 +98,7 @@ AndroidVideoEncodeAccelerator::GetSupportedProfiles() {
// We're only looking for a HW VP8 encoder.
continue;
}
- SupportedProfile profile;
+ gpu::VideoEncodeAcceleratorSupportedProfile profile;
profile.profile = media::VP8PROFILE_ANY;
// Wouldn't it be nice if MediaCodec exposed the maximum capabilities of the
// encoder? Sure would be. Too bad it doesn't. So we hard-code some

Powered by Google App Engine
This is Rietveld 408576698