mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
AAC encoder: fix I/S relative error evaluation
The relative error between two encoding strategies is the simple difference of rate-distortion values, and not the absolute difference. An absolute measure would allow worsening of the quantization error as well as improving.
This commit is contained in:
parent
6711aa21e2
commit
aa64a48357
@ -87,7 +87,7 @@ struct AACISError ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
|
||||
|
||||
is_error.pass = dist2 <= dist1;
|
||||
is_error.phase = phase;
|
||||
is_error.error = fabsf(dist1 - dist2);
|
||||
is_error.error = dist2 - dist1;
|
||||
is_error.dist1 = dist1;
|
||||
is_error.dist2 = dist2;
|
||||
is_error.ener01 = ener01;
|
||||
|
@ -191,9 +191,9 @@ fate-aac-is-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-ref
|
||||
fate-aac-is-encode: CMP = stddev
|
||||
fate-aac-is-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
||||
fate-aac-is-encode: CMP_SHIFT = -4096
|
||||
fate-aac-is-encode: CMP_TARGET = 725
|
||||
fate-aac-is-encode: CMP_TARGET = 597
|
||||
fate-aac-is-encode: SIZE_TOLERANCE = 3560
|
||||
fate-aac-is-encode: FUZZ = 5
|
||||
fate-aac-is-encode: FUZZ = 10
|
||||
|
||||
FATE_AAC_ENCODE += fate-aac-ms-encode
|
||||
fate-aac-ms-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -strict -2 -c:a aac -aac_pns 0 -aac_is 0 -aac_ms 1 -aac_tns 0 -b:a 128k -cutoff 22050
|
||||
|
Loading…
x
Reference in New Issue
Block a user