--- tests/fate/bmp.mak | 6 ++++-- tests/fate/cdxl.mak | 6 ++++-- tests/fate/dfa.mak | 6 ++++-- tests/fate/flac.mak | 2 +- tests/fate/mp3.mak | 7 +++++-- 5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak index c660190..9e52ac0 100644 --- a/tests/fate/bmp.mak +++ b/tests/fate/bmp.mak @@ -37,5 +37,7 @@ fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-rle8 fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_BMP) -fate-bmp: $(FATE_BMP) +FATE_BMP-$(call DEMDEC, IMAGE2, BMP) += $(FATE_BMP) + +FATE_SAMPLES_AVCONV += $(FATE_BMP-yes) +fate-bmp: $(FATE_BMP-yes) diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 86eaa09..2c69e39 100644 --- a/tests/fate/cdxl.mak +++ b/tests/fate/cdxl.mak @@ -13,5 +13,7 @@ fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt FATE_CDXL += fate-cdxl-bitline-ham6 fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10 -FATE_SAMPLES_AVCONV += $(FATE_CDXL) -fate-cdxl: $(FATE_CDXL) +FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL) + +FATE_SAMPLES_AVCONV += $(FATE_CDXL-yes) +fate-cdxl: $(FATE_CDXL-yes) diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak index 56f7bfe..4800d8a 100644 --- a/tests/fate/dfa.mak +++ b/tests/fate/dfa.mak @@ -31,5 +31,7 @@ fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb2 FATE_DFA += fate-dfa11 fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_DFA) -fate-dfa: $(FATE_DFA) +FATE_DFA-$(call DEMDEC, DFA, DFA) += $(FATE_DFA) + +FATE_SAMPLES_AVCONV += $(FATE_DFA-yes) +fate-dfa: $(FATE_DFA-yes) diff --git a/tests/fate/flac.mak b/tests/fate/flac.mak index 92eb743..46449db 100644 --- a/tests/fate/flac.mak +++ b/tests/fate/flac.mak @@ -22,5 +22,5 @@ fate-flac-24-%: CMD = enc_dec_pcm flac wav s24le $(REF) -c flac $(OPTS) fate-flac-%: CMP = oneoff fate-flac-%: FUZZ = 0 -FATE_SAMPLES_AVCONV += $(FATE_FLAC) +FATE_SAMPLES_AVCONV-$(call ENCDEC, FLAC, FLAC) += $(FATE_FLAC) fate-flac: $(FATE_FLAC) diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index bd0657d..663f14e 100644 --- a/tests/fate/mp3.mak +++ b/tests/fate/mp3.mak @@ -30,7 +30,10 @@ FATE_MP3 += fate-mp3-float-extra_overread fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/extra_overread.mp3 fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm -FATE_SAMPLES_AVCONV += $(FATE_MP3) -fate-mp3: $(FATE_MP3) $(FATE_MP3): CMP = stddev $(FATE_MP3): FUZZ = 0.07 + +FATE_MP3-$(call DEMDEC, MP3, MP3FLOAT) += $(FATE_MP3) + +FATE_SAMPLES_AVCONV += $(FATE_MP3-yes) +fate-mp3: $(FATE_MP3-yes) -- 1.7.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
