FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
authorJustin Ruggles <justin.ruggles@gmail.com>
Sat, 10 Mar 2012 23:53:19 +0000 (18:53 -0500)
committerJustin Ruggles <justin.ruggles@gmail.com>
Thu, 15 Mar 2012 18:40:24 +0000 (14:40 -0400)
This will allow adjusting for any encoder or decoder delay when doing
comparisons.

tests/Makefile
tests/fate-run.sh

index 5c65237..760915a 100644 (file)
@@ -116,7 +116,7 @@ fate: $(FATE)
 
 $(FATE): avconv$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
        @echo "TEST    $(@:fate-%=%)"
-       $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)'
+       $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)'
 
 fate-list:
        @printf '%s\n' $(sort $(FATE))
index 419a3eb..94d7cf8 100755 (executable)
@@ -18,6 +18,7 @@ fuzz=${8:-1}
 threads=${9:-1}
 thread_type=${10:-frame+slice}
 cpuflags=${11:-all}
+cmp_shift=${12:-0}
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
@@ -26,7 +27,7 @@ cmpfile="${outdir}/${test}.diff"
 repfile="${outdir}/${test}.rep"
 
 do_tiny_psnr(){
-    psnr=$(tests/tiny_psnr "$1" "$2" 2 0 0)
+    psnr=$(tests/tiny_psnr "$1" "$2" 2 $cmp_shift 0)
     val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
     size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
     size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')