April 2022 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/fitsenc: Simplify writing header padding
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 20:36:56 2022 +0200| [52af16bbf5386410872f45f17b25ecb9ff40b97f] | committer: Andreas Rheinhardt avformat/fitsenc: Simplify writing header padding Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52af16bbf53864108… --- libavformat/fitsenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/fitsenc.c b/libavformat/fitsenc.c index 5cf34ef067..37ee10bb13 100644 --- a/libavformat/fitsenc.c +++ b/libavformat/fitsenc.c @@ -24,6 +24,7 @@ * FITS muxer. */ +#include "avio_internal.h" #include "internal.h" typedef struct FITSContext { @@ -177,11 +178,7 @@ static int write_image_header(AVFormatContext *s) lines_written++; lines_left = ((lines_written + 35) / 36) * 36 - lines_written; - memset(buffer, ' ', 80); - while (lines_left > 0) { - avio_write(s->pb, buffer, sizeof(buffer)); - lines_left--; - } + ffio_fill(s->pb, ' ', sizeof(buffer) * lines_left); return 0; }

1 0

fate/fits: Use transcode for transcode-like test
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 20:06:01 2022 +0200| [9d767b8a988de512279cf0f8c3a14ce637ef862d] | committer: Andreas Rheinhardt fate/fits: Use transcode for transcode-like test Each of the intermediately generated lena-*.fits files is only used for exactly one test; so it could be deleted right after the test. Switching to a transcode test (which is also more natural) achieves this. It also adds checksums of the intermediate files to the ref-file. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d767b8a988de5122… --- tests/fate/fits.mak | 19 +++++-------------- tests/ref/fate/fitsdec-gbrap16le | 2 ++ tests/ref/fate/fitsdec-gbrp | 2 ++ tests/ref/fate/fitsdec-gbrp16 | 2 ++ tests/ref/fate/fitsdec-gray | 2 ++ 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index ea471d6654..b9e99d97ee 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -6,17 +6,10 @@ tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data #mapping of fits file formats to png filenames # TODO: Use an actual 64bit input file and fix the gbrp16 test on big-endian -map.tests/data/lena-gray.fits := gray8 -map.tests/data/lena-gbrp.fits := rgb24 -map.tests/data/lena-gbrp16.fits := rgb48 -map.tests/data/lena-gbrap16le.fits := rgba64 - -tests/data/lena%.fits: TAG = GEN -tests/data/lena%.fits: NAME = $(map.$(@)) -tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -i $(TARGET_SAMPLES)/png1/lena-$(map.$((a))).png \ - -y $(TARGET_PATH)/$(@) 2>/dev/null +fits-png-map-gray := gray8 +fits-png-map-gbrp := rgb24 +fits-png-map-gbrp16 := rgb48 +fits-png-map-gbrap16le := rgba64 FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-ext_data_min_max fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16le -vf scale @@ -35,11 +28,9 @@ fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap fate-fitsdec%: PIXFMT = $(word 3, $(subst -, ,$(@))) -fate-fitsdec%: SRC = $(TARGET_PATH)/tests/data/lena-$(PIXFMT).fits -fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT) +fate-fitsdec%: CMD = transcode image2 $(TARGET_SAMPLES)/png1/lena-$(fits-png-map-$(PIXFMT)).png fits "-vf scale -pix_fmt $(PIXFMT)" FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16 gbrap16le -$(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, IMAGE2_DEMUXER PNG_DECODER SCALE_FILTER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) FATE_FITS += $(FATE_FITS_DEC-yes) diff --git a/tests/ref/fate/fitsdec-gbrap16le b/tests/ref/fate/fitsdec-gbrap16le index 78abb5cde7..53ef980b13 100644 --- a/tests/ref/fate/fitsdec-gbrap16le +++ b/tests/ref/fate/fitsdec-gbrap16le @@ -1,3 +1,5 @@ +64526d8da12d1fa07ceea5725647076f *tests/data/fate/fitsdec-gbrap16le.fits +135360 tests/data/fate/fitsdec-gbrap16le.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gbrp b/tests/ref/fate/fitsdec-gbrp index 8767b6715f..23249f492b 100644 --- a/tests/ref/fate/fitsdec-gbrp +++ b/tests/ref/fate/fitsdec-gbrp @@ -1,3 +1,5 @@ +38e232e4c1ca57b5866efa01da70359c *tests/data/fate/fitsdec-gbrp.fits +54720 tests/data/fate/fitsdec-gbrp.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gbrp16 b/tests/ref/fate/fitsdec-gbrp16 index f6368f2c02..9250690e9b 100644 --- a/tests/ref/fate/fitsdec-gbrp16 +++ b/tests/ref/fate/fitsdec-gbrp16 @@ -1,3 +1,5 @@ +2078208c93ba417d3fe150ba42bf5a30 *tests/data/fate/fitsdec-gbrp16.fits +103680 tests/data/fate/fitsdec-gbrp16.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/fitsdec-gray b/tests/ref/fate/fitsdec-gray index 488ee71022..b7992bfda3 100644 --- a/tests/ref/fate/fitsdec-gray +++ b/tests/ref/fate/fitsdec-gray @@ -1,3 +1,5 @@ +c02ac3e0a9f2ceeb1e6e66c085a63671 *tests/data/fate/fitsdec-gray.fits +20160 tests/data/fate/fitsdec-gray.fits #tb 0: 1/1 #media_type 0: video #codec_id 0: rawvideo

1 0

fate/fits: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 19:38:10 2022 +0200| [ab91400d7b644d7af10733a598838885dc8c3389] | committer: Andreas Rheinhardt fate/fits: Fix test requirements Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab91400d7b644d7af… --- tests/fate/fits.mak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index f16fc83266..ea471d6654 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -18,19 +18,19 @@ tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -i $(TARGET_SAMPLES)/png1/lena-$(map.$((a))).png \ -y $(TARGET_PATH)/$(@) 2>/dev/null -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-ext_data_min_max +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-ext_data_min_max fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-blank_bitpix32 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-blank_bitpix32 fate-fitsdec-blank_bitpix32: CMD = framecrc -blank_value 65535 -i $(TARGET_SAMPLES)/fits/file008.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-32 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-32 fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-64 +FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-64 fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16le -vf scale -FATE_FITS_DEC-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_DECODER FITS_ENCODER FITS_MUXER) += fate-fitsdec-multi +FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += fate-fitsdec-multi fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap @@ -40,7 +40,7 @@ fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT) FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16 gbrap16le $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits -FATE_FITS_DEC-$(call ALLYES, FITS_DEMUXER IMAGE2_DEMUXER FITS_DECODER PNG_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) +FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, IMAGE2_DEMUXER PNG_DECODER SCALE_FILTER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) FATE_FITS += $(FATE_FITS_DEC-yes) fate-fitsdec: $(FATE_FITS_DEC-yes) @@ -51,7 +51,7 @@ fate-fitsenc%: CMD = framecrc -auto_conversion_filters -i $(SRC) -c:v fits -pix_ FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits -FATE_FITS_ENC-$(call ALLYES, GIF_DEMUXER GIF_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) +FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) FATE_FITS += $(FATE_FITS_ENC-yes) fate-fitsenc: $(FATE_FITS_ENC-yes)

1 0

fate/utvideo: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 19:03:48 2022 +0200| [df39cf621ca33ffaaed9826636809063006a0942] | committer: Andreas Rheinhardt fate/utvideo: Fix test requirements Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df39cf621ca33ffaa… --- tests/fate/utvideo.mak | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 9329df5386..bf8401c370 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -64,8 +64,9 @@ fate-utvideo_yuv444_709_gradient: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/ut FATE_UTVIDEO += fate-utvideo_yuv444_709_int_gradient fate-utvideo_yuv444_709_int_gradient: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv444_709_64x48_int_gradient.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO) -fate-utvideo: $(FATE_UTVIDEO) +FATE_UTVIDEO-$(call FRAMECRC, AVI, UTVIDEO) += $(FATE_UTVIDEO) +FATE_SAMPLES_FFMPEG += $(FATE_UTVIDEO-yes) +fate-utvideo: $(FATE_UTVIDEO-yes) fate-utvideoenc%: CMD = framemd5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v utvideo -slices 1 -sws_flags +accurate_rnd+bitexact ${OPTS} -vf scale @@ -116,5 +117,6 @@ fate-utvideoenc_yuv444_none: OPTS = -pix_fmt yuv444p -pred none $(FATE_UTVIDEOENC): $(VREF) -FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) -fate-utvideoenc: $(FATE_UTVIDEOENC) +FATE_UTVIDEOENC-$(call FILTERDEMDECENCMUX, SCALE, IMAGE2, PGMYUV, UTVIDEO, FRAMEMD5, PIPE_PROTOCOL) += $(FATE_UTVIDEOENC) +FATE_FFMPEG += $(FATE_UTVIDEOENC-yes) +fate-utvideoenc: $(FATE_UTVIDEOENC-yes)

1 0

fate/bmp: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 18:42:20 2022 +0200| [992a6d721792e8909ac91ebd249ecf2d2e960aa3] | committer: Andreas Rheinhardt fate/bmp: Fix test requirements Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=992a6d721792e8909… --- tests/fate/bmp.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak index de27f19b15..050d3d1357 100644 --- a/tests/fate/bmp.mak +++ b/tests/fate/bmp.mak @@ -22,7 +22,7 @@ fate-bmp-15bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf555.bmp -pi FATE_BMP += fate-bmp-16bit-mask fate-bmp-16bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le -vf scale -FATE_BMP += fate-bmp-24bit +FATE_BMP-$(call FRAMECRC, IMAGE2, BMP) += fate-bmp-24bit fate-bmp-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test24.bmp FATE_BMP += fate-bmp-32bit @@ -37,7 +37,7 @@ fate-bmp-rle4: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress4.bmp -pix_fm FATE_BMP += fate-bmp-rle8 fate-bmp-rle8: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 -vf scale -FATE_BMP-$(call DEMDEC, IMAGE2, BMP) += $(FATE_BMP) +FATE_BMP-$(call FRAMECRC, IMAGE2, BMP, SCALE_FILTER) += $(FATE_BMP) FATE_SAMPLES_AVCONV += $(FATE_BMP-yes) fate-bmp: $(FATE_BMP-yes)

1 0

fate/cdxl: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 18:39:45 2022 +0200| [da564afcec938c86b3d27cd1cfc368e0542c9e8d] | committer: Andreas Rheinhardt fate/cdxl: Fix test requirements Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da564afcec938c86b… --- tests/fate/cdxl.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 2a4e2dd510..db3045c27c 100644 --- a/tests/fate/cdxl.mak +++ b/tests/fate/cdxl.mak @@ -7,13 +7,13 @@ fate-cdxl-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/cat.cdxl -an -frames:v FATE_CDXL += fate-cdxl-ham8 fate-cdxl-ham8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1 -FATE_CDXL += fate-cdxl-pal8 +FATE_CDXL-$(call FRAMECRC, CDXL, CDXL, SCALE_FILTER) += fate-cdxl-pal8 fate-cdxl-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11 -vf scale -FATE_CDXL += fate-cdxl-pal8-small +FATE_CDXL-$(call FRAMECRC, CDXL, CDXL, SCALE_FILTER) += fate-cdxl-pal8-small fate-cdxl-pal8-small: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46 -vf scale -FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL) +FATE_CDXL-$(call FRAMECRC, CDXL, CDXL) += $(FATE_CDXL) FATE_SAMPLES_AVCONV += $(FATE_CDXL-yes) fate-cdxl: $(FATE_CDXL-yes)

1 0

fate/dfa: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 22 18:37:12 2022 +0200| [d3874ec354b78cd0e9eafb56cb796abc21c067e3] | committer: Andreas Rheinhardt fate/dfa: Fix test requirements Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3874ec354b78cd0e… --- tests/fate/dfa.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak index 5b725e3a99..682a9d10b2 100644 --- a/tests/fate/dfa.mak +++ b/tests/fate/dfa.mak @@ -31,7 +31,7 @@ fate-dfa10: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0009.dfa -pix_f FATE_DFA += fate-dfa11 fate-dfa11: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 -vf scale -FATE_DFA-$(call DEMDEC, DFA, DFA) += $(FATE_DFA) +FATE_DFA-$(call FRAMECRC, DFA, DFA, SCALE_FILTER) += $(FATE_DFA) FATE_SAMPLES_AVCONV += $(FATE_DFA-yes) fate-dfa: $(FATE_DFA-yes)

1 0

fate/video: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Apr 16 23:44:48 2022 +0200| [7c4d1025288410004c083b7d6c342b345c878888] | committer: Andreas Rheinhardt fate/video: Fix test requirements In particular, add the missing dependency on the scale and aresample filters (and therefore on libswscale resp. libswresample). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c4d1025288410004… --- tests/fate/video.mak | 216 ++++++++++++++++++++++++++------------------------- 1 file changed, 110 insertions(+), 106 deletions(-) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index dff1f13e88..40cdd9e3b6 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -4,55 +4,56 @@ fate-4xm-1: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 FATE_4XM += fate-4xm-2 fate-4xm-2: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM) -fate-4xm: $(FATE_4XM) +FATE_4XM-$(call FRAMECRC, FOURXM, FOURXM, SCALE_FILTER) += $(FATE_4XM) +FATE_VIDEO += $(FATE_4XM-yes) +fate-4xm: $(FATE_4XM-yes) -FATE_VIDEO-$(call DEMDEC, AVI, ZERO12V) += fate-012v +FATE_VIDEO-$(call FRAMECRC, AVI, ZERO12V, SCALE_FILTER) += fate-012v fate-012v: CMD = framecrc -i $(TARGET_SAMPLES)/012v/sample.avi -pix_fmt yuv422p16le -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc +FATE_VIDEO-$(call FRAMECRC, AVI, AASC, SCALE_FILTER) += fate-aasc fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic +FATE_VIDEO-$(call FRAMECRC, MOV, AIC) += fate-aic fate-aic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/small_apple_intermediate_codec.mov -an -frames:v 15 -FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize +FATE_VIDEO-$(call FRAMECRC, MOV, AIC) += fate-aic-oddsize fate-aic-oddsize: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/aic_odd_dimensions.mov -FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm +FATE_VIDEO-$(call FRAMECRC, MM, MMVIDEO, SCALE_FILTER) += fate-alg-mm fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv +FATE_VIDEO-$(call FRAMECRC, AVI, AMV) += fate-amv fate-amv: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an -FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi +FATE_VIDEO-$(call FRAMECRC, TTY, ANSI, SCALE_FILTER) += fate-ansi fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi256 +FATE_VIDEO-$(call FRAMECRC, TTY, ANSI, SCALE_FILTER) += fate-ansi256 fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124 +FATE_VIDEO-$(call FRAMECRC, RPL, ESCAPE124, ARESAMPLE_FILTER SCALE_FILTER) += fate-armovie-escape124 fate-armovie-escape124: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130 +FATE_VIDEO-$(call FRAMECRC, RPL, ESCAPE130) += fate-armovie-escape130 fate-armovie-escape130: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/landing.rpl -an -FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1 +FATE_VIDEO-$(call FRAMECRC, AVI, AURA) += fate-auravision-v1 fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI -an -FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2 +FATE_VIDEO-$(call FRAMECRC, AVI, AURA2) += fate-auravision-v2 fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an -FATE_VIDEO-$(call DEMDEC, AVI, AVRN) += fate-avid-interlaced +FATE_VIDEO-$(call FRAMECRC, AVI, AVRN) += fate-avid-interlaced fate-avid-interlaced: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avid_ntsc_interlaced.avi -FATE_VIDEO-$(call DEMDEC, MOV, MJPEG) += fate-avid-meridian +FATE_VIDEO-$(call FRAMECRC, MOV, MJPEG) += fate-avid-meridian fate-avid-meridian: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov -FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid +FATE_VIDEO-$(call FRAMECRC, BETHSOFTVID, BETHSOFTVID, ARESAMPLE_FILTER SCALE_FILTER) += fate-bethsoft-vid fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi +FATE_VIDEO-$(call FRAMECRC, BFI, BFI, ARESAMPLE_FILTER SCALE_FILTER) += fate-bfi fate-bfi: CMD = framecrc -i $(TARGET_SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 -vf scale -af aresample FATE_BINK_VIDEO += fate-bink-video-b @@ -64,69 +65,69 @@ fate-bink-video-f: CMD = framecrc -i $(TARGET_SAMPLES)/bink/hol2br.bik FATE_BINK_VIDEO += fate-bink-video-i fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an -FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) +FATE_VIDEO-$(call FRAMECRC, BINK, BINK) += $(FATE_BINK_VIDEO) -FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video -fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -vf scale -vf scale +FATE_VIDEO-$(call FRAMECRC, BMV, BMV_VIDEO, SCALE_FILTER) += fate-bmv-video +fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs +FATE_VIDEO-$(call FRAMECRC, MPEGPS, CAVS) += fate-cavs fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an -FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics +FATE_VIDEO-$(call FRAMECRC, CDG, CDGRAPHICS, SCALE_FILTER) += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgba -t 1 -vf scale -FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-1 +FATE_CFHD-$(call FRAMECRC, AVI, CFHD, SCALE_FILTER) += fate-cfhd-1 fate-cfhd-1: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_422.avi -pix_fmt yuv422p10le -vf scale -FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-2 +FATE_CFHD-$(call FRAMECRC, AVI, CFHD, SCALE_FILTER) += fate-cfhd-2 fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt gbrp12le -vf scale -FATE_CFHD-$(CONFIG_MOV_DEMUXER) += fate-cfhd-3 +FATE_CFHD-$(call FRAMECRC, MOV, CFHD, SCALE_FILTER) += fate-cfhd-3 fate-cfhd-3: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_odd.mov -pix_fmt yuv422p10le -vf scale -FATE_VIDEO-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes) +FATE_VIDEO += $(FATE_CFHD-yes) fate-cfhd: $(FATE_CFHD-yes) -FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr +FATE_VIDEO-$(call FRAMECRC, AVI, CLJR) += fate-cljr fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi -FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng -fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -vf scale -af aresample +FATE_VIDEO-$(call FRAMECRC, AVI, PNG, ARESAMPLE_FILTER) += fate-corepng +fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -af aresample -FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-rgbapng-4816 +FATE_VIDEO-$(call FRAMECRC, AVI, PNG) += fate-rgbapng-4816 fate-rgbapng-4816: CMD = framecrc -i $(TARGET_SAMPLES)/png1/55c99e750a5fd6_50314226.png -FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs +FATE_VIDEO-$(call FRAMECRC, AVS, AVS, ARESAMPLE_FILTER SCALE_FILTER) += fate-creatureshock-avs fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 -vf scale -af aresample -FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette +FATE_CVID-$(call FRAMECRC, MOV, CINEPAK, SCALE_FILTER) += fate-cvid-palette fate-cvid-palette: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an -vf scale -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial +FATE_CVID-$(call FRAMECRC, AVI, CINEPAK) += fate-cvid-partial fate-cvid-partial: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/laracroft-cinepak-partial.avi -an -FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale +FATE_CVID-$(call FRAMECRC, AVI, CINEPAK) += fate-cvid-grayscale fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an -FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes) +FATE_VIDEO += $(FATE_CVID-yes) fate-cvid: $(FATE_CVID-yes) -FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93 +FATE_VIDEO-$(call FRAMECRC, C93, C93, SCALE_FILTER ARESAMPLE_FILTER) += fate-cyberia-c93 fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24 -vf scale -af aresample -FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv +FATE_VIDEO-$(call FRAMECRC, AVI, CYUV) += fate-cyuv fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi -FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video +FATE_VIDEO-$(call FRAMECRC, DSICIN, DSICINVIDEO, SCALE_FILTER) += fate-delphine-cin-video fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm +FATE_VIDEO-$(call FRAMECRC, ANM, ANM, SCALE_FILTER) += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac +FATE_VIDEO-$(call FRAMECRC, DIRAC, DIRAC) += fate-dirac fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc -FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac-low-delay +FATE_VIDEO-$(call FRAMECRC, DIRAC, DIRAC) += fate-dirac-low-delay fate-dirac-low-delay: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-vc2-low-delay.drc FATE_DXA += fate-dxa-feeble @@ -135,8 +136,9 @@ fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, DXA, DXA) += $(FATE_DXA) -fate-dxa: $(FATE_DXA) +FATE_DXA-$(call FRAMECRC, DXA, DXA, SCALE_FILTER) += $(FATE_DXA) +FATE_VIDEO += $(FATE_DXA-yes) +fate-dxa: $(FATE_DXA-yes) FATE_DXV += fate-dxv-dxt1 fate-dxv-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv-na.mov @@ -150,10 +152,10 @@ fate-dxv3-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqna.mov FATE_DXV += fate-dxv3-dxt5 fate-dxv3-dxt5: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqwa.mov -FATE_VIDEO-$(call DEMDEC, MOV, DXV) += $(FATE_DXV) +FATE_VIDEO-$(call FRAMECRC, MOV, DXV) += $(FATE_DXV) fate-dxv: $(FATE_DXV) -FATE_VIDEO-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid +FATE_VIDEO-$(call FRAMECRC, SEGAFILM, CINEPAK) += fate-film-cvid fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an FATE_FLIC += fate-flic-af11-palette-change @@ -165,49 +167,50 @@ fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb2 FATE_FLIC += fate-flic-magiccarpet fate-flic-magiccarpet: CMD = framecrc -i $(TARGET_SAMPLES)/fli/intel.dat -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC) -fate-flic: $(FATE_FLIC) +FATE_FLIC-$(call FRAMECRC, FLIC, FLIC, SCALE_FILTER) += $(FATE_FLIC) +FATE_VIDEO += $(FATE_FLIC-yes) +fate-flic: $(FATE_FLIC-yes) -FATE_VIDEO-$(call DEMDEC, AVI, FRWU) += fate-frwu +FATE_VIDEO-$(call FRAMECRC, AVI, FRWU) += fate-frwu fate-frwu: CMD = framecrc -i $(TARGET_SAMPLES)/frwu/frwu.avi -FATE_VIDEO-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video +FATE_VIDEO-$(call FRAMECRC, IDCIN, IDCIN, SCALE_FILTER) += fate-id-cin-video fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode +FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2, SCALE_FILTER) += fate-idroq-video-encode fate-idroq-video-encode: CMD = md5 -auto_conversion_filters -f image2 -c:v pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 -FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-byterun1 +FATE_IFF-$(call FRAMECRC, IFF, IFF_ILBM, SCALE_FILTER) += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 -vf scale -FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci -fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le -vf scale -af aresample +FATE_IFF-$(call ENCDEC, PCM_S16LE EIGHTSVX_FIB, PCM_S16LE IFF, ARESAMPLE_FILTER) += fate-iff-fibonacci +fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le -af aresample -FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm +FATE_IFF-$(call FRAMECRC, IFF, IFF_ILBM, SCALE_FILTER) += fate-iff-ilbm fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 -vf scale FATE_VIDEO-$(CONFIG_IFF_DEMUXER) += $(FATE_IFF-yes) fate-iff: $(FATE_IFF-yes) -FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit +FATE_VIDEO-$(call FRAMECRC, IPMOVIE, INTERPLAY_VIDEO, SCALE_FILTER) += fate-interplay-mve-8bit fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit +FATE_VIDEO-$(call FRAMECRC, IPMOVIE, INTERPLAY_VIDEO, SCALE_FILTER) += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema +FATE_VIDEO-$(call FRAMECRC, MXF, JPEG2000, SCALE_FILTER) += fate-jpeg2000-dcinema fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -c:v jpeg2000 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le -vf scale -FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv +FATE_VIDEO-$(call FRAMECRC, JV, JV, SCALE_FILTER) += fate-jv fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1 +FATE_VIDEO-$(call FRAMECRC, AVI, KGV1, SCALE_FILTER) += fate-kgv1 fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc +FATE_VIDEO-$(call FRAMECRC, AVI, KMVC, SCALE_FILTER) += fate-kmvc fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, LSCR) += fate-lscr +FATE_VIDEO-$(call FRAMECRC, AVI, LSCR) += fate-lscr fate-lscr: CMD = framecrc -i $(TARGET_SAMPLES)/lscr/lscr_compr9_short.avi FATE_MAGICYUV += fate-magicyuv-y4444i \ @@ -218,7 +221,7 @@ FATE_MAGICYUV += fate-magicyuv-y4444i \ fate-magicyuv-rgba \ fate-magicyuv-rgb -FATE_VIDEO-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV) +FATE_VIDEO-$(call FRAMECRC, AVI, MAGICYUV) += $(FATE_MAGICYUV) fate-magicyuv: $(FATE_MAGICYUV) fate-magicyuv-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgb_median.avi @@ -229,41 +232,41 @@ fate-magicyuv-y422i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv422_media fate-magicyuv-y4444i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv4444_left_interlaced.avi fate-magicyuv-y444: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv444_left.avi -FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec +FATE_VIDEO-$(call FRAMECRC, EA, MDEC) += fate-mdec fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an -FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3 +FATE_VIDEO-$(call FRAMECRC, STR, MDEC) += fate-mdec-v3 fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an -FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic +FATE_VIDEO-$(call FRAMECRC, MSNWC_TCP, MIMIC) += fate-mimic fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb +FATE_VIDEO-$(call FRAMECRC, MOV, MJPEGB) += fate-mjpegb fate-mjpegb: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an -FATE_VIDEO-$(call DEMDEC, AVI, MJPEG) += fate-mjpeg-ticket3229 +FATE_VIDEO-$(call FRAMECRC, AVI, MJPEG) += fate-mjpeg-ticket3229 fate-mjpeg-ticket3229: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpeg/mjpeg_field_order.avi -an -FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels +FATE_VIDEO-$(call FRAMECRC, MVI, MOTIONPIXELS, SCALE_FILTER) += fate-motionpixels fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111 -vf scale -FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 +FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30 fate-mpeg2-ticket186: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/t.mpg -an -FATE_VIDEO-$(call DEMDEC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 +FATE_VIDEO-$(call FRAMECRC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 fate-mpeg2-ticket6677: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/sony-ct3.bs -FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1 +FATE_VIDEO-$(call FRAMECRC, MV, MVC1, SCALE_FILTER) += fate-mv-mvc1 fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le -vf scale -FATE_VIDEO-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2 +FATE_VIDEO-$(call FRAMECRC, MV, MVC2, SCALE_FILTER) += fate-mv-mvc2 fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30 -pix_fmt bgra -vf scale -FATE_VIDEO-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle +FATE_VIDEO-$(call FRAMECRC, MV, SGIRLE) += fate-mv-sgirle fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an -FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg +FATE_VIDEO-$(call FRAMECRC, MXG, MXPEG) += fate-mxpeg fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an # FIXME dropped frames in this test because of coarse timebase @@ -276,43 +279,43 @@ fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_ FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV) fate-nuv: $(FATE_NUV) -FATE_VIDEO-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video +FATE_VIDEO-$(call FRAMECRC, PAF, PAF_VIDEO, SCALE_FILTER) += fate-paf-video fate-paf-video: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg +FATE_VIDEO-$(call FRAMECRC, AVI, QPEG, SCALE_FILTER) += fate-qpeg fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210 +FATE_VIDEO-$(call FRAMECRC, AVI, R210, SCALE_FILTER) += fate-r210 fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le -vf scale -FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2 +FATE_VIDEO-$(call FRAMECRC, RL2, RL2, SCALE_FILTER) += fate-rl2 fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo +FATE_VIDEO-$(call FRAMECRC, ROQ, ROQ) += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an -FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm +FATE_VIDEO-$(call FRAMECRC, SMUSH, SANM, SCALE_FILTER) += fate-sanm fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video +FATE_VIDEO-$(call FRAMECRC, VMD, VMDVIDEO, SCALE_FILTER) += fate-sierra-vmd-video fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video +FATE_VIDEO-$(call FRAMECRC, SMACKER, SMACKER, SCALE_FILTER) += fate-smacker-video fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc +FATE_VIDEO-$(call FRAMECRC, MOV, SMC, SCALE_FILTER) += fate-smc fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x -fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi -vf scale -af aresample +FATE_VIDEO-$(call FRAMECRC, AVI, SP5X, ARESAMPLE_FILTER) += fate-sp5x +fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi -af aresample -FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp +FATE_VIDEO-$(call FRAMECRC, THP, THP) += fate-thp fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an -FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq +FATE_VIDEO-$(call FRAMECRC, TIERTEXSEQ, TIERTEXSEQVIDEO, SCALE_FILTER) += fate-tiertex-seq fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv +FATE_VIDEO-$(call FRAMECRC, TMV, TMV, ARESAMPLE_FILTER SCALE_FILTER) += fate-tmv fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 -vf scale -af aresample FATE_TXD += fate-txd-16bpp @@ -321,53 +324,54 @@ fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -an FATE_TXD += fate-txd-odd fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -an -FATE_TXD += fate-txd-pal8 +FATE_TXD-$(call FRAMECRC, TXD, TXD, SCALE_FILTER) += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, TXD, TXD) += $(FATE_TXD) -fate-txd: $(FATE_TXD) +FATE_TXD-$(call FRAMECRC, TXD, TXD) += $(FATE_TXD) +FATE_VIDEO += $(FATE_TXD-yes) +fate-txd: $(FATE_TXD-yes) -FATE_VIDEO-$(call DEMDEC, AVI, ULTI) += fate-ulti +FATE_VIDEO-$(call FRAMECRC, AVI, ULTI) += fate-ulti fate-ulti: CMD = framecrc -i $(TARGET_SAMPLES)/ulti/hit12w.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, V210) += fate-v210 +FATE_VIDEO-$(call FRAMECRC, AVI, V210, SCALE_FILTER) += fate-v210 fate-v210: CMD = framecrc -i $(TARGET_SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an -vf scale -FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec +FATE_VIDEO-$(call FRAMECRC, MOV, V410, SCALE_FILTER) += fate-v410dec fate-v410dec: CMD = framecrc -i $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le -vf scale -FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc +FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2, SCALE_FILTER) += fate-v410enc fate-v410enc: $(VREF) fate-v410enc: CMD = md5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -fflags +bitexact -c:v v410 -f avi -vf scale -FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb +FATE_VIDEO-$(call FRAMECRC, SIFF, VB, SCALE_FILTER) += fate-vb fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1 +FATE_VIDEO-$(call FRAMECRC, AVI, VCR1) += fate-vcr1 fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, MPEG2VIDEO) += fate-vcr2 +FATE_VIDEO-$(call FRAMECRC, AVI, MPEG2VIDEO) += fate-vcr2 fate-vcr2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/vcr2/VCR2test.avi -an -FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl +FATE_VIDEO-$(call FRAMECRC, AVI, XL) += fate-videoxl fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi -FATE_VIDEO-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc +FATE_VIDEO-$(call FRAMECRC, WSVQA, VQA, SCALE_FILTER) += fate-vqa-cc fate-vqa-cc: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan +FATE_VIDEO-$(call FRAMECRC, WC3, XAN_WC3, SCALE_FILTER) += fate-wc3movie-xan fate-wc3movie-xan: CMD = framecrc -i $(TARGET_SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, WNV1) += fate-wnv1 +FATE_VIDEO-$(call FRAMECRC, AVI, WNV1) += fate-wnv1 fate-wnv1: CMD = framecrc -i $(TARGET_SAMPLES)/wnv1/wnv1-codec.avi -an -FATE_VIDEO-$(call DEMDEC, YOP, YOP) += fate-yop +FATE_VIDEO-$(call FRAMECRC, YOP, YOP, SCALE_FILTER) += fate-yop fate-yop: CMD = framecrc -i $(TARGET_SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an -vf scale -FATE_VIDEO-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4 +FATE_VIDEO-$(call FRAMECRC, AVI, XAN_WC4) += fate-xxan-wc4 fate-xxan-wc4: CMD = framecrc -i $(TARGET_SAMPLES)/wc4-xan/wc4trailer-partial.avi -an -FATE_VIDEO-$(call DEMDEC, WAV, SMVJPEG) += fate-smvjpeg +FATE_VIDEO-$(call FRAMECRC, WAV, SMVJPEG) += fate-smvjpeg fate-smvjpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/smv/clock.smv -an FATE_VIDEO += $(FATE_VIDEO-yes)

1 0

fate/screen: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Apr 16 22:36:53 2022 +0200| [b07e6a095d66162fcdeb00f57fa40c3414ff5a1d] | committer: Andreas Rheinhardt fate/screen: Fix test requirements In particular, add the missing dependency on the scale filter (and therefore on libswscale). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b07e6a095d66162fc… --- tests/fate/screen.mak | 55 +++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index aa9832688d..bd6d228544 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -1,11 +1,11 @@ # FIXME dropped frames in this test because of coarse timebase -FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd +FATE_SCREEN-$(call FRAMECRC, AVI, CSCD, SCALE_FILTER) += fate-cscd fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory +FATE_SCREEN-$(call FRAMECRC, AVI, DXTORY) += fate-dxtory fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi +FATE_SCREEN-$(call FRAMECRC, AVI, FIC) += fate-fic-avi fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an FATE_FMVC += fate-fmvc-type1 @@ -14,8 +14,9 @@ fate-fmvc-type1: CMD = framecrc -i $(TARGET_SAMPLES)/fmvc/6-methyl-5-hepten-2-on FATE_FMVC += fate-fmvc-type2 fate-fmvc-type2: CMD = framecrc -i $(TARGET_SAMPLES)/fmvc/fmvcVirtualDub_small.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FMVC) += $(FATE_FMVC) -fate-fmvc: $(FATE_FMVC) +FATE_FMVC-$(call FRAMECRC, AVI, FMVC) += $(FATE_FMVC) +FATE_SCREEN += $(FATE_FMVC-yes) +fate-fmvc: $(FATE_FMVC-yes) FATE_FRAPS += fate-fraps-v0 fate-fraps-v0: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi @@ -26,7 +27,7 @@ fate-fraps-v1: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/sample-v1.avi -an FATE_FRAPS += fate-fraps-v2 fate-fraps-v2: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/test3-nosound-partial.avi -FATE_FRAPS += fate-fraps-v3 +FATE_FRAPS-$(call FRAMECRC, AVI, FRAPS, SCALE_FILTER) += fate-fraps-v3 fate-fraps-v3: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24 -vf scale FATE_FRAPS += fate-fraps-v4 @@ -35,8 +36,9 @@ fate-fraps-v4: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/WoW_2006-11-03_14-58-17 FATE_FRAPS += fate-fraps-v5 fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS) -fate-fraps: $(FATE_FRAPS) +FATE_FRAPS-$(call FRAMECRC, AVI, FRAPS) += $(FATE_FRAPS) +FATE_SCREEN += $(FATE_FRAPS-yes) +fate-fraps: $(FATE_FRAPS-yes) FATE_G2M += fate-g2m2 fate-g2m2: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an @@ -47,13 +49,13 @@ fate-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames FATE_G2M += fate-g2m4 fate-g2m4: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m4.asf -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M) +FATE_SCREEN-$(call FRAMECRC, ASF, G2M) += $(FATE_G2M) fate-g2m: $(FATE_G2M) FATE_RSCC += fate-iscc fate-iscc: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/pip.avi -an -FATE_RSCC += fate-rscc-8bit +FATE_RSCC-$(call FRAMECRC, AVI, RSCC, SCALE_FILTER) += fate-rscc-8bit fate-rscc-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/8bpp.avi -an -pix_fmt rgb24 -vf scale FATE_RSCC += fate-rscc-16bit @@ -65,8 +67,9 @@ fate-rscc-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/24bpp.avi -an FATE_RSCC += fate-rscc-32bit fate-rscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/32bpp.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, RSCC) += $(FATE_RSCC) -fate-rscc: $(FATE_RSCC) +FATE_RSCC-$(call FRAMECRC, AVI, RSCC) += $(FATE_RSCC) +FATE_SCREEN += $(FATE_RSCC-yes) +fate-rscc: $(FATE_RSCC-yes) FATE_SCREENPRESSO += fate-screenpresso-16bit fate-screenpresso-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/16bpp_555.avi -an @@ -77,10 +80,11 @@ fate-screenpresso-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/bunny.avi -an FATE_SCREENPRESSO += fate-screenpresso-32bit fate-screenpresso-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/32bpp.avi -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SCREENPRESSO) += $(FATE_SCREENPRESSO) -fate-screenpresso: $(FATE_SCREENPRESSO) +FATE_SCREENPRESSO-$(call FRAMECRC, AVI, SCREENPRESSO) += $(FATE_SCREENPRESSO) +FATE_SCREEN += $(FATE_SCREENPRESSO-yes) +fate-screenpresso: $(FATE_SCREENPRESSO-yes) -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, TDSC) += fate-tdsc +FATE_SCREEN-$(call FRAMECRC, ASF, TDSC) += fate-tdsc fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24 FATE_TSCC += fate-tscc-15bit @@ -89,16 +93,17 @@ fate-tscc-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/oneminute.avi -t 15 -p FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC) -fate-tscc: $(FATE_TSCC) +FATE_TSCC-$(call FRAMECRC, AVI, TSCC, SCALE_FILTER) += $(FATE_TSCC) +FATE_SCREEN += $(FATE_TSCC-yes) +fate-tscc: $(FATE_TSCC-yes) -FATE_TSCC2-$(CONFIG_AVI_DEMUXER) += fate-tscc2-avi +FATE_TSCC2-$(call FRAMECRC, AVI, TSCC2) += fate-tscc2-avi fate-tscc2-avi: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/tsc2_16bpp.avi -FATE_TSCC2-$(CONFIG_MOV_DEMUXER) += fate-tscc2-mov +FATE_TSCC2-$(call FRAMECRC, MOV, TSCC2) += fate-tscc2-mov fate-tscc2-mov: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/rec.trec -FATE_SAMPLES_AVCONV-$(CONFIG_TSCC2_DECODER) += $(FATE_TSCC2-yes) +FATE_SCREEN += $(FATE_TSCC2-yes) fate-tscc2: $(FATE_TSCC2-yes) FATE_VMNC += fate-vmnc-16bit @@ -107,8 +112,9 @@ fate-vmnc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/test.avi -pix_fmt rgb2 FATE_VMNC += fate-vmnc-32bit fate-vmnc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC) -fate-vmnc: $(FATE_VMNC) +FATE_VMNC-$(call FRAMECRC, AVI, VMNC, SCALE_FILTER) += $(FATE_VMNC) +FATE_SCREEN += $(FATE_VMNC-yes) +fate-vmnc: $(FATE_VMNC-yes) FATE_ZMBV += fate-zmbv-8bit fate-zmbv-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24 -vf scale @@ -122,8 +128,9 @@ fate-zmbv-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_16bit.avi -pix_fm FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 -vf scale -FATE_SCREEN-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV) -fate-zmbv: $(FATE_ZMBV) +FATE_ZMBV-$(call FRAMECRC, AVI, ZMBV, SCALE_FILTER) += $(FATE_ZMBV) +FATE_SCREEN += $(FATE_ZMBV-yes) +fate-zmbv: $(FATE_ZMBV-yes) FATE_SCREEN += $(FATE_SCREEN-yes)

1 0

tests/Makefile: Add FRAMECRC function
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Apr 16 21:41:29 2022 +0200| [0bc3ab3a5e56b7ddf0f938e27f6d45cc29361e2b] | committer: Andreas Rheinhardt tests/Makefile: Add FRAMECRC function Intended for scenarios that currently use DEMDEC, but are missing the requirements that are implicitly needed by framecrc. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bc3ab3a5e56b7ddf… --- tests/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index e175631258..1c9e3594c0 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -88,6 +88,9 @@ REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \ DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3)) +FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ + PCM_S16LE_ENCODER RAWVIDEO_ENCODER FRAMECRC_MUXER \ + PIPE_PROTOCOL FILE_PROTOCOL) DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL)

1 0