---
 tests/Makefile       |    1 +
 tests/fate.mak       |   22 ----------------------
 tests/fate/image.mak |   44 ++++++++++++++++++++++++++++++++++++++++++++
 tests/fate2.mak      |   12 ------------
 4 files changed, 45 insertions(+), 34 deletions(-)
 create mode 100644 tests/fate/image.mak

diff --git a/tests/Makefile b/tests/Makefile
index 76824bb..9655934 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -35,6 +35,7 @@ include $(SRC_PATH)/tests/fate/dct.mak
 include $(SRC_PATH)/tests/fate/fft.mak
 include $(SRC_PATH)/tests/fate/game.mak
 include $(SRC_PATH)/tests/fate/h264.mak
+include $(SRC_PATH)/tests/fate/image.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/lossless.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
diff --git a/tests/fate.mak b/tests/fate.mak
index 1f5d9ca..676d081 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -10,12 +10,8 @@ FATE_TESTS += fate-auravision-v2
 fate-auravision-v2: CMD = framecrc  -i 
$(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
 FATE_TESTS += fate-caf
 fate-caf: CMD = crc  -i $(SAMPLES)/caf/caf-pcm16.caf
-FATE_TESTS += fate-cdgraphics
-fate-cdgraphics: CMD = framecrc  -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg 
-pix_fmt rgb24 -t 1
 FATE_TESTS += fate-cljr
 fate-cljr: CMD = framecrc  -i $(SAMPLES)/cljr/testcljr-partial.avi
-FATE_TESTS += fate-corepng
-fate-corepng: CMD = framecrc  -i $(SAMPLES)/png1/corepng-partial.avi
 FATE_TESTS += fate-creative-adpcm
 fate-creative-adpcm: CMD = md5  -i $(SAMPLES)/creative/intro-partial.wav -f 
s16le
 FATE_TESTS += fate-creative-adpcm-8-2.6bit
@@ -32,10 +28,6 @@ FATE_TESTS += fate-cyuv
 fate-cyuv: CMD = framecrc  -i $(SAMPLES)/cyuv/cyuv.avi
 FATE_TESTS += fate-d-cinema-demux
 fate-d-cinema-demux: CMD = framecrc  -i 
$(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24
-FATE_TESTS += fate-deluxepaint-anm
-fate-deluxepaint-anm: CMD = framecrc  -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM 
-pix_fmt rgb24
-FATE_TESTS += fate-dpx
-fate-dpx: CMD = framecrc  -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
 FATE_TESTS += fate-frwu
 fate-frwu: CMD = framecrc  -i $(SAMPLES)/frwu/frwu.avi
 FATE_TESTS += fate-indeo2
@@ -72,8 +64,6 @@ FATE_TESTS += fate-oma-demux
 fate-oma-demux: CMD = crc  -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec 
copy
 FATE_TESTS += fate-pcm_dvd
 fate-pcm_dvd: CMD = framecrc  -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
-FATE_TESTS += fate-ptx
-fate-ptx: CMD = framecrc  -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 FATE_TESTS += fate-pva-demux
 fate-pva-demux: CMD = framecrc  -idct simple -i 
$(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy
 FATE_TESTS += fate-qcp-demux
@@ -124,18 +114,6 @@ FATE_TESTS += fate-sp5x
 fate-sp5x: CMD = framecrc  -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi
 FATE_TESTS += fate-sub-srt
 fate-sub-srt: CMD = md5  -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass
-FATE_TESTS += fate-sunraster-1bit-raw
-fate-sunraster-1bit-raw: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-1bit-raw.sun
-FATE_TESTS += fate-sunraster-1bit-rle
-fate-sunraster-1bit-rle: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-1bit-rle.sun
-FATE_TESTS += fate-sunraster-24bit-raw
-fate-sunraster-24bit-raw: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-24bit-raw.sun
-FATE_TESTS += fate-sunraster-24bit-rle
-fate-sunraster-24bit-rle: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-24bit-rle.sun
-FATE_TESTS += fate-sunraster-8bit-raw
-fate-sunraster-8bit-raw: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
-FATE_TESTS += fate-sunraster-8bit-rle
-fate-sunraster-8bit-rle: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
 FATE_TESTS += fate-svq1
 fate-svq1: CMD = framecrc  -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10
 FATE_TESTS += fate-svq3
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
new file mode 100644
index 0000000..ea9658f
--- /dev/null
+++ b/tests/fate/image.mak
@@ -0,0 +1,44 @@
+FATE_TESTS += fate-ansi
+fate-ansi: CMD = framecrc -chars_per_frame 44100 -i 
$(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
+
+FATE_TESTS += fate-cdgraphics
+fate-cdgraphics: CMD = framecrc  -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg 
-pix_fmt rgb24 -t 1
+
+FATE_TESTS += fate-corepng
+fate-corepng: CMD = framecrc  -i $(SAMPLES)/png1/corepng-partial.avi
+
+FATE_TESTS += fate-deluxepaint-anm
+fate-deluxepaint-anm: CMD = framecrc  -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM 
-pix_fmt rgb24
+
+FATE_TESTS += fate-dpx
+fate-dpx: CMD = framecrc  -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
+
+FATE_TESTS += fate-fax-g3
+fate-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
+
+FATE_TESTS += fate-fax-g3s
+fate-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
+
+FATE_TESTS += fate-pictor
+fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -an
+
+FATE_TESTS += fate-ptx
+fate-ptx: CMD = framecrc  -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
+
+FATE_TESTS += fate-sunraster-1bit-raw
+fate-sunraster-1bit-raw: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-1bit-raw.sun
+
+FATE_TESTS += fate-sunraster-1bit-rle
+fate-sunraster-1bit-rle: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-1bit-rle.sun
+
+FATE_TESTS += fate-sunraster-8bit-raw
+fate-sunraster-8bit-raw: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
+
+FATE_TESTS += fate-sunraster-8bit-rle
+fate-sunraster-8bit-rle: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
+
+FATE_TESTS += fate-sunraster-24bit-raw
+fate-sunraster-24bit-raw: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-24bit-raw.sun
+
+FATE_TESTS += fate-sunraster-24bit-rle
+fate-sunraster-24bit-rle: CMD = framecrc  -i 
$(SAMPLES)/sunraster/lena-24bit-rle.sun
diff --git a/tests/fate2.mak b/tests/fate2.mak
index b5c34d9..f37edfc 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -17,9 +17,6 @@ fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
 fate-imc: CMP = oneoff
 fate-imc: REF = $(SAMPLES)/imc/imc.pcm
 
-FATE_TESTS += fate-pictor
-fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -an
-
 FATE_TESTS += fate-dts
 fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
 fate-dts: CMP = oneoff
@@ -58,9 +55,6 @@ fate-wmapro-2ch: CMD = pcm -i 
$(SAMPLES)/wmapro/Beethovens_9th-1_small.wma
 fate-wmapro-2ch: CMP = oneoff
 fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm
 
-FATE_TESTS += fate-ansi
-fate-ansi: CMD = framecrc -chars_per_frame 44100 -i 
$(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
-
 FATE_TESTS += fate-wmv8-drm
 # discard last packet to avoid fails due to overread of VC-1 decoder
 fate-wmv8-drm: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an 
-vframes 162
@@ -71,12 +65,6 @@ fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c34
 FATE_TESTS += fate-vp3
 fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
 
-FATE_TESTS += fate-fax-g3
-fate-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
-
-FATE_TESTS += fate-fax-g3s
-fate-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
-
 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
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to