From d9474d9085ab1418220dc8c74e8da4dcc43f99b4 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Thu, 22 Mar 2012 14:13:33 -0700
Subject: [PATCH] Cast a factor to maintain precision on 16 bit systems.
The multiply would overflow with 16 bit ints. Thanks
to Riccardo Micci for pointing out the issue. Thanks
to Tim Terriberry for the valid range of the decay
argument.
Note that ft is unsigned, but always less than 32736,
so we could use a 16 bit signed type here if it allows
the compiler to produce faster code (with signed 16*16
and 16*32 multiplies). In the absense of actual cycle
counts from a real platform, I've left it as an unsigned
for the sake of readability.
For similar reasons we cast (16384-decay) to a signed
integer even though it is also always positive.
---
celt/laplace.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/celt/laplace.c b/celt/laplace.c
index 536731305..30f2aab1b 100644
--- a/celt/laplace.c
+++ b/celt/laplace.c
@@ -40,11 +40,12 @@
direction). */
#define LAPLACE_NMIN (16)
+/* When called, decay is positive and at most 11456. */
static unsigned ec_laplace_get_freq1(unsigned fs0, int decay)
{
unsigned ft;
ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN) - fs0;
- return ft*(16384-decay)>>15;
+ return ft*(opus_int32)(16384-decay)>>15;
}
void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay)
--
GitLab