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 6bf0e3b68e57fcc279c79dd04f3429ca798b7a06..b3b05ede4812115bcc33e97b993cf10129497d51 100644 |
--- a/content/common/gpu/media/vaapi_video_encode_accelerator.cc |
+++ b/content/common/gpu/media/vaapi_video_encode_accelerator.cc |
@@ -107,24 +107,11 @@ struct VaapiVideoEncodeAccelerator::BitstreamBufferRef { |
std::vector<media::VideoEncodeAccelerator::SupportedProfile> |
VaapiVideoEncodeAccelerator::GetSupportedProfiles() { |
- std::vector<SupportedProfile> profiles; |
- |
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode)) |
Pawel Osciak
2015/03/02 11:00:20
I think we should move this to VaapiWrapper::GetSu
henryhsu
2015/03/03 10:48:01
Done.
|
- return profiles; |
- |
- std::vector<media::VideoCodecProfile> hw_profiles = |
- VaapiWrapper::GetSupportedEncodeProfiles(base::Bind(&base::DoNothing)); |
- |
- media::VideoEncodeAccelerator::SupportedProfile profile; |
- profile.max_resolution.SetSize(1920, 1088); |
- profile.max_framerate_numerator = kDefaultFramerate; |
- profile.max_framerate_denominator = 1; |
- for (size_t i = 0; i < hw_profiles.size(); i++) { |
- profile.profile = hw_profiles[i]; |
- profiles.push_back(profile); |
- } |
- return profiles; |
+ return std::vector<SupportedProfile>(); |
+ |
+ return VaapiWrapper::GetSupportedEncodeProfiles(); |
} |
static unsigned int Log2OfPowerOf2(unsigned int x) { |