On Fri, Mar 6, 2015 at 2:19 PM, Michael Niedermayer <michae...@gmx.at> wrote: >> So it seems the test doesn't set up the LD_LIBRARY_PATH correctly. >> That's fixable, I'll see about getting a patch for that when I >> understand the makefile layout. >> >> In the meantime, I'm *guessing* a test would look like the patch >> attached, but I still cannot run it. It says it won't, because: >> warning: only a subset of the fate tests will be run because SAMPLES >> is not specified >> >> Any idea where to get the samples? It's not just any samples, it wants >> a specific set of samples. > > configure with --samples= to point to some directory and run > make fate-rsync > (this will need about 900mb space)
Yeah, that works. Attached another patch that adds the tests. Goes on top of the initial patch (with the fixes themselves)
From 9ebb5b6d0085a547938afb32c7d203686f7fcf11 Mon Sep 17 00:00:00 2001 From: Claudio Freire <klaussfre...@gmail.com> Date: Sun, 8 Mar 2015 03:53:22 -0300 Subject: [PATCH] Add AAC tests for 7350hz sampling rates and M/S Also tweak fuzz factor to not error out on too little distortion (ie: codec improvement) --- tests/fate-run.sh | 6 ++++++ tests/fate/aac.mak | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 824d5f4..feac731 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -50,6 +50,12 @@ do_tiny_psnr(){ size_cmp=$(compare $size1 $size2 $size_tolerance) if [ "$val_cmp" != 0 ] || [ "$size_cmp" != 0 ]; then echo "$psnr" + if [ "$val_cmp" != 0 ]; then + echo "$3: |$val - $cmp_target| >= $fuzz" + fi + if [ "$size_cmp" != 0 ]; then + echo "size: |$size1 - $size2| >= $size_tolerance" + fi return 1 fi } diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 34823be..cda80a4 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -91,9 +91,29 @@ fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aa fate-aac-aref-encode: CMP = stddev fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav fate-aac-aref-encode: CMP_SHIFT = -4096 -fate-aac-aref-encode: CMP_TARGET = 434 +fate-aac-aref-encode: CMP_TARGET = 225 fate-aac-aref-encode: SIZE_TOLERANCE = 2464 -fate-aac-aref-encode: FUZZ = 5 +fate-aac-aref-encode: FUZZ = 225 + +FATE_AAC_ENCODE += fate-aac-s7350-encode +fate-aac-s7350-encode: ./tests/data/asynth-7350-2.wav +fate-aac-s7350-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 256k +fate-aac-s7350-encode: CMP = stddev +fate-aac-s7350-encode: REF = ./tests/data/asynth-7350-2.wav +fate-aac-s7350-encode: CMP_SHIFT = -4096 +fate-aac-s7350-encode: CMP_TARGET = 225 +fate-aac-s7350-encode: SIZE_TOLERANCE = 4096 +fate-aac-s7350-encode: FUZZ = 225 + +FATE_AAC_ENCODE += fate-aac-arefms-encode +fate-aac-arefms-encode: ./tests/data/asynth-44100-2.wav +fate-aac-arefms-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -stereo_mode auto -b:a 512k +fate-aac-arefms-encode: CMP = stddev +fate-aac-arefms-encode: REF = ./tests/data/asynth-44100-2.wav +fate-aac-arefms-encode: CMP_SHIFT = -4096 +fate-aac-arefms-encode: CMP_TARGET = 230 +fate-aac-arefms-encode: SIZE_TOLERANCE = 2464 +fate-aac-arefms-encode: FUZZ = 230 FATE_AAC_ENCODE += fate-aac-ln-encode fate-aac-ln-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -strict -2 -c:a aac -b:a 512k @@ -103,6 +123,15 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 +FATE_AAC_ENCODE += fate-aac-lnms-encode +fate-aac-lnms-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -strict -2 -stereo_mode auto -c:a aac -b:a 512k +fate-aac-lnms-encode: CMP = stddev +fate-aac-lnms-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-aac-lnms-encode: CMP_SHIFT = -4096 +fate-aac-lnms-encode: CMP_TARGET = 35 +fate-aac-lnms-encode: SIZE_TOLERANCE = 3560 +fate-aac-lnms-encode: FUZZ = 35 + FATE_AAC_LATM += fate-aac-latm_000000001180bc60 fate-aac-latm_000000001180bc60: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_000000001180bc60.mpg fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 -- 1.8.4.5
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel