06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Wed, 9 Oct 2019 20:12:00 +0000
|
|
Subject: Bug 1587159 - Fix undefined shift in g722_encode.c; r=ng
|
|
|
|
Left shifting a negative value results in undefined behaviour. It is safer to
|
|
multiply in this case.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D48751
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/385d660fac359c907986e08d1d89ab5a353f30b2
|
|
---
|
|
modules/third_party/g722/g722_encode.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/third_party/g722/g722_encode.c b/modules/third_party/g722/g722_encode.c
|
|
index 10a5bcfe7c..fedf9f5961 100644
|
|
--- a/modules/third_party/g722/g722_encode.c
|
|
+++ b/modules/third_party/g722/g722_encode.c
|
|
@@ -74,7 +74,7 @@ static void block4(G722EncoderState *s, int band, int d)
|
|
/* Block 4, UPPOL2 */
|
|
for (i = 0; i < 3; i++)
|
|
s->band[band].sg[i] = s->band[band].p[i] >> 15;
|
|
- wd1 = saturate(s->band[band].a[1] << 2);
|
|
+ wd1 = saturate(s->band[band].a[1] * 4);
|
|
|
|
wd2 = (s->band[band].sg[0] == s->band[band].sg[1]) ? -wd1 : wd1;
|
|
if (wd2 > 32767)
|