From e9582f6f7babf621cef4733f8a0d8fe4b738b562 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 4 Aug 2022 15:29:11 -0700 Subject: [PATCH 1/2] chore: cherry-pick 06aea31d10f8 from webrtc --- patches/webrtc/.patches | 1 + patches/webrtc/cherry-pick-06aea31d10f8.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 patches/webrtc/cherry-pick-06aea31d10f8.patch diff --git a/patches/webrtc/.patches b/patches/webrtc/.patches index 9cde1db8895b3..7eca8e5e44222 100644 --- a/patches/webrtc/.patches +++ b/patches/webrtc/.patches @@ -1 +1,2 @@ add_thread_local_to_x_error_trap_cc.patch +cherry-pick-06aea31d10f8.patch diff --git a/patches/webrtc/cherry-pick-06aea31d10f8.patch b/patches/webrtc/cherry-pick-06aea31d10f8.patch new file mode 100644 index 0000000000000..02bce4c624558 --- /dev/null +++ b/patches/webrtc/cherry-pick-06aea31d10f8.patch @@ -0,0 +1,36 @@ +From 06aea31d10f860ae4236e3422252557762d39188 Mon Sep 17 00:00:00 2001 +From: Henrik Boström +Date: Wed, 13 Jul 2022 11:10:14 +0200 +Subject: [PATCH] [Merge-104] Disallow invalid arguments in RestoreEncodingLayers. + +Changing DCHECK into CHECK for good measure. + +(cherry picked from commit 2b1f509f3a05035a17917061a71b16114e8c72dc) + +No-Try: True +Bug: chromium:1343889 +Change-Id: I2cede85dc2d2a4238739f73afe25275047f4aa50 +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268460 +Reviewed-by: Ilya Nikolaevskiy +Commit-Queue: Henrik Boström +Cr-Original-Commit-Position: refs/heads/main@{#37511} +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/269242 +Cr-Commit-Position: refs/branch-heads/5112@{#8} +Cr-Branched-From: a976a871159f85f975fbd6f170d0a8f00a4aee49-refs/heads/main@{#37168} +--- + +diff --git a/pc/rtp_sender.cc b/pc/rtp_sender.cc +index 3ee9145..86bf644 100644 +--- a/pc/rtp_sender.cc ++++ b/pc/rtp_sender.cc +@@ -75,8 +75,8 @@ + const RtpParameters& parameters, + const std::vector& removed_rids, + const std::vector& all_layers) { +- RTC_DCHECK_EQ(parameters.encodings.size() + removed_rids.size(), +- all_layers.size()); ++ RTC_CHECK_EQ(parameters.encodings.size() + removed_rids.size(), ++ all_layers.size()); + RtpParameters result(parameters); + result.encodings.clear(); + size_t index = 0; From 6a6a270fe44953f4e3efbc06b74508ddf09e8327 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 22:40:53 +0000 Subject: [PATCH 2/2] chore: update patches --- patches/webrtc/cherry-pick-06aea31d10f8.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/webrtc/cherry-pick-06aea31d10f8.patch b/patches/webrtc/cherry-pick-06aea31d10f8.patch index 02bce4c624558..f0ba743781630 100644 --- a/patches/webrtc/cherry-pick-06aea31d10f8.patch +++ b/patches/webrtc/cherry-pick-06aea31d10f8.patch @@ -1,7 +1,10 @@ -From 06aea31d10f860ae4236e3422252557762d39188 Mon Sep 17 00:00:00 2001 -From: Henrik Boström +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Wed, 13 Jul 2022 11:10:14 +0200 -Subject: [PATCH] [Merge-104] Disallow invalid arguments in RestoreEncodingLayers. +Subject: Disallow invalid arguments in RestoreEncodingLayers. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Changing DCHECK into CHECK for good measure. @@ -17,13 +20,12 @@ Cr-Original-Commit-Position: refs/heads/main@{#37511} Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/269242 Cr-Commit-Position: refs/branch-heads/5112@{#8} Cr-Branched-From: a976a871159f85f975fbd6f170d0a8f00a4aee49-refs/heads/main@{#37168} ---- diff --git a/pc/rtp_sender.cc b/pc/rtp_sender.cc -index 3ee9145..86bf644 100644 +index 58fef4041ecfcef3a76fcfb296c923355f68625c..3604d198e8fabf8a689746f073b6783fc827e7c5 100644 --- a/pc/rtp_sender.cc +++ b/pc/rtp_sender.cc -@@ -75,8 +75,8 @@ +@@ -75,8 +75,8 @@ RtpParameters RestoreEncodingLayers( const RtpParameters& parameters, const std::vector& removed_rids, const std::vector& all_layers) {