patch for flv deblocking by (Garrick Meeker <gmeeker at theoryllc dot com>)

[ffmpeg] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index e39eda7e1b74b7999c0ba81b1b2c695e7f42a573..398651995a149063bcbbc1262c36eaf09ce25330 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -6,18 +6,27 @@ include ../config.mak
 
 VPATH=$(SRC_PATH)/tests
 CFLAGS=-O2 -Wall -g
-REFFILE=$(SRC_PATH)/tests/ffmpeg.regression.ref
+
+REFFILE1=$(SRC_PATH)/tests/ffmpeg.regression.ref
+REFFILE2=$(SRC_PATH)/tests/rotozoom.regression.ref
+
+SERVER_REFFILE=$(SRC_PATH)/tests/ffserver.regression.ref
+
 LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref
 
-all: test
+all fulltest: test libavtest test-server
+
+test-server: vsynth1/0.pgm asynth1.sw
+       @$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
 # fast regression tests for all codecs
-test mpeg4 mpeg: vsynth1/0.pgm asynth1.sw
-       @$(SRC_PATH)/tests/regression.sh $@ $(REFFILE)
+test mpeg4 mpeg: vsynth1/0.pgm vsynth2/0.pgm asynth1.sw tiny_psnr
+       @$(SRC_PATH)/tests/regression.sh $@ $(REFFILE1) vsynth1
+       @$(SRC_PATH)/tests/regression.sh $@ $(REFFILE2) vsynth2
 
 # fast regression for libav formats
 libavtest: vsynth1/0.pgm asynth1.sw
-       @$(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE)
+       @$(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) vsynth1
 
 # video generation
 
@@ -25,9 +34,16 @@ vsynth1/0.pgm: videogen
        @mkdir -p vsynth1
        ./videogen 'vsynth1/'
 
+vsynth2/0.pgm: rotozoom
+       @mkdir -p vsynth2
+       ./rotozoom 'vsynth2/' $(SRC_PATH)/tests/lena.pnm
+
 videogen: videogen.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
+rotozoom: rotozoom.c
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+
 # audio generation
 
 asynth1.sw: audiogen
@@ -36,6 +52,9 @@ asynth1.sw: audiogen
 audiogen: audiogen.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
+tiny_psnr: tiny_psnr.c
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+        
 DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
  $(SRC_PATH)/libavcodec/i386/dsputil_mmx_avg.h \
  $(SRC_PATH)/libavcodec/i386/dsputil_mmx_rnd.h \
@@ -53,5 +72,5 @@ dsptest: dsptest.c $(DSPDEPS)
        $(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
 
 clean:
-       rm -rf vsynth1
-       rm -f asynth1.sw *~ audiogen videogen
+       rm -rf vsynth1 vsynth2 data
+       rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr