Browse Source

Remove non-free tests/lena.pnm and adapt FATE tests to depend on lena.pnm in the SAMPLES directory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4
Andreas Cadhalpun Michael Niedermayer 11 years ago
parent
commit
c4abee734d
5 changed files with 10 additions and 117 deletions
  1. +1
    -1
      tests/Makefile
  2. +1
    -1
      tests/fate/ffmpeg.mak
  3. +6
    -5
      tests/fate/seek.mak
  4. +2
    -1
      tests/fate/vcodec.mak
  5. +0
    -109
      tests/lena.pnm

+ 1
- 1
tests/Makefile View File

@@ -31,7 +31,7 @@ tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
$(M)$< $@

tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
$(M)$< $(SRC_PATH)/tests/lena.pnm $@
$(M)$< $(SAMPLES)/lena.pnm $@

tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data
$(M)$< $@ $(FATEW) $(FATEH)


+ 1
- 1
tests/fate/ffmpeg.mak View File

@@ -21,7 +21,7 @@ fate-ffmpeg-filter_complex: CMD = framecrc -filter_complex color=d=1:r=5
FATE_FFMPEG-$(CONFIG_COLOR_FILTER) += fate-ffmpeg-lavfi
fate-ffmpeg-lavfi: CMD = framecrc -lavfi color=d=1:r=5

FATE_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames
FATE_SAMPLES_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames
fate-force_key_frames: tests/data/vsynth2.yuv
fate-force_key_frames: CMD = enc_dec \
"rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \


+ 6
- 5
tests/fate/seek.mak View File

@@ -155,7 +155,7 @@ fate-seek-vsynth2-wmv1: SRC = fate/vsynth2-wmv1.avi
fate-seek-vsynth2-wmv2: SRC = fate/vsynth2-wmv2.avi
fate-seek-vsynth2-yuv: SRC = fate/vsynth2-yuv.avi

FATE_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)

# files from fate-lavf

@@ -237,10 +237,11 @@ fate-seek-lavf-yuv4mpeg: SRC = lavf/lavf.y4m

FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)

$(FATE_SEEK): libavformat/seek-test$(EXESUF)
$(FATE_SEEK): CMD = run libavformat/seek-test$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)
$(FATE_SEEK): fate-seek-%: fate-%
$(FATE_SEEK) $(FATE_SAMPLES_SEEK): libavformat/seek-test$(EXESUF)
$(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/seek-test$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)
$(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-%
fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%)

FATE_AVCONV += $(FATE_SEEK)
fate-seek: $(FATE_SEEK)
FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_SEEK)
fate-seek: $(FATE_SEEK) $(FATE_SAMPLES_SEEK)

+ 2
- 1
tests/fate/vcodec.mak View File

@@ -318,7 +318,8 @@ $(FATE_VSYNTH1): tests/data/vsynth1.yuv
$(FATE_VSYNTH2): tests/data/vsynth2.yuv
$(FATE_VSYNTH3): tests/data/vsynth3.yuv

FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH2) $(FATE_VSYNTH3)
FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH3)
FATE_SAMPLES_AVCONV += $(FATE_VSYNTH2)

fate-vsynth1: $(FATE_VSYNTH1)
fate-vsynth2: $(FATE_VSYNTH2)


+ 0
- 109
tests/lena.pnm
File diff suppressed because it is too large
View File


Loading…
Cancel
Save