diff options
| author | Haixia Shi <hshi@chromium.org> | 2014-09-30 15:26:19 -0700 |
|---|---|---|
| committer | Haixia Shi <hshi@chromium.org> | 2014-09-30 22:26:54 +0000 |
| commit | 921292677ef93355d81efa352499e418515e02d6 (patch) | |
| tree | 9fa5a71a363e7170d3a00d7c04067817542369ec | |
| parent | c8d8751339982424fa235316e36660bad0808052 (diff) | |
| download | chromium_src-921292677ef93355d81efa352499e418515e02d6.zip chromium_src-921292677ef93355d81efa352499e418515e02d6.tar.gz chromium_src-921292677ef93355d81efa352499e418515e02d6.tar.bz2 | |
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
TBR=posciak@chromium.org
Cr-Commit-Position: refs/heads/master@{#297070}
(cherry picked from commit 172379d53ad5be5b92d34f179409d50aa9e36630)
Review URL: https://codereview.chromium.org/619783002
Cr-Commit-Position: refs/branch-heads/2171@{#5}
Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
| -rw-r--r-- | content/common/gpu/media/v4l2_video_encode_accelerator.cc | 12 |
1 files 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 4581518..3e4789c 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; } |