RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

g723.1: optimise scale_vector() 

Firstly, nothing in this function can overflow 32 bits so the use
of a 64-bit type is completely unnecessary.  Secondly, the scale
is either a power of two or 0x7fff.  Doing separate loops for these
cases avoids using multiplications.  Finally, since only the number
of bits, not the actual value, of the maximum value is needed, the
bitwise or of all the values serves the purpose while being faster.

It is worth noting that even if overflow could happen, it was not
handled correctly anyway.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2012-08-10 18:15:41 +01:00
parent 1eb1f6f281
commit 4aca716a53
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/g723_1.c
View File

@ -281,19 +281,21 @@ static int normalize_bits(int num, int width)
static int scale_vector(int16_t *vector, int length)
{
int bits, max = 0;
int64_t scale;
int i;
for (i = 0; i < length; i++)
max = FFMAX(max, FFABS(vector[i]));
max |= FFABS(vector[i]);
max = FFMIN(max, 0x7FFF);
bits = normalize_bits(max, 15);
scale = (bits == 15) ? 0x7FFF : (1 << bits);
for (i = 0; i < length; i++)
vector[i] = av_clipl_int32(vector[i] * scale << 1) >> 4;
if (bits == 15)
for (i = 0; i < length; i++)
vector[i] = vector[i] * 0x7fff >> 3;
else
for (i = 0; i < length; i++)
vector[i] = vector[i] << bits >> 3;
return bits - 3;
}