diff options
author | hbos <hbos@chromium.org> | 2016-02-25 03:29:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 11:30:51 +0000 |
commit | b43b719e4e54f569eeefd2beb85517d75bf6cbfd (patch) | |
tree | ad174f85e36df9d515dbf089bcb11d4ed8ed16f9 /content/public/renderer | |
parent | 01b0707fb431514e2826b8a3e41afc5156e61e68 (diff) | |
download | chromium_src-b43b719e4e54f569eeefd2beb85517d75bf6cbfd.zip chromium_src-b43b719e4e54f569eeefd2beb85517d75bf6cbfd.tar.gz chromium_src-b43b719e4e54f569eeefd2beb85517d75bf6cbfd.tar.bz2 |
Re-upload of https://codereview.chromium.org/1673183002/.
Enable H.264 video WebRTC behind run-time flag and add
WebRtcBrowserTest for H.264.
The compile flag |rtc_use_h264| defaults to
|proprietary_codecs| which is used on some Chromium bots
and in the official Chrome build. The new run-time flag
|kWebRtcH264WithOpenH264FFmpeg| determines if the
|rtc_use_h264| encoder/decoder will be used at runtime.
The run-time flag is off by default.
This CL:
- Adds run-time flag and a new build target for it. It is
placed in content/public/common/ because it
can't/shouldn't be placed in the webrtc repo and
peer_connection_dependency_factory.cc lives in
content/renderer/media/webrtc/.
- Moves renderer_features and its generated header file
target from content/renderer/ to content/public/common/
to not break include rules and renames it to
common_features.
- Based on the run-time flag, enables or disables H.264
in peer_connection_dependency_factory.cc.
- If flag is on, runs a new H.264 browser test.
BUG=chromium:500605, chromium:468365
Review URL: https://codereview.chromium.org/1718883002
Cr-Commit-Position: refs/heads/master@{#377556}
Diffstat (limited to 'content/public/renderer')
-rw-r--r-- | content/public/renderer/BUILD.gn | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn index 719eadf..c6bcae1 100644 --- a/content/public/renderer/BUILD.gn +++ b/content/public/renderer/BUILD.gn @@ -49,7 +49,11 @@ source_set("renderer_sources") { rebase_path(content_renderer_gypi_values.public_renderer_webrtc_sources, ".", "//content") - deps += [ "//third_party/webrtc" ] + deps += [ + "//content/public/common:feature_h264_with_openh264_ffmpeg", + "//content/public/common:features", + "//third_party/webrtc", + ] } if (enable_plugins) { |