2010-08-04 18:47:20 +00:00
|
|
|
FATE_AAC += fate-aac-al04_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al04_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al04_44.mp4
|
2010-08-04 18:47:20 +00:00
|
|
|
fate-aac-al04_44: REF = $(SAMPLES)/aac/al04_44.s16
|
|
|
|
|
|
2017-08-18 21:07:29 +00:00
|
|
|
FATE_AAC += fate-aac-al04sf_48
|
|
|
|
|
fate-aac-al04sf_48: CMD = pcm -i $(TARGET_SAMPLES)/aac/al04sf_48.mp4
|
|
|
|
|
fate-aac-al04sf_48: REF = $(SAMPLES)/aac/al04sf_48.s16
|
|
|
|
|
|
2011-06-28 06:12:55 +00:00
|
|
|
FATE_AAC += fate-aac-al05_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al05_44.mp4
|
2011-06-28 06:12:55 +00:00
|
|
|
fate-aac-al05_44: REF = $(SAMPLES)/aac/al05_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC += fate-aac-al06_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al06_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al06_44.mp4
|
2012-01-31 23:54:21 +00:00
|
|
|
fate-aac-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16
|
2011-06-28 06:12:55 +00:00
|
|
|
|
2010-08-04 18:47:20 +00:00
|
|
|
FATE_AAC += fate-aac-al07_96
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al07_96: CMD = pcm -i $(TARGET_SAMPLES)/aac/al07_96.mp4
|
2012-01-31 23:54:21 +00:00
|
|
|
fate-aac-al07_96: REF = $(SAMPLES)/aac/al07_96_reorder.s16
|
2010-08-04 18:47:20 +00:00
|
|
|
|
2011-12-29 21:20:22 +00:00
|
|
|
FATE_AAC += fate-aac-al15_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al15_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al15_44.mp4
|
2012-01-31 23:54:21 +00:00
|
|
|
fate-aac-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16
|
2011-12-29 21:20:22 +00:00
|
|
|
|
2011-06-28 06:12:55 +00:00
|
|
|
FATE_AAC += fate-aac-al17_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al17_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al17_44.mp4
|
2011-06-28 06:12:55 +00:00
|
|
|
fate-aac-al17_44: REF = $(SAMPLES)/aac/al17_44.s16
|
|
|
|
|
|
2011-12-29 21:20:22 +00:00
|
|
|
FATE_AAC += fate-aac-al18_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al18_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al18_44.mp4
|
2011-12-29 21:20:22 +00:00
|
|
|
fate-aac-al18_44: REF = $(SAMPLES)/aac/al18_44.s16
|
|
|
|
|
|
2010-08-04 18:47:20 +00:00
|
|
|
FATE_AAC += fate-aac-am00_88
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-am00_88: CMD = pcm -i $(TARGET_SAMPLES)/aac/am00_88.mp4
|
2010-08-04 18:47:20 +00:00
|
|
|
fate-aac-am00_88: REF = $(SAMPLES)/aac/am00_88.s16
|
|
|
|
|
|
2011-12-29 21:20:22 +00:00
|
|
|
FATE_AAC += fate-aac-am05_44
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-am05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/am05_44.mp4
|
2012-01-31 23:54:21 +00:00
|
|
|
fate-aac-am05_44: REF = $(SAMPLES)/aac/am05_44_reorder.s16
|
2011-12-29 21:20:22 +00:00
|
|
|
|
2010-08-04 18:47:20 +00:00
|
|
|
FATE_AAC += fate-aac-al_sbr_hq_cm_48_2
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_2.mp4
|
2010-08-04 18:47:20 +00:00
|
|
|
fate-aac-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16
|
|
|
|
|
|
2012-01-07 01:23:49 +00:00
|
|
|
FATE_AAC += fate-aac-al_sbr_hq_cm_48_5.1
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_5.1.mp4
|
2012-01-31 23:54:21 +00:00
|
|
|
fate-aac-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16
|
2012-01-07 01:23:49 +00:00
|
|
|
|
2013-12-23 20:07:45 +00:00
|
|
|
FATE_AAC += fate-aac-al_sbr_hq_sr_48_2_fsaac48
|
|
|
|
|
fate-aac-al_sbr_hq_sr_48_2_fsaac48: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_sr_48_2_fsaac48.mp4
|
|
|
|
|
fate-aac-al_sbr_hq_sr_48_2_fsaac48: REF = $(SAMPLES)/aac/al_sbr_hq_sr_48_2_fsaac48.s16
|
|
|
|
|
|
2017-05-23 18:19:14 +00:00
|
|
|
FATE_AAC += fate-aac-al_sbr_ps_04_ur
|
|
|
|
|
fate-aac-al_sbr_ps_04_ur: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_ps_04_new.mp4
|
|
|
|
|
fate-aac-al_sbr_ps_04_ur: REF = $(SAMPLES)/aac/al_sbr_ps_04_ur.s16
|
|
|
|
|
|
2010-08-04 18:47:20 +00:00
|
|
|
FATE_AAC += fate-aac-al_sbr_ps_06_ur
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_ps_06_new.mp4
|
2010-08-04 18:47:20 +00:00
|
|
|
fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
|
|
|
|
|
|
2011-04-26 22:19:52 +00:00
|
|
|
FATE_AAC += fate-aac-ap05_48
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-ap05_48: CMD = pcm -i $(TARGET_SAMPLES)/aac/ap05_48.mp4
|
2011-04-26 22:19:52 +00:00
|
|
|
fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
|
|
|
|
|
|
2013-10-14 21:40:05 +00:00
|
|
|
FATE_AAC += fate-aac-er_ad6000np_44_ep0
|
|
|
|
|
fate-aac-er_ad6000np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_ad6000np_44_ep0.mp4
|
2013-12-24 06:21:08 +00:00
|
|
|
fate-aac-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44.s16
|
2013-10-14 21:40:05 +00:00
|
|
|
|
2013-12-24 06:35:48 +00:00
|
|
|
FATE_AAC += fate-aac-er_eld1001np_44_ep0
|
|
|
|
|
fate-aac-er_eld1001np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld1001np_44_ep0.mp4
|
|
|
|
|
fate-aac-er_eld1001np_44_ep0: REF = $(SAMPLES)/aac/er_eld1001np_44.s16
|
|
|
|
|
|
2013-10-22 10:04:47 +00:00
|
|
|
FATE_AAC += fate-aac-er_eld2000np_48_ep0
|
|
|
|
|
fate-aac-er_eld2000np_48_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4
|
|
|
|
|
fate-aac-er_eld2000np_48_ep0: REF = $(SAMPLES)/aac/er_eld2000np_48_ep0.s16
|
|
|
|
|
|
2015-01-28 01:54:03 +00:00
|
|
|
FATE_AAC += fate-aac-er_eld2100np_48_ep0
|
|
|
|
|
fate-aac-er_eld2100np_48_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld2100np_48_ep0.mp4
|
|
|
|
|
fate-aac-er_eld2100np_48_ep0: REF = $(SAMPLES)/aac/er_eld2100np_48.s16
|
|
|
|
|
|
2015-07-20 11:36:21 +00:00
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al04_44
|
|
|
|
|
fate-aac-fixed-al04_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al04_44.mp4
|
|
|
|
|
fate-aac-fixed-al04_44: REF = $(SAMPLES)/aac/al04_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al05_44
|
|
|
|
|
fate-aac-fixed-al05_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al05_44.mp4
|
|
|
|
|
fate-aac-fixed-al05_44: REF = $(SAMPLES)/aac/al05_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al06_44
|
|
|
|
|
fate-aac-fixed-al06_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al06_44.mp4
|
|
|
|
|
fate-aac-fixed-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al15_44
|
|
|
|
|
fate-aac-fixed-al15_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al15_44.mp4
|
|
|
|
|
fate-aac-fixed-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al17_44
|
|
|
|
|
fate-aac-fixed-al17_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al17_44.mp4
|
|
|
|
|
fate-aac-fixed-al17_44: REF = $(SAMPLES)/aac/al17_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al18_44
|
|
|
|
|
fate-aac-fixed-al18_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al18_44.mp4
|
|
|
|
|
fate-aac-fixed-al18_44: REF = $(SAMPLES)/aac/al18_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al_sbr_hq_cm_48_2
|
|
|
|
|
fate-aac-fixed-al_sbr_hq_cm_48_2: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_2.mp4
|
|
|
|
|
fate-aac-fixed-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al_sbr_hq_cm_48_5.1
|
|
|
|
|
fate-aac-fixed-al_sbr_hq_cm_48_5.1: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_5.1.mp4
|
|
|
|
|
fate-aac-fixed-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-al_sbr_hq_sr_48_2_fsaac48
|
|
|
|
|
fate-aac-fixed-al_sbr_hq_sr_48_2_fsaac48: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al_sbr_sr_48_2_fsaac48.mp4
|
|
|
|
|
fate-aac-fixed-al_sbr_hq_sr_48_2_fsaac48: REF = $(SAMPLES)/aac/al_sbr_hq_sr_48_2_fsaac48.s16
|
|
|
|
|
|
|
|
|
|
#FATE_AAC_FIXED += fate-aac-fixed-al_sbr_ps_06_ur
|
|
|
|
|
#fate-aac-fixed-al_sbr_ps_06_ur: CMD = pcm -c aac_fixed-i $(TARGET_SAMPLES)/aac/al_sbr_ps_06_new.mp4
|
|
|
|
|
#fate-aac-fixed-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-ap05_48
|
|
|
|
|
fate-aac-fixed-ap05_48: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/ap05_48.mp4
|
|
|
|
|
fate-aac-fixed-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-er_ad6000np_44_ep0
|
|
|
|
|
fate-aac-fixed-er_ad6000np_44_ep0: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/er_ad6000np_44_ep0.mp4
|
|
|
|
|
fate-aac-fixed-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-er_eld1001np_44_ep0
|
|
|
|
|
fate-aac-fixed-er_eld1001np_44_ep0: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/er_eld1001np_44_ep0.mp4
|
|
|
|
|
fate-aac-fixed-er_eld1001np_44_ep0: REF = $(SAMPLES)/aac/er_eld1001np_44.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_FIXED += fate-aac-fixed-er_eld2000np_48_ep0
|
|
|
|
|
fate-aac-fixed-er_eld2000np_48_ep0: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4
|
|
|
|
|
fate-aac-fixed-er_eld2000np_48_ep0: REF = $(SAMPLES)/aac/er_eld2000np_48_ep0.s16
|
2013-10-14 21:40:05 +00:00
|
|
|
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-ct%: CMD = pcm -i $(TARGET_SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%)
|
2011-11-23 00:28:14 +00:00
|
|
|
fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav
|
|
|
|
|
|
2012-10-19 23:12:18 +00:00
|
|
|
FATE_AAC_CT_RAW = fate-aac-ct-sbr_i-ps_i.aac
|
|
|
|
|
|
2011-11-23 00:28:14 +00:00
|
|
|
FATE_AAC_CT = sbr_bc-ps_i.3gp \
|
|
|
|
|
sbr_bic-ps_i.3gp \
|
|
|
|
|
sbr_bc-ps_bc.mp4 \
|
|
|
|
|
sbr_bc-ps_i.mp4 \
|
|
|
|
|
sbr_i-ps_bic.mp4 \
|
|
|
|
|
sbr_i-ps_i.mp4
|
|
|
|
|
|
|
|
|
|
FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%)
|
|
|
|
|
|
2012-04-06 19:39:44 +00:00
|
|
|
FATE_AAC_ENCODE += fate-aac-aref-encode
|
2012-06-17 15:59:00 +00:00
|
|
|
fate-aac-aref-encode: ./tests/data/asynth-44100-2.wav
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -c:a aac -aac_coder fast -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 512k -fflags +bitexact -flags +bitexact
|
2012-04-06 19:39:44 +00:00
|
|
|
fate-aac-aref-encode: CMP = stddev
|
2012-05-29 23:39:24 +00:00
|
|
|
fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav
|
2012-04-06 19:39:44 +00:00
|
|
|
fate-aac-aref-encode: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-aref-encode: CMP_TARGET = 596
|
2012-04-06 19:39:44 +00:00
|
|
|
fate-aac-aref-encode: SIZE_TOLERANCE = 2464
|
AAC encoder: improve SF range utilization
This patch does 4 things, all of which interact and thus it
woudln't be possible to commit them separately without causing
either quality regressions or assertion failures.
Fate comparison targets don't all reflect improvements in
quality, yet listening tests show substantially improved quality
and stability.
1. Increase SF range utilization.
The spec requires SF delta values to be constrained within the
range -60..60. The previous code was applying that range to
the whole SF array and not only the deltas of consecutive values,
because doing so requires smarter code: zeroing or otherwise
skipping a band may invalidate lots of SF choices.
This patch implements that logic to allow the coders to utilize
the full dynamic range of scalefactors, increasing quality quite
considerably, and fixing delta-SF-related assertion failures,
since now the limitation is enforced rather than asserted.
2. PNS tweaks
The previous modification makes big improvements in twoloop's
efficiency, and every time that happens PNS logic needs to be
tweaked accordingly to avoid it from stepping all over twoloop's
decisions. This patch includes modifications of the sort.
3. Account for lowpass cutoff during PSY analysis
The closer PSY's allocation is to final allocation the better
the quality is, and given these modifications, twoloop is now
very efficient at avoiding holes. Thus, to compute accurate
thresholds, PSY needs to account for the lowpass applied
implicitly during twoloop (by zeroing high bands).
This patch makes twoloop set the cutoff in psymodel's context
the first time it runs, and makes PSY account for it during
threshold computation, making PE and threshold computations
closer to the final allocation and thus achieving better
subjective quality.
4. Tweaks to RC lambda tracking loop in relation to PNS
Without this tweak some corner cases cause quality regressions.
Basically, lambda needs to react faster to overall bitrate
efficiency changes since now PNS can be quite successful in
enforcing maximum bitrates, when PSY allocates too many bits
to the lower bands, suppressing the signals RC logic uses to
lower lambda in those cases and causing aggressive PNS.
This tweak makes PNS much less aggressive, though it can still
use some further tweaks.
Also update MIPS specializations and adjust fuzz
Also in lavc/mips/aacpsy_mips.h: remove trailing whitespace
2015-12-01 06:28:36 +00:00
|
|
|
fate-aac-aref-encode: FUZZ = 89
|
2012-04-06 19:39:44 +00:00
|
|
|
|
|
|
|
|
FATE_AAC_ENCODE += fate-aac-ln-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-ln-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 512k -fflags +bitexact -flags +bitexact
|
2012-04-06 19:39:44 +00:00
|
|
|
fate-aac-ln-encode: CMP = stddev
|
2014-06-03 22:00:32 +00:00
|
|
|
fate-aac-ln-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
2012-04-06 19:39:44 +00:00
|
|
|
fate-aac-ln-encode: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-ln-encode: CMP_TARGET = 72
|
2012-04-06 19:39:44 +00:00
|
|
|
fate-aac-ln-encode: SIZE_TOLERANCE = 3560
|
AAC encoder: Extensive improvements
This finalizes merging of the work in the patches in ticket #2686.
Improvements to twoloop and RC logic are extensive.
The non-exhaustive list of twoloop improvments includes:
- Tweaks to distortion limits on the RD optimization phase of twoloop
- Deeper search in twoloop
- PNS information marking to let twoloop decide when to use it
(turned out having the decision made separately wasn't working)
- Tonal band detection and priorization
- Better band energy conservation rules
- Strict hole avoidance
For rate control:
- Use psymodel's bit allocation to allow proper use of the bit
reservoir. Don't work against the bit reservoir by moving lambda
in the opposite direction when psymodel decides to allocate more/less
bits to a frame.
- Retry the encode if the effective rate lies outside a reasonable
margin of psymodel's allocation or the selected ABR.
- Log average lambda at the end. Useful info for everyone, but especially
for tuning of the various encoder constants that relate to lambda
feedback.
Psy:
- Do not apply lowpass with a FIR filter, instead just let the coder
zero bands above the cutoff. The FIR filter induces group delay,
and while zeroing bands causes ripple, it's lost in the quantization
noise.
- Experimental VBR bit allocation code
- Tweak automatic lowpass filter threshold to maximize audio bandwidth
at all bitrates while still providing acceptable, stable quality.
I/S:
- Phase decision fixes. Unrelated to #2686, but the bugs only surfaced
when the merge was finalized. Measure I/S band energy accounting for
phase, and prevent I/S and M/S from being applied both.
PNS:
- Avoid marking short bands with PNS when they're part of a window
group in which there's a large variation of energy from one window
to the next. PNS can't preserve those and the effect is extremely
noticeable.
M/S:
- Implement BMLD protection similar to the specified in
ISO-IEC/13818:7-2003, Appendix C Section 6.1. Since M/S decision
doesn't conform to section 6.1, a different method had to be
implemented, but should provide equivalent protection.
- Move the decision logic closer to the method specified in
ISO-IEC/13818:7-2003, Appendix C Section 6.1. Specifically,
make sure M/S needs less bits than dual stereo.
- Don't apply M/S in bands that are using I/S
Now, this of course needed adjustments in the compare targets and
fuzz factors of the AAC encoder's fate tests, but if wondering why
the targets go up (more distortion), consider the previous coder
was using too many bits on LF content (far more than required by
psy), and thus those signals will now be more distorted, not less.
The extra distortion isn't audible though, I carried extensive
ABX testing to make sure.
A very similar patch was also extensively tested by Kamendo2 in
the context of #2686.
2015-10-11 20:29:50 +00:00
|
|
|
fate-aac-ln-encode: FUZZ = 30
|
2012-04-06 19:39:44 +00:00
|
|
|
|
2015-09-15 06:59:45 +00:00
|
|
|
FATE_AAC_ENCODE += fate-aac-ln-encode-128k
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-ln-encode-128k: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050 -fflags +bitexact -flags +bitexact
|
2015-09-15 06:59:45 +00:00
|
|
|
fate-aac-ln-encode-128k: CMP = stddev
|
|
|
|
|
fate-aac-ln-encode-128k: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
|
|
|
|
fate-aac-ln-encode-128k: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-ln-encode-128k: CMP_TARGET = 622
|
2015-09-15 06:59:45 +00:00
|
|
|
fate-aac-ln-encode-128k: SIZE_TOLERANCE = 3560
|
2022-11-17 11:39:47 +00:00
|
|
|
fate-aac-ln-encode-128k: FUZZ = 10
|
2015-09-15 06:59:45 +00:00
|
|
|
|
2015-08-22 07:12:20 +00:00
|
|
|
FATE_AAC_ENCODE += fate-aac-pns-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-pns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_pns 1 -aac_is 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050 -fflags +bitexact -flags +bitexact
|
2015-08-22 07:12:20 +00:00
|
|
|
fate-aac-pns-encode: CMP = stddev
|
|
|
|
|
fate-aac-pns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
|
|
|
|
fate-aac-pns-encode: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-pns-encode: CMP_TARGET = 655
|
2015-08-22 07:12:20 +00:00
|
|
|
fate-aac-pns-encode: SIZE_TOLERANCE = 3560
|
2016-03-05 20:58:16 +00:00
|
|
|
fate-aac-pns-encode: FUZZ = 74
|
2015-08-22 07:12:20 +00:00
|
|
|
|
2015-08-29 06:00:17 +00:00
|
|
|
FATE_AAC_ENCODE += fate-aac-tns-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-tns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_tns 1 -aac_is 0 -aac_pns 0 -aac_ms 0 -b:a 128k -cutoff 22050 -fflags +bitexact -flags +bitexact
|
2015-08-29 06:00:17 +00:00
|
|
|
fate-aac-tns-encode: CMP = stddev
|
|
|
|
|
fate-aac-tns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
|
|
|
|
fate-aac-tns-encode: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-tns-encode: CMP_TARGET = 637
|
2015-12-13 21:11:00 +00:00
|
|
|
fate-aac-tns-encode: FUZZ = 7
|
2015-08-29 06:00:17 +00:00
|
|
|
fate-aac-tns-encode: SIZE_TOLERANCE = 3560
|
2015-08-22 07:12:20 +00:00
|
|
|
|
|
|
|
|
FATE_AAC_ENCODE += fate-aac-is-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-is-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_pns 0 -aac_is 1 -aac_ms 0 -b:a 128k -aac_tns 0 -cutoff 22050 -fflags +bitexact -flags +bitexact
|
2015-08-22 07:12:20 +00:00
|
|
|
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
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-is-encode: CMP_TARGET = 514
|
2015-08-22 07:12:20 +00:00
|
|
|
fate-aac-is-encode: SIZE_TOLERANCE = 3560
|
2016-01-08 09:18:24 +00:00
|
|
|
fate-aac-is-encode: FUZZ = 10
|
2015-08-22 07:12:20 +00:00
|
|
|
|
2015-10-17 04:59:19 +00:00
|
|
|
FATE_AAC_ENCODE += fate-aac-ms-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-ms-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_pns 0 -aac_is 0 -aac_ms 1 -aac_tns 0 -b:a 128k -cutoff 22050 -fflags +bitexact -flags +bitexact
|
2015-10-17 04:59:19 +00:00
|
|
|
fate-aac-ms-encode: CMP = stddev
|
|
|
|
|
fate-aac-ms-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
|
|
|
|
fate-aac-ms-encode: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-ms-encode: CMP_TARGET = 558
|
2015-10-17 04:59:19 +00:00
|
|
|
fate-aac-ms-encode: SIZE_TOLERANCE = 3560
|
AAC encoder: improve SF range utilization
This patch does 4 things, all of which interact and thus it
woudln't be possible to commit them separately without causing
either quality regressions or assertion failures.
Fate comparison targets don't all reflect improvements in
quality, yet listening tests show substantially improved quality
and stability.
1. Increase SF range utilization.
The spec requires SF delta values to be constrained within the
range -60..60. The previous code was applying that range to
the whole SF array and not only the deltas of consecutive values,
because doing so requires smarter code: zeroing or otherwise
skipping a band may invalidate lots of SF choices.
This patch implements that logic to allow the coders to utilize
the full dynamic range of scalefactors, increasing quality quite
considerably, and fixing delta-SF-related assertion failures,
since now the limitation is enforced rather than asserted.
2. PNS tweaks
The previous modification makes big improvements in twoloop's
efficiency, and every time that happens PNS logic needs to be
tweaked accordingly to avoid it from stepping all over twoloop's
decisions. This patch includes modifications of the sort.
3. Account for lowpass cutoff during PSY analysis
The closer PSY's allocation is to final allocation the better
the quality is, and given these modifications, twoloop is now
very efficient at avoiding holes. Thus, to compute accurate
thresholds, PSY needs to account for the lowpass applied
implicitly during twoloop (by zeroing high bands).
This patch makes twoloop set the cutoff in psymodel's context
the first time it runs, and makes PSY account for it during
threshold computation, making PE and threshold computations
closer to the final allocation and thus achieving better
subjective quality.
4. Tweaks to RC lambda tracking loop in relation to PNS
Without this tweak some corner cases cause quality regressions.
Basically, lambda needs to react faster to overall bitrate
efficiency changes since now PNS can be quite successful in
enforcing maximum bitrates, when PSY allocates too many bits
to the lower bands, suppressing the signals RC logic uses to
lower lambda in those cases and causing aggressive PNS.
This tweak makes PNS much less aggressive, though it can still
use some further tweaks.
Also update MIPS specializations and adjust fuzz
Also in lavc/mips/aacpsy_mips.h: remove trailing whitespace
2015-12-01 06:28:36 +00:00
|
|
|
fate-aac-ms-encode: FUZZ = 15
|
2015-10-17 04:59:19 +00:00
|
|
|
|
2016-04-03 18:28:17 +00:00
|
|
|
#Ticket1784
|
|
|
|
|
FATE_AAC_ENCODE += fate-aac-yoraw-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-yoraw-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav -c:a aac -aac_coder fast -fflags +bitexact -flags +bitexact
|
2016-04-03 18:28:17 +00:00
|
|
|
fate-aac-yoraw-encode: CMP = stddev
|
|
|
|
|
fate-aac-yoraw-encode: REF = $(SAMPLES)/audio-reference/yo.raw-short.wav
|
|
|
|
|
fate-aac-yoraw-encode: CMP_SHIFT = -12288
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-yoraw-encode: CMP_TARGET = 226
|
2016-04-03 18:28:17 +00:00
|
|
|
fate-aac-yoraw-encode: SIZE_TOLERANCE = 3560
|
|
|
|
|
fate-aac-yoraw-encode: FUZZ = 17
|
|
|
|
|
|
|
|
|
|
|
2015-08-29 06:00:54 +00:00
|
|
|
FATE_AAC_ENCODE += fate-aac-pred-encode
|
2021-05-21 17:28:50 +00:00
|
|
|
fate-aac-pred-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -profile:a aac_main -c:a aac -aac_coder fast -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050 -fflags +bitexact -flags +bitexact
|
2015-08-29 06:00:54 +00:00
|
|
|
fate-aac-pred-encode: CMP = stddev
|
|
|
|
|
fate-aac-pred-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
|
|
|
|
|
fate-aac-pred-encode: CMP_SHIFT = -4096
|
2018-01-13 11:46:29 +00:00
|
|
|
fate-aac-pred-encode: CMP_TARGET = 662
|
2015-10-27 03:48:17 +00:00
|
|
|
fate-aac-pred-encode: FUZZ = 12
|
2015-08-29 06:00:54 +00:00
|
|
|
fate-aac-pred-encode: SIZE_TOLERANCE = 3560
|
|
|
|
|
|
2012-10-20 10:19:54 +00:00
|
|
|
FATE_AAC_LATM += fate-aac-latm_000000001180bc60
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-latm_000000001180bc60: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_000000001180bc60.mpg
|
2012-10-20 10:19:54 +00:00
|
|
|
fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
|
|
|
|
|
|
|
|
|
|
FATE_AAC_LATM += fate-aac-latm_stereo_to_51
|
2013-05-19 22:55:32 +00:00
|
|
|
fate-aac-latm_stereo_to_51: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1
|
2012-10-20 10:19:54 +00:00
|
|
|
fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16
|
|
|
|
|
|
2017-04-10 16:36:19 +00:00
|
|
|
fate-aac-autobsf-adtstoasc: CMD = transcode "aac" $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \
|
|
|
|
|
matroska "-c:a copy" "-c:a copy"
|
2016-04-15 08:18:01 +00:00
|
|
|
|
2012-10-19 23:12:18 +00:00
|
|
|
FATE_AAC-$(call DEMDEC, AAC, AAC) += $(FATE_AAC_CT_RAW)
|
|
|
|
|
FATE_AAC-$(call DEMDEC, MOV, AAC) += $(FATE_AAC)
|
|
|
|
|
FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM) += $(FATE_AAC_LATM)
|
2015-07-20 11:36:21 +00:00
|
|
|
FATE_AAC-$(call DEMDEC, AAC, AAC_FIXED)+= $(FATE_AAC_FIXED)
|
2012-10-19 23:12:18 +00:00
|
|
|
|
2015-07-20 11:36:21 +00:00
|
|
|
FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes)
|
2012-05-10 00:14:44 +00:00
|
|
|
|
2012-10-20 10:21:41 +00:00
|
|
|
$(FATE_AAC_ALL): CMP = oneoff
|
|
|
|
|
$(FATE_AAC_ALL): FUZZ = 2
|
|
|
|
|
|
2013-03-08 01:44:07 +00:00
|
|
|
FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS) += $(FATE_AAC_ENCODE)
|
|
|
|
|
|
2016-04-15 08:18:01 +00:00
|
|
|
FATE_AAC_BSF-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc
|
|
|
|
|
|
|
|
|
|
FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes)
|
2012-10-20 10:21:41 +00:00
|
|
|
|
2016-04-15 08:18:01 +00:00
|
|
|
fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) $(FATE_AAC_BSF-yes)
|
2012-10-19 23:12:18 +00:00
|
|
|
fate-aac-latm: $(FATE_AAC_LATM-yes)
|
