diff options
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0082.patch')
| -rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0082.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0082.patch b/third_party/libwebrtc/moz-patch-stack/0082.patch index d54ddf9d75..1d9ff301d6 100644 --- a/third_party/libwebrtc/moz-patch-stack/0082.patch +++ b/third_party/libwebrtc/moz-patch-stack/0082.patch @@ -1,24 +1,24 @@ -From: Michael Froman <mfroman@mozilla.com> -Date: Wed, 5 Jul 2023 19:15:00 +0000 -Subject: Bug 1841864 - upstream commit 4baea5b07f should properly check size - of encoder_config_.simulcast_layers. r=jib +From: Mike Hommey <mh+mozilla@glandium.org> +Date: Fri, 7 Jul 2023 00:58:00 +0000 +Subject: Bug 1841577 - Don't set WEBRTC_ENABLE_AVX2 on platforms that don't + have AVX2. r=mjf,webrtc-reviewers -Differential Revision: https://phabricator.services.mozilla.com/D182813 -Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/a7179d8d75313b6c9c76a496e10d102da019ff4f +Differential Revision: https://phabricator.services.mozilla.com/D182695 +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/46fb51c90709be64c35946a8cf69195121441024 --- - video/video_stream_encoder.cc | 2 +- + webrtc.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc -index 2e5a120eed..c5f086e155 100644 ---- a/video/video_stream_encoder.cc -+++ b/video/video_stream_encoder.cc -@@ -1392,7 +1392,7 @@ void VideoStreamEncoder::ReconfigureEncoder() { +diff --git a/webrtc.gni b/webrtc.gni +index e339ba25fe..e1273475b9 100644 +--- a/webrtc.gni ++++ b/webrtc.gni +@@ -310,7 +310,7 @@ declare_args() { - bool is_svc = false; - bool single_stream_or_non_first_inactive = true; -- for (size_t i = 1; i < encoder_config_.number_of_streams; ++i) { -+ for (size_t i = 1; i < encoder_config_.simulcast_layers.size(); ++i) { - if (encoder_config_.simulcast_layers[i].active) { - single_stream_or_non_first_inactive = false; - break; + # Set this to true to enable the avx2 support in webrtc. + # TODO: Make sure that AVX2 works also for non-clang compilers. +- if (is_clang == true) { ++ if (is_clang == true && (target_cpu == "x86" || target_cpu == "x64")) { + rtc_enable_avx2 = true + } else { + rtc_enable_avx2 = false |