Commit 70378ea1 authored by Mans Rullgard's avatar Mans Rullgard

fate: run aref and vref as regular tests

These tests create reference files used for psnr calculation in
the other codec tests.  Treating them as (mostly) regular tests
simplifies the makefile and makes them visible in the fate reports.
The latter makes errors in these runs easier to identify.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent dede36bd
...@@ -187,18 +187,16 @@ lavftest: fate-lavf ...@@ -187,18 +187,16 @@ lavftest: fate-lavf
lavfitest: fate-lavfi lavfitest: fate-lavfi
seektest: fate-seek seektest: fate-seek
AREF = tests/data/acodec.ref.wav AREF = fate-acodec-aref
VREF = tests/data/vsynth1.ref.yuv VREF = fate-vsynth1-vref fate-vsynth2-vref
REFS = $(AREF) $(VREF) REFS = $(AREF) $(VREF)
$(REFS): TAG = GEN
$(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
$(M)$(SRC_PATH)/tests/codec-regression.sh vref vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
$(Q)$(SRC_PATH)/tests/codec-regression.sh vref vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)"
$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw $(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw
$(M)$(SRC_PATH)/tests/codec-regression.sh aref acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)"
fate-acodec-aref: CMD = codectest acodec
fate-vsynth1-vref: CMD = codectest vsynth1
fate-vsynth2-vref: CMD = codectest vsynth2
ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
@echo @echo
...@@ -287,7 +285,7 @@ FATE_UTILS = base64 tiny_psnr ...@@ -287,7 +285,7 @@ FATE_UTILS = base64 tiny_psnr
fate: $(FATE) fate: $(FATE)
$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) $(FATE) $(REFS): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
@echo "TEST $(@:fate-%=%)" @echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)'
......
...@@ -16,10 +16,10 @@ rm -f "$benchfile" ...@@ -16,10 +16,10 @@ rm -f "$benchfile"
# generate reference for quality check # generate reference for quality check
if [ -n "$do_vref" ]; then if [ -n "$do_vref" ]; then
do_ffmpeg_nocheck $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo $target_path/$raw_ref do_ffmpeg $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo
fi fi
if [ -n "$do_aref" ]; then if [ -n "$do_aref" ]; then
do_ffmpeg_nocheck $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav $target_path/$pcm_ref do_ffmpeg $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav
fi fi
if [ -n "$do_mpeg" ] ; then if [ -n "$do_mpeg" ] ; then
......
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/acodec.ref.wav
1058444 ./tests/data/acodec.ref.wav
c5ccac874dbf808e9088bc3107860042 *./tests/data/vsynth1.ref.yuv
7603200 ./tests/data/vsynth1.ref.yuv
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/vsynth2.ref.yuv
7603200 ./tests/data/vsynth2.ref.yuv
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment