On Sun, Mar 8, 2015 at 11:06 PM, Claudio Freire <klaussfre...@gmail.com> wrote:
> On Sun, Mar 8, 2015 at 8:23 AM, Michael Niedermayer <michae...@gmx.at> wrote:
>> i think its better to leave fuzz at a small value otherwise we
>> would forget to update the target when it improves and then
>> subsequent worsenings could be missed
>
> An updated version with that fixed.
>
> It's a bit tricky to squash commits with git format-patch, so if
> there's an issue with the patch just apply it with patch -p1, works
> that way (tried)
Dang, forgot to attach the patch.
Now truly attached.
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..bab1e5f 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -95,6 +95,26 @@ fate-aac-aref-encode: CMP_TARGET = 434
fate-aac-aref-encode: SIZE_TOLERANCE = 2464
fate-aac-aref-encode: FUZZ = 5
+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 = 414
+fate-aac-s7350-encode: SIZE_TOLERANCE = 4096
+fate-aac-s7350-encode: FUZZ = 5
+
+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 = 451
+fate-aac-arefms-encode: SIZE_TOLERANCE = 2464
+fate-aac-arefms-encode: FUZZ = 5
+
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
fate-aac-ln-encode: CMP = stddev
@@ -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 = 65
+fate-aac-lnms-encode: SIZE_TOLERANCE = 3560
+fate-aac-lnms-encode: FUZZ = 5
+
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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
