1 |
From: Fabian Vogt <fabian@ritter-vogt.de> |
2 |
Subject: Don't require open264 when proprietary_codecs are supported |
3 |
|
4 |
diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/chromium/third_party/webrtc/webrtc.gni |
5 |
index ca8acdbf259..36897a72aa8 100644 |
6 |
--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni |
7 |
+++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni |
8 |
@@ -151,8 +151,7 @@ declare_args() { |
9 |
# |
10 |
# Enabling H264 when building with MSVC is currently not supported, see |
11 |
# bugs.webrtc.org/9213#c13 for more info. |
12 |
- rtc_use_h264 = |
13 |
- proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang) |
14 |
+ rtc_use_h264 = false |
15 |
|
16 |
# Enable this flag to make webrtc::Mutex be implemented by absl::Mutex. |
17 |
rtc_use_absl_mutex = false |
18 |
|
19 |
diff --git a/src/core/config/common.pri b/src/core/config/common.pri |
20 |
index d9d64e76..cd0fd120 100644 |
21 |
--- a/src/core/config/common.pri |
22 |
+++ b/src/core/config/common.pri |
23 |
@@ -26,9 +26,6 @@ |
24 |
|
25 |
qtConfig(webengine-proprietary-codecs) { |
26 |
gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\" |
27 |
- qtConfig(webengine-webrtc) { |
28 |
- gn_args += rtc_use_h264=true |
29 |
- } |
30 |
} else { |
31 |
gn_args += proprietary_codecs=false |
32 |
} |
33 |
@@ -46,3 +43,8 @@ |
34 |
} |
35 |
|
36 |
!qtConfig(webengine-nodejs10): gn_args += use_rollup=false |
37 |
+ |
38 |
+gn_args += "media_use_openh264=false" |
39 |
+gn_args += "rtc_use_h264=false" |
40 |
+gn_args += "use_system_libxml=true" |
41 |
+gn_args += "use_system_libxslt=true" |
42 |
|