[FFmpeg-cvslog] r24134 - in trunk: Makefile tests/fate-run.sh

[mru]

Author: mru
Date: Fri Jul  9 02:40:51 2010
New Revision: 24134

Log:
fate: add oneoff comparison method

This adds the 'oneoff' comparison method.  It compares two s16le pcm
files with a max difference <= the fuzz factor treated as success.
Default fuzz is 1.  On failure, the full tiny_psnr output is printed.

Modified:
   trunk/Makefile
   trunk/tests/fate-run.sh

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Fri Jul  9 02:40:45 2010	(r24133)
+++ trunk/Makefile	Fri Jul  9 02:40:51 2010	(r24134)
@@ -279,7 +279,7 @@ include $(SRC_PATH_BARE)/tests/fate.mak
 
 ifdef SAMPLES
 fate: $(FATE_TESTS)
-$(FATE_TESTS): ffmpeg$(EXESUF)
+$(FATE_TESTS): ffmpeg$(EXESUF) tests/tiny_psnr$(HOSTEXESUF)
 	@echo "TEST FATE   $(@:fate-%=%)"
 	@$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)'
 else

Modified: trunk/tests/fate-run.sh
==============================================================================
--- trunk/tests/fate-run.sh	Fri Jul  9 02:40:45 2010	(r24133)
+++ trunk/tests/fate-run.sh	Fri Jul  9 02:40:51 2010	(r24134)
@@ -15,10 +15,20 @@ fuzz=$8
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
 
+oneoff(){
+    psnr=$(tests/tiny_psnr "$1" "$2" 2 0 0)
+    max=$(expr "$psnr" : '.*MAXDIFF: *\([0-9]*\)')
+    if [ $max -gt ${3:-1} ]; then
+        echo "$psnr"
+        return 1
+    fi
+}
+
 mkdir -p "$outdir"
 
 eval $target_exec $command > "$outfile" 2>/dev/null
 
 case $cmp in
     diff)   diff -u -w "$ref" "$outfile"            ;;
+    oneoff) oneoff     "$ref" "$outfile" "$fuzz"    ;;
 esac