From d3070f43b19f503246be4ebad425d87568a71ce0 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Wed, 27 Dec 2017 11:07:19 +0100 Subject: [PATCH] Add 'is_chrome_branded' guard to the default of 'rtc_use_h264' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This doesn't change behavior at the moment because Chromium's 'proprietary_codecs' is already conditional on 'is_chrome_branded' but this guards WebRTC's default from upstream changes like https://chromium-review.googlesource.com/c/chromium/src/+/835010/6/build/config/features.gni TBR=phoglund@webrtc.org Bug: webrtc:8675 Change-Id: Ic2ae311b5fc70a4d1ac1aefe4cc27574e4fcee40 Reviewed-on: https://webrtc-review.googlesource.com/36321 Commit-Queue: Oleh Prypin Reviewed-by: Oleh Prypin Reviewed-by: Henrik Boström Cr-Commit-Position: refs/heads/master@{#21452} --- webrtc.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni index fc9eadba54..986598b831 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -149,7 +149,8 @@ declare_args() { # also: |rtc_initialize_ffmpeg|. # CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING. # http://www.openh264.org, https://www.ffmpeg.org/ - rtc_use_h264 = proprietary_codecs && !is_android && !is_ios + rtc_use_h264 = + is_chrome_branded && proprietary_codecs && !is_android && !is_ios # By default, use normal platform audio support or dummy audio, but don't # use file-based audio playout and record.