virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

aptx: do some clipping to match original codec in extreme cases

Browse Source
This commit is contained in:
Aurelien Jacobs
2018-01-06 01:31:02 +01:00
parent fea8e119a2
commit 96b217f5e8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/aptx.c
View File

@@ -466,6 +466,7 @@ static void aptx_quantize_difference(Quantize *quantize,
int64_t error; int64_t error;
sample_difference_abs = FFABS(sample_difference); sample_difference_abs = FFABS(sample_difference);
sample_difference_abs = FFMIN(sample_difference_abs, (1 << 23) - 1);
quantized_sample = aptx_bin_search(sample_difference_abs >> 4, quantized_sample = aptx_bin_search(sample_difference_abs >> 4,
quantization_factor, quantization_factor,
@@ -478,7 +479,7 @@ static void aptx_quantize_difference(Quantize *quantize,
mean = (intervals[1] + intervals[0]) / 2; mean = (intervals[1] + intervals[0]) / 2;
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)av_clip_intp2(mean + d, 23) << 32), 32);
error = ((int64_t)sample_difference_abs << 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));