--- tests/Makefile | 2 +- tests/fate.mak | 10 ---------- tests/fate/vp8.mak | 20 -------------------- tests/fate/vpx.mak | 38 ++++++++++++++++++++++++++++++++++++++ tests/fate2.mak | 3 --- 5 files changed, 39 insertions(+), 34 deletions(-) delete mode 100644 tests/fate/vp8.mak create mode 100644 tests/fate/vpx.mak
diff --git a/tests/Makefile b/tests/Makefile index 9d6754d..0453f02 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -50,7 +50,7 @@ include $(SRC_PATH)/tests/fate/screen.mak include $(SRC_PATH)/tests/fate/utvideo.mak include $(SRC_PATH)/tests/fate/voice.mak include $(SRC_PATH)/tests/fate/vorbis.mak -include $(SRC_PATH)/tests/fate/vp8.mak +include $(SRC_PATH)/tests/fate/vpx.mak include $(SRC_PATH)/tests/fate/wma.mak FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%) diff --git a/tests/fate.mak b/tests/fate.mak index 8f42818..711f13a 100644 --- a/tests/fate.mak +++ b/tests/fate.mak @@ -20,10 +20,6 @@ FATE_TESTS += fate-cyuv fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi FATE_TESTS += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 -FATE_TESTS += fate-ea-vp60 -fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 -FATE_TESTS += fate-ea-vp61 -fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 FATE_TESTS += fate-frwu fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi FATE_TESTS += fate-indeo2 @@ -62,11 +58,5 @@ FATE_TESTS += fate-vcr1 fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an FATE_TESTS += fate-video-xl fate-video-xl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi -FATE_TESTS += fate-vp5 -fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an -FATE_TESTS += fate-vp6a -fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv -FATE_TESTS += fate-vp6f -fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv FATE_TESTS += fate-vqf-demux fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc diff --git a/tests/fate/vp8.mak b/tests/fate/vp8.mak deleted file mode 100644 index be8f50a..0000000 --- a/tests/fate/vp8.mak +++ /dev/null @@ -1,20 +0,0 @@ -VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 - -define FATE_VP8_SUITE -FATE_VP8 += fate-vp8-test-vector$(2)-$(1) -fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf -fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) -endef - -define FATE_VP8_FULL -$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) - -FATE_VP8 += fate-vp8-sign-bias$(1) -fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf -vsync 0 -fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias -endef - -$(eval $(call FATE_VP8_FULL)) -$(eval $(call FATE_VP8_FULL,-emu-edge,-flags emu_edge)) -FATE_TESTS += $(FATE_VP8) -fate-vp8: $(FATE_VP8) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak new file mode 100644 index 0000000..66e9ced --- /dev/null +++ b/tests/fate/vpx.mak @@ -0,0 +1,38 @@ +FATE_TESTS += fate-ea-vp60 +fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 + +FATE_TESTS += fate-ea-vp61 +fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 + +FATE_TESTS += fate-vp3 +fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi + +FATE_TESTS += fate-vp5 +fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an + +FATE_TESTS += fate-vp6a +fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv + +FATE_TESTS += fate-vp6f +fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv + +VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 + +define FATE_VP8_SUITE +FATE_VP8 += fate-vp8-test-vector$(2)-$(1) +fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf +fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) +endef + +define FATE_VP8_FULL +$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) + +FATE_VP8 += fate-vp8-sign-bias$(1) +fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf -vsync 0 +fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias +endef + +$(eval $(call FATE_VP8_FULL)) +$(eval $(call FATE_VP8_FULL,-emu-edge,-flags emu_edge)) +FATE_TESTS += $(FATE_VP8) +fate-vp8: $(FATE_VP8) diff --git a/tests/fate2.mak b/tests/fate2.mak index 1a314a1..7d5c119 100644 --- a/tests/fate2.mak +++ b/tests/fate2.mak @@ -49,9 +49,6 @@ fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c3 FATE_TESTS += fate-wmv8-drm-nodec fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy -FATE_TESTS += fate-vp3 -fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi - FATE_TESTS += fate-mjpegb fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an -- 1.7.1 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
