From 172379d53ad5be5b92d34f179409d50aa9e36630 Mon Sep 17 00:00:00 2001 From: posciak Date: Fri, 26 Sep 2014 16:33:36 -0700 Subject: [PATCH] V4L2VEA: Expose H264 HW encoding as well, even if VP8 is available H264 is useful for some users that cannot use VP8. BUG=chromium:414567 TEST=run apprtc and ensure it still uses VP8 where available Review URL: https://codereview.chromium.org/603263004 Cr-Commit-Position: refs/heads/master@{#297070} --- .../gpu/media/v4l2_video_encode_accelerator.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.cc b/content/common/gpu/media/v4l2_video_encode_accelerator.cc index 4581518b236b9..3e4789c0b9daa 100644 --- a/content/common/gpu/media/v4l2_video_encode_accelerator.cc +++ b/content/common/gpu/media/v4l2_video_encode_accelerator.cc @@ -292,14 +292,14 @@ V4L2VideoEncodeAccelerator::GetSupportedProfiles() { profile.max_framerate_numerator = 30; profile.max_framerate_denominator = 1; profiles.push_back(profile); - } else { - profile.profile = media::H264PROFILE_MAIN; - profile.max_resolution.SetSize(1920, 1088); - profile.max_framerate_numerator = 30; - profile.max_framerate_denominator = 1; - profiles.push_back(profile); } + profile.profile = media::H264PROFILE_MAIN; + profile.max_resolution.SetSize(1920, 1088); + profile.max_framerate_numerator = 30; + profile.max_framerate_denominator = 1; + profiles.push_back(profile); + return profiles; }