Chromium Code Reviews| 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..14d2d9646bd1b9522716bebbd5a5bfdd9c954d87 100644 |
| --- a/content/common/gpu/media/vaapi_video_encode_accelerator.cc |
| +++ b/content/common/gpu/media/vaapi_video_encode_accelerator.cc |
| @@ -113,16 +113,11 @@ VaapiVideoEncodeAccelerator::GetSupportedProfiles() { |
| if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode)) |
| 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); |
| + profiles = VaapiWrapper::GetSupportedEncodeProfiles(); |
| + |
| + for (size_t i = 0; i < profiles.size(); i++) { |
| + profiles[i].max_framerate_numerator = kDefaultFramerate; |
|
wuchengli
2015/02/13 15:38:54
Let's move setting framerate and make a copy of kD
henryhsu
2015/02/13 17:24:28
Done.
|
| + profiles[i].max_framerate_denominator = 1; |
| } |
| return profiles; |
| } |