diff options
| author | guidou <guidou@chromium.org> | 2016-02-19 09:01:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-19 17:02:17 +0000 |
| commit | a6d8a47c53135c18b7c20065e9e2515eb011909f (patch) | |
| tree | d52b3539a75b6776438ad1b9da17cc6574e51146 /content/public/renderer | |
| parent | 857ad942692769a415dbd2d3b462d4e624e391ab (diff) | |
| download | chromium_src-a6d8a47c53135c18b7c20065e9e2515eb011909f.zip chromium_src-a6d8a47c53135c18b7c20065e9e2515eb011909f.tar.gz chromium_src-a6d8a47c53135c18b7c20065e9e2515eb011909f.tar.bz2 | |
Revert of Enable H.264 video WebRTC behind run-time flag and add WebRtcBrowserTest for H.264 (patchset #8 id:280001 of https://codereview.chromium.org/1673183002/ )
Reason for revert:
Caused compile error on WebRTC Win Builder Chromium bot:
https://build.chromium.org/p/chromium.webrtc/builders/Win%20Builder/builds/34506
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\4087e065abebdca6dbd0caca2910c6718d2ec67f\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\content\public\common\feature_h264_with_openh264_ffmpeg.feature_h264_with_openh264_ffmpeg.obj.rsp /c ..\..\content\public\common\feature_h264_with_openh264_ffmpeg.cc /Foobj\content\public\common\feature_h264_with_openh264_ffmpeg.feature_h264_with_openh264_ffmpeg.obj /Fdobj\content\feature_h264_with_openh264_ffmpeg.cc.pdb
e:\b\build\slave\win_builder\build\src\content\public\common\feature_h264_with_openh264_ffmpeg.h(9) : fatal error C1083: Cannot open include file: 'content/public/common/common_features.h': No such file or directory
ninja: build stopped: subcommand failed.
Original issue's description:
> 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
>
> Committed: https://crrev.com/82140fb2bbb534004ea49baa1f31aa8d9646775b
> Cr-Commit-Position: refs/heads/master@{#376451}
TBR=jochen@chromium.org,avi@chromium.org,jam@chromium.org,nick@chromium.org,phoglund@chromium.org,rkaplow@chromium.org,tommi@chromium.org,hbos@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:500605, chromium:468365
Review URL: https://codereview.chromium.org/1715753002
Cr-Commit-Position: refs/heads/master@{#376464}
Diffstat (limited to 'content/public/renderer')
| -rw-r--r-- | content/public/renderer/BUILD.gn | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn index 42687cc..719eadf 100644 --- a/content/public/renderer/BUILD.gn +++ b/content/public/renderer/BUILD.gn @@ -49,10 +49,7 @@ source_set("renderer_sources") { rebase_path(content_renderer_gypi_values.public_renderer_webrtc_sources, ".", "//content") - deps += [ - "//content/public/common:feature_h264_with_openh264_ffmpeg", - "//third_party/webrtc", - ] + deps += [ "//third_party/webrtc" ] } if (enable_plugins) { |