RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-11 09:07:29 +00:00
Code Issues Projects Releases Wiki Activity

aptx: factorize FFABS calculation

Browse Source
This commit is contained in:
Aurelien Jacobs 2018-01-06 01:22:31 +01:00
parent b7915f8a14
commit fea8e119a2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aptx.c
View File

@ -462,10 +462,12 @@ static void aptx_quantize_difference(Quantize *quantize,
{ {
const int32_t *intervals = tables->quantize_intervals; const int32_t *intervals = tables->quantize_intervals;
int32_t quantized_sample, dithered_sample, parity_change; int32_t quantized_sample, dithered_sample, parity_change;
int32_t d, mean, interval, inv; int32_t d, mean, interval, inv, sample_difference_abs;
int64_t error; int64_t error;
quantized_sample = aptx_bin_search(FFABS(sample_difference) >> 4, sample_difference_abs = FFABS(sample_difference);
quantized_sample = aptx_bin_search(sample_difference_abs >> 4,
quantization_factor, quantization_factor,
intervals, tables->tables_size); intervals, tables->tables_size);
@ -477,7 +479,7 @@ static void aptx_quantize_difference(Quantize *quantize,
interval = (intervals[1] - intervals[0]) * (-(sample_difference < 0) | 1); interval = (intervals[1] - intervals[0]) * (-(sample_difference < 0) | 1);
dithered_sample = rshift64_clip24(MUL64(dither, interval) + ((int64_t)(mean + d) << 32), 32); dithered_sample = rshift64_clip24(MUL64(dither, interval) + ((int64_t)(mean + d) << 32), 32);
error = ((int64_t)FFABS(sample_difference) << 20) - MUL64(dithered_sample, quantization_factor); error = ((int64_t)sample_difference_abs << 20) - MUL64(dithered_sample, quantization_factor);
quantize->error = FFABS(rshift64(error, 23)); quantize->error = FFABS(rshift64(error, 23));
parity_change = quantized_sample; parity_change = quantized_sample;