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

fate/image: Fix requirements of tests
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Apr 16 21:20:34 2022 +0200| [737130ce6faa8a021c29fa39cbc27277164e61c7] | committer: Andreas Rheinhardt fate/image: Fix requirements of tests Also reduce the amount of repetitions a bit. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=737130ce6faa8a021… --- tests/fate/image.mak | 129 +++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 72 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 63076f8ded..c8e0d321ef 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,13 +1,12 @@ +ADD_SCALE_IF = $(if $(findstring -vf scale,$(1)), SCALE_FILTER) + FATE_ALIASPIX += fate-aliaspix-bgr fate-aliaspix-bgr: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/first.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 bgr24 -c:v:1 copy" FATE_ALIASPIX += fate-aliaspix-gray fate-aliaspix-gray: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/firstgray.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 gray -c:v:1 copy" -FATE_ALIASPIX-$(call ALLYES, FILE_PROTOCOL IMAGE2_ALIAS_PIX_DEMUXER \ - ALIAS_PIX_DECODER ALIAS_PIX_ENCODER \ - IMAGE2_MUXER RAWVIDEO_ENCODER \ - FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_ALIASPIX) +FATE_ALIASPIX-$(call TRANSCODE, ALIAS_PIX, IMAGE2 IMAGE2_ALIAS_PIX) += $(FATE_ALIASPIX) FATE_IMAGE += $(FATE_ALIASPIX-yes) fate-aliaspix: $(FATE_ALIASPIX-yes) @@ -17,29 +16,29 @@ fate-brenderpix-24: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brender FATE_BRENDERPIX += fate-brenderpix-565 fate-brenderpix-565: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/maximafront.pix -FATE_BRENDERPIX += fate-brenderpix-defpal +FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-defpal fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/rivrock1.pix -pix_fmt rgb24 -vf scale -FATE_BRENDERPIX += fate-brenderpix-intpal +FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-intpal fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix -pix_fmt rgb24 -vf scale FATE_BRENDERPIX += fate-brenderpix-y400a fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX) -FATE_IMAGE += $(FATE_BRENDERPIX-yes) +FATE_IMAGE_FRAMECRC += $(FATE_BRENDERPIX-yes) fate-brenderpix: $(FATE_BRENDERPIX-yes) -FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP, SCALE_FILTER) += fate-bmpparser fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24 -vf scale define FATE_IMGSUITE_DDS -FATE_DDS += fate-dds-$(1) -fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1)) -vf scale +FATE_DDS-$(call DEMDEC, IMAGE2, DDS, $(call ADD_SCALE_IF, $(DDS_OPTS_$(1)))) += fate-dds-$(1) +fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1)) endef -DDS_OPTS_pal = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba +DDS_OPTS_pal := -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -vf scale +DDS_OPTS_pal-ati:= -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -vf scale DDS_FMT = alpha8 \ argb \ argb-aexp \ @@ -90,14 +89,15 @@ DDS_FMT = alpha8 \ yuyv $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT)))) -FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS) -FATE_IMAGE += $(FATE_DDS-yes) +FATE_IMAGE_FRAMECRC += $(FATE_DDS-yes) fate-dds: $(FATE_DDS-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser +# The following sample has frames whose dimensions differ on a per-frame basis +# and therefore needs the scale filter. +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX, SCALE_FILTER) += fate-dpxparser fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx -sws_flags +accurate_rnd+bitexact FATE_IMAGE_PROBE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx-probe @@ -226,7 +226,7 @@ fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/e FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l2 fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrapf32le -FATE_EXR += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 +FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 fate-exr-rgb-scanline-pxr24-half-uint32-13x9: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_uint32_13x9.exr -pix_fmt rgb48le -vf scale FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l1 @@ -328,10 +328,10 @@ fate-exr-rgb-scanline-zip-half-0x0-0xFFFF: CMD = framecrc -i $(TARGET_SAMPLES)/e FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR) -FATE_IMAGE += $(FATE_EXR-yes) +FATE_IMAGE_FRAMECRC += $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes) -FATE_JPG += fate-jpg-12bpp +FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER) += fate-jpg-12bpp fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -f rawvideo -pix_fmt gray16le -vf setsar=sar=sar,scale FATE_JPG += fate-jpg-jfif @@ -341,7 +341,7 @@ FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIP fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames" FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) -FATE_IMAGE += $(FATE_JPG-yes) +FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes) FATE_IMAGE_TRANSCODE += $(FATE_JPG_TRANSCODE-yes) fate-jpg: $(FATE_JPG-yes) $(FATE_JPG_TRANSCODE-yes) @@ -358,20 +358,20 @@ FATE_JPEGLS += fate-jpegls-7bpc fate-jpegls-7bpc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpegls/128.jls FATE_JPEGLS-$(call DEMDEC, IMAGE2, JPEGLS) += $(FATE_JPEGLS) -FATE_IMAGE += $(FATE_JPEGLS-yes) +FATE_IMAGE_FRAMECRC += $(FATE_JPEGLS-yes) fate-jpegls: $(FATE_JPEGLS-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict fate-pict: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/TRU256.PCT -pix_fmt rgb24 -FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, PICTOR, SCALE_FILTER) += fate-pictor fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -vf scale -FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser +FATE_IMAGE_FRAMECRC-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba define FATE_IMGSUITE_PNG -FATE_PNG += fate-png-$(1) +FATE_PNG-$(call DEMDEC, IMAGE2, PNG, SCALE_FILTER) += fate-png-$(1) fate-png-$(1): CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/png1/lena-$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 endef @@ -394,16 +394,16 @@ fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) -FATE_IMAGE += $(FATE_PNG-yes) +FATE_IMAGE_FRAMECRC += $(FATE_PNG-yes) FATE_IMAGE_PROBE += $(FATE_PNG_PROBE-yes) FATE_IMAGE_TRANSCODE += $(FATE_PNG_TRANSCODE-yes) fate-png: $(FATE_PNG-yes) $(FATE_PNG_PROBE-yes) $(FATE_PNG_TRANSCODE-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, PTX, SCALE_FILTER) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -vf scale define FATE_IMGSUITE_PSD -FATE_PSD += fate-psd-$(1) +FATE_PSD-$(call DEMDEC, IMAGE2, PSD, SCALE_FILTER) += fate-psd-$(1) fate-psd-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-$(1).psd -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 -vf scale endef @@ -433,7 +433,7 @@ fate-psd-duo-tone-color: CMD = framecrc -i $(TARGET_SAMPLES)/psd/duotone-color.p FATE_PSD-$(call DEMDEC, IMAGE2, PSD) += $(FATE_PSD) -FATE_IMAGE += $(FATE_PSD-yes) +FATE_IMAGE_FRAMECRC += $(FATE_PSD-yes) fate-psd: $(FATE_PSD-yes) define FATE_IMGSUITE_SGI @@ -446,36 +446,31 @@ SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 $(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP)))) FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI) -FATE_IMAGE += $(FATE_SGI-yes) +FATE_IMAGE_FRAMECRC += $(FATE_SGI-yes) fate-sgi: $(FATE_SGI-yes) -FATE_SUNRASTER += fate-sunraster-1bit-raw -fate-sunraster-1bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-raw.sun - -FATE_SUNRASTER += fate-sunraster-1bit-rle -fate-sunraster-1bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-rle.sun - -FATE_SUNRASTER += fate-sunraster-8bit-raw -fate-sunraster-8bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24 -vf scale +define FATE_IMGSUITE_SUNRASTER +FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST, $(call ADD_SCALE_IF, $(SUNRASTER_OPTS_$(1)))) += fate-sunraster-$(1) +fate-sunraster-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-$(1).sun $(SUNRASTER_OPTS_$(1)) +endef +SUNRASTER_OPTS_8bit-raw := -pix_fmt rgb24 -vf scale +SUNRASTER_OPTS_8bit-rle := -pix_fmt rgb24 -vf scale +SUNRASTER_TESTS := 1bit-raw 1bit-rle 8bit-raw 8bit-rle 24bit-raw 24bit-rle +$(foreach TEST,$(SUNRASTER_TESTS),$(eval $(call FATE_IMGSUITE_SUNRASTER,$(TEST)))) FATE_SUNRASTER += fate-sunraster-8bit_gray-raw fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/gray.ras -FATE_SUNRASTER += fate-sunraster-8bit-rle -fate-sunraster-8bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24 -vf scale - -FATE_SUNRASTER += fate-sunraster-24bit-raw -fate-sunraster-24bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-raw.sun - -FATE_SUNRASTER += fate-sunraster-24bit-rle -fate-sunraster-24bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-rle.sun - FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER) -FATE_IMAGE += $(FATE_SUNRASTER-yes) +FATE_IMAGE_FRAMECRC += $(FATE_SUNRASTER-yes) fate-sunraster: $(FATE_SUNRASTER-yes) -FATE_TARGA = CBW8 \ +define FATE_IMGSUITE_TARGA +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA, $(call ADD_SCALE_IF, $(TARGA_OPTS_$(1)))) += fate-targa-conformance-$(1) +fate-targa-conformance-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/$(1).TGA $(TARGA_OPTS_$(1)) +endef +TARGA_FMT := CBW8 \ CCM8 \ CTC16 \ CTC24 \ @@ -485,28 +480,17 @@ FATE_TARGA = CBW8 \ UTC16 \ UTC24 \ UTC32 +TARGA_OPTS_CCM8 := -pix_fmt rgba -vf scale +TARGA_OPTS_UCM8 := -pix_fmt rgba -vf scale +TARGA_OPTS_UTC16 := -pix_fmt rgb555le +$(foreach FMT,$(TARGA_FMT),$(eval $(call FATE_IMGSUITE_TARGA,$(FMT)))) -FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ - fate-targa-top-to-bottom - -FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA) +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += fate-targa-top-to-bottom +fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga -FATE_IMAGE += $(FATE_TARGA-yes) +FATE_IMAGE_FRAMECRC += $(FATE_TARGA-yes) fate-targa: $(FATE_TARGA-yes) -fate-targa-conformance-CBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CBW8.TGA -fate-targa-conformance-CCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba -vf scale -fate-targa-conformance-CTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-CTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC24.TGA -fate-targa-conformance-CTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra -fate-targa-conformance-UBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UBW8.TGA -fate-targa-conformance-UCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba -vf scale -fate-targa-conformance-UTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-UTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC24.TGA -fate-targa-conformance-UTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra - -fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga - FATE_TIFF += fate-tiff-fax-g3 fate-tiff-fax-g3: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31D.TIF @@ -515,7 +499,7 @@ fate-tiff-fax-g3s: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31DS.TIF FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF) -FATE_IMAGE += $(FATE_TIFF-yes) +FATE_IMAGE_FRAMECRC += $(FATE_TIFF-yes) fate-tiff: $(FATE_TIFF-yes) FATE_WEBP += fate-webp-rgb-lossless @@ -524,7 +508,7 @@ fate-webp-rgb-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lossless.we FATE_WEBP += fate-webp-rgb-lena-lossless fate-webp-rgb-lena-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -FATE_WEBP += fate-webp-rgb-lena-lossless-rgb24 +FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP, SCALE_FILTER) += fate-webp-rgb-lena-lossless-rgb24 fate-webp-rgb-lena-lossless-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -pix_fmt rgb24 -vf scale FATE_WEBP += fate-webp-rgba-lossless @@ -541,10 +525,10 @@ FATE_WEBP += fate-webp-rgba-lossy-q80 fate-webp-rgba-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgba_q80.webp FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP) += $(FATE_WEBP) -FATE_IMAGE += $(FATE_WEBP-yes) +FATE_IMAGE_FRAMECRC += $(FATE_WEBP-yes) fate-webp: $(FATE_WEBP-yes) -FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface +FATE_IMAGE_FRAMECRC-$(call DEMDEC, IMAGE2, XFACE) += fate-xface fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface FATE_XBM += fate-xbm10 @@ -554,9 +538,10 @@ FATE_XBM += fate-xbm11 fate-xbm11: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/lbw.xbm FATE_XBM-$(call DEMDEC, IMAGE2, XBM) += $(FATE_XBM) -FATE_IMAGE += $(FATE_XBM-yes) +FATE_IMAGE_FRAMECRC += $(FATE_XBM-yes) fate-xbm: $(FATE_XBM-yes) +FATE_IMAGE-$(call ALLYES, FILE_PROTOCOL FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_IMAGE_FRAMECRC) $(FATE_IMAGE_FRAMECRC-yes) FATE_IMAGE += $(FATE_IMAGE-yes) FATE_IMAGE_PROBE += $(FATE_IMAGE_PROBE-yes) FATE_IMAGE_TRANSCODE += $(FATE_IMAGE_TRANSCODE-yes)

1 0

tests/Makefile: Make DEMDEC etc. auxiliary functions more flexible
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Apr 16 20:45:57 2022 +0200| [1171eab1371a13b34ab1e2ed5d65617fbc76df10] | committer: Andreas Rheinhardt tests/Makefile: Make DEMDEC etc. auxiliary functions more flexible Add a parameter that allows to add additional requirements. Also add FILE_PROTOCOL to all the auxiliary functions that use a demuxer. Also fix the requirements for the fate-mpegts-probe-(latm|program) tests. They have misused DEMDEC. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1171eab1371a13b34… --- tests/Makefile | 20 +++++++++++--------- tests/fate/mpegts.mak | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 5e4da2c42f..e175631258 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -68,11 +68,13 @@ XYES = $(if $(strip $(1)), \ yes) ENCDEC = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ - $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER) + $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER \ + $(3) FILE_PROTOCOL) ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ - $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) + $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER \ + $(4) FILE_PROTOCOL) # RAWVIDEO_ENCODER and PCM_S16LE_ENCODER corresponds to the default codecs # for framecrc. These requirements are not always necessary. @@ -84,16 +86,16 @@ TRANSCODE = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \ $(2) FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER) -DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) -ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) +DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL) +ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3)) -DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER) +DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) -FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER) -FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) -FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) +FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) +FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER $(5) FILE_PROTOCOL) +FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER $(6) FILE_PROTOCOL) -PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER) +PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) # Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the # make command line. diff --git a/tests/fate/mpegts.mak b/tests/fate/mpegts.mak index bbcbfc47b2..eaca8ec289 100644 --- a/tests/fate/mpegts.mak +++ b/tests/fate/mpegts.mak @@ -5,12 +5,12 @@ PROBE_CODEC_NAME_COMMAND = \ ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name \ -print_format default -bitexact -v 0 -FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-latm +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-latm fate-mpegts-probe-latm: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts fate-mpegts-probe-latm: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)" -FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-program +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-program fate-mpegts-probe-program: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts fate-mpegts-probe-program: CMD = run $(PROBE_CODEC_NAME_COMMAND) -select_streams p:769:v:0 -i "$(SRC)"

1 0

fate/lavf-image: Fix requirements of tests
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Apr 16 16:48:57 2022 +0200| [fedc60d07d1596b7f5f76f978a20dac26b8589b8] | committer: Andreas Rheinhardt fate/lavf-image: Fix requirements of tests 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=fedc60d07d1596b7f… --- tests/fate/lavf-image.mak | 70 +++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak index dbbd374301..df5079e118 100644 --- a/tests/fate/lavf-image.mak +++ b/tests/fate/lavf-image.mak @@ -1,36 +1,40 @@ -FATE_LAVF_IMAGES-$(call ENCDEC, BMP, IMAGE2) += bmp -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += gbrp10le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += gbrp12le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgb48le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgb48le_10.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgba64le.dpx -FATE_LAVF_IMAGES-$(call ENCDEC, MJPEG, IMAGE2) += jpg -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += rgba.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += gray.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += gray16be.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += rgb48be.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += monob.pam -FATE_LAVF_IMAGES-$(call ENCDEC, PCX, IMAGE2) += pcx -FATE_LAVF_IMAGES-$(call ENCDEC, PGM, IMAGE2) += pgm -FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += png -FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += gray16be.png -FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += rgb48be.png -FATE_LAVF_IMAGES-$(call ENCDEC, PPM, IMAGE2) += ppm -FATE_LAVF_IMAGES-$(call ENCDEC, SGI, IMAGE2) += sgi -FATE_LAVF_IMAGES-$(call ENCDEC, SUNRAST, IMAGE2) += sun -FATE_LAVF_IMAGES-$(call ENCDEC, TARGA, IMAGE2) += tga -FATE_LAVF_IMAGES-$(call ENCDEC, TIFF, IMAGE2) += tiff -FATE_LAVF_IMAGES-$(call ENCDEC, XBM, IMAGE2) += xbm -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgba.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb565be.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb555be.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb8.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb4_byte.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += gray.xwd -FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += monow.xwd +LAVF_IMAGES = $(call ALLYES, FILE_PROTOCOL IMAGE2_DEMUXER PGMYUV_DECODER \ + SCALE_FILTER $(1)_ENCODER IMAGE2_MUXER \ + $(1)_DECODER RAWVIDEO_ENCODER CRC_MUXER) + +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, BMP) += bmp +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += gbrp10le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += gbrp12le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgb48le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgb48le_10.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgba64le.dpx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, MJPEG) += jpg +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += rgba.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += gray.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += gray16be.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += rgb48be.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += monob.pam +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PCX) += pcx +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PGM) += pgm +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += png +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += gray16be.png +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += rgb48be.png +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PPM) += ppm +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, SGI) += sgi +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, SUNRAST) += sun +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, TARGA) += tga +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, TIFF) += tiff +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XBM) += xbm +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgba.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb565be.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb555be.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb8.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += rgb4_byte.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += gray.xwd +FATE_LAVF_IMAGES-$(call LAVF_IMAGES, XWD) += monow.xwd FATE_LAVF_IMAGES = $(FATE_LAVF_IMAGES-yes:%=fate-lavf-%)

1 0

fate/mov: Use REMUX and TRANSCODE where appropriate
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Apr 12 18:51:32 2022 +0200| [2b39952b086967035f280f6e0de6cf25c6795258] | committer: Andreas Rheinhardt fate/mov: Use REMUX and TRANSCODE where appropriate Also fix the requirements of fate-mov-channel-description: It needs the pcm_s16le decoder and the mov demuxer. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b39952b086967035… --- tests/fate/mov.mak | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 675c34a07d..a33f3694af 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -126,36 +126,28 @@ fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entr fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OGG_DEMUXER \ - VORBIS_DECODER MP4_MUXER MOV_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, OGG_DEMUXER VORBIS_DECODER) \ += fate-mov-mp4-chapters fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "" "-show_chapters" -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ - SCALE_FILTER PNG_ENCODER PNG_DECODER \ - MP4_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \ += fate-mov-cover-image fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS -FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - MPEGTS_DEMUXER MOV_DEMUXER AC3_DECODER \ - MP4_MUXER FRAMECRC_MUXER ) \ +FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, MPEGTS_DEMUXER AC3_DECODER) \ += fate-mov-mp4-disposition-mpegts-remux fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "" "-of json -show_entries stream_disposition:stream=index" FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) -FATE_MOV_FFMPEG-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - WAV_DEMUXER PAN_FILTER PCM_S16LE_ENCODER \ - MOV_MUXER FRAMECRC_MUXER ) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ += fate-mov-channel-description fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-channel-description fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mov-channel-description -map [outFL] -map [outFR] -map [outFC] -map [outLFE] -map [outBL] -map [outBR] -map [outDL] -map [outDR] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0"

1 0

fate/caf: Use REMUX where appropriate
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Apr 12 17:34:48 2022 +0200| [90103c9afc67e8efb5743ef910a00e8124f45428] | committer: Andreas Rheinhardt fate/caf: Use REMUX where appropriate And drop the FATE_CAF_REMUX variables which only existed to avoid having to repeat the common FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER stuff. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90103c9afc67e8efb… --- tests/fate/caf.mak | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/fate/caf.mak b/tests/fate/caf.mak index ae2c543358..f153bfeb79 100644 --- a/tests/fate/caf.mak +++ b/tests/fate/caf.mak @@ -1,33 +1,26 @@ FATE_CAF_FFMPEG-$(call ALLYES, CAF_DEMUXER CRC_MUXER) += fate-caf-demux fate-caf-demux: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy -FATE_CAF_REMUX_FFPROBE-$(CONFIG_MOV_DEMUXER) += fate-caf-alac-remux +FATE_CAF_FFMPEG_FFPROBE-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-alac-remux fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "" "-show_entries format_tags" -FATE_CAF_REMUX-$(CONFIG_AMR_DEMUXER) += fate-caf-amr_nb-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, AMR_DEMUXER) += fate-caf-amr_nb-remux fate-caf-amr_nb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/4.75k.amr caf "-c copy" "-c copy -t 0.2" -FATE_CAF_REMUX-$(CONFIG_MOV_DEMUXER) += fate-caf-qdm2-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-qdm2-remux fate-caf-qdm2-remux: CMD = transcode mov $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov caf "-c copy" "-c copy -t 0.2" -FATE_CAF_REMUX-$(CONFIG_WAV_DEMUXER) += fate-caf-pcm_s24le-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, WAV_DEMUXER) += fate-caf-pcm_s24le-remux fate-caf-pcm_s24le-remux: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav caf "-c copy" "-c copy -t 0.05" -FATE_CAF_REMUX-$(call ALLYES, WAV_DEMUXER PCM_S24LE_DECODER \ - PCM_S24BE_ENCODER) \ +FATE_CAF_FFMPEG-$(call REMUX, CAF, WAV_DEMUXER PCM_S24LE_DECODER \ + PCM_S24BE_ENCODER) \ += fate-caf-pcm_s24-remux fate-caf-pcm_s24-remux: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav caf "-c pcm_s24be" "-c copy -t 0.05" -FATE_CAF_REMUX-$(CONFIG_MOV_DEMUXER) += fate-caf-mace6-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-mace6-remux fate-caf-mace6-remux: CMD = transcode mov $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov caf "-map 0:a -c copy" "-c copy -t 0.003" -FATE_CAF_FFMPEG-$(call ALLYES, FILE_PROTOCOL CAF_MUXER CAF_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ - += $(FATE_CAF_REMUX-yes) -FATE_CAF_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL CAF_MUXER \ - CAF_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_CAF_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_CAF_FFMPEG-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_CAF_FFMPEG_FFPROBE-yes) fate-caf: $(FATE_CAF_FFMPEG-yes) $(FATE_CAF_FFMPEG_FFPROBE-yes)

1 0

fate/amr[nw]b: Use REMUX where appropriate
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Apr 12 17:28:38 2022 +0200| [b182d5c4f31f6ba54fdd95bc624d363bcc389927] | committer: Andreas Rheinhardt fate/amr[nw]b: Use REMUX where appropriate Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b182d5c4f31f6ba54… --- tests/fate/amrnb.mak | 4 +--- tests/fate/amrwb.mak | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak index f4f74f14d9..6f5ed413e3 100644 --- a/tests/fate/amrnb.mak +++ b/tests/fate/amrnb.mak @@ -30,9 +30,7 @@ FATE_AMRNB += fate-amrnb-12k2 fate-amrnb-12k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/12.2k.amr fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm -FATE_AMRNB_REMUX-$(call ALLYES, FILE_PROTOCOL AMR_DEMUXER AMR_PARSER \ - AMR_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-amrnb-remux +FATE_AMRNB_REMUX-$(call REMUX, AMR, AMR_PARSER) += fate-amrnb-remux fate-amrnb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/10.2k.amr amr "-c copy" "-c copy -t 1" $(FATE_AMRNB): CMP = stddev diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index 8450c28bba..7cd17d266e 100644 --- a/tests/fate/amrwb.mak +++ b/tests/fate/amrwb.mak @@ -41,9 +41,7 @@ FATE_AMRWB += fate-amrwb-23k85-2 fate-amrwb-23k85-2: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/deus-23k85.awb fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm -FATE_AMRWB_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER AMR_PARSER AMR_MUXER \ - AMR_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-amrwb-remux +FATE_AMRWB_REMUX-$(call REMUX, AMR, MOV_DEMUXER AMR_PARSER) += fate-amrwb-remux fate-amrwb-remux: CMD = transcode mov $(TARGET_SAMPLES)/amrwb/seed-23k85.awb amr "-c copy" "-c copy -t 1" $(FATE_AMRWB): CMP = stddev

1 0

fate/id3v2: Use REMUX where appropriate
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Apr 12 17:22:11 2022 +0200| [d57822b57d22b4ee99aac414078870c2bf538cfc] | committer: Andreas Rheinhardt fate/id3v2: Use REMUX where appropriate Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d57822b57d22b4ee9… --- tests/fate/id3v2.mak | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index fea7545270..fc574e4487 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -1,14 +1,10 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 -FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MP3_MUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-id3v2-priv-remux +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "" "-show_entries format_tags" -FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER AIFF_MUXER \ - AIFF_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-id3v2-chapters +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "" "-show_entries format_tags:chapters" FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes)

1 0

fate/matroska: Use REMUX and TRANSCODE where appropriate
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Apr 12 17:19:57 2022 +0200| [705f1a43ea70069bcd612571c790b74f9afab8e5] | committer: Andreas Rheinhardt fate/matroska: Use REMUX and TRANSCODE where appropriate Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=705f1a43ea70069bc… --- tests/fate/matroska.mak | 70 ++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 47 deletions(-) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 3073b0a061..c9d88975ca 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -74,26 +74,19 @@ fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/ # It also tests writing PCM audio in both endiannesses and putting # Cues with the same timestamp in the same CuePoint as well as # omitting CRC-32 elements when writing Matroska. -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER PCM_S24LE_DECODER \ - PCM_S24BE_ENCODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA-$(call TRANSCODE, PCM_S24BE PCM_S24LE, MATROSKA, WAV_DEMUXER) \ += fate-matroska-move-cues-to-front fate-matroska-move-cues-to-front: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav matroska "-map 0 -map 0 -c:a:0 pcm_s24be -c:a:1 copy -cluster_time_limit 5 -cues_to_front yes -metadata_header_padding 7840 -write_crc32 0" "-map 0 -c copy -t 0.1" # This tests DOVI (reading from MP4 and Matroska and writing to Matroska) # as well as writing the Cues at the front (by shifting data) if # the initially reserved amount of space turns out to be insufficient. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER \ - HEVC_DECODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER HEVC_DECODER) \ += fate-matroska-dovi-write-config7 fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list" -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL \ - MOV_DEMUXER MATROSKA_DEMUXER \ - HEVC_DECODER AAC_DECODER \ - MATROSKA_MUXER FRAMECRC_MUXER) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER \ + HEVC_DECODER AAC_DECODER) \ += fate-matroska-dovi-write-config8 fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-c copy" "-map 0 -c copy -t 0.4" "" "-show_entries stream_side_data_list -select_streams v" @@ -105,10 +98,9 @@ fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv8 # yet there is an audio packet with the overall lowest pts. output_ts_offset # makes the pts of the audio packet, but not the leading video packet negative # so that we run into the above issue.) -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER MPEGVIDEO_PARSER \ - MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF \ - MP3FLOAT_DECODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA-$(call REMUX, MATROSKA, MPEGTS_DEMUXER MPEGVIDEO_PARSER \ + MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF \ + MP3FLOAT_DECODER) \ += fate-matroska-avoid-negative-ts fate-matroska-avoid-negative-ts: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/t.mpg matroska "-c copy -ss 1.09 -output_ts_offset -60ms" "-c copy -t 0.4" @@ -116,22 +108,17 @@ fate-matroska-avoid-negative-ts: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/ # It furthermore tests writing the Cues at the front if the cues_to_front # option is set and more than enough space has been reserved in advance. # (Btw: The keyframe flags of the input video stream seem wrong.) -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL AVI_DEMUXER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) += fate-matroska-ms-mode +FATE_MATROSKA-$(call REMUX, MATROSKA, AVI_DEMUXER) += fate-matroska-ms-mode fate-matroska-ms-mode: CMD = transcode avi $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 5000" "-map 0 -c copy -t 1" # This tests Matroska's QT-compatibility mode. -FATE_MATROSKA-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-matroska-qt-mode +FATE_MATROSKA-$(call REMUX, MATROSKA, MOV_DEMUXER) += fate-matroska-qt-mode fate-matroska-qt-mode: CMD = transcode mov $(TARGET_SAMPLES)/svq1/marymary-shackles.mov matroska "-c copy" "-c copy -t 3" # This test the following features of the Matroska muxer: Writing projection # stream side-data; not setting any track to default if the user requested it; # and modifying and writing colorspace properties. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER MATROSKA_MUXER \ - H264_DECODER H264_PARSER) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, H264_DECODER H264_PARSER) \ += fate-matroska-spherical-mono-remux fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer" @@ -141,12 +128,9 @@ fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/m # when reencoding (here to ffv1). # Both input audio tracks are completely zero, so the noise bsf is used # to make this test interesting. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ - PRORES_DECODER PCM_S24LE_DECODER \ - FFV1_ENCODER ARESAMPLE_FILTER \ - PCM_S16BE_ENCODER NOISE_BSF \ - MATROSKA_MUXER MATROSKA_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, FFV1 PRORES, MATROSKA, MXF_DEMUXER \ + PCM_S24LE_DECODER ARESAMPLE_FILTER \ + PCM_S16BE_ENCODER NOISE_BSF) \ += fate-matroska-mastering-display-metadata fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:drop=-4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" @@ -156,14 +140,13 @@ fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/ # the h264_metadata filter is used to remove it as well as the H.264 AUD. # The video is decoded twice to show that this did not change the decoded # output. Furthermore, this also tests writing PCM with bitdepth 32. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER \ - H264_PARSER MPEGAUDIO_PARSER \ - EXTRACT_EXTRADATA_BSF MP2_DECODER \ - H264_METADATA_BSF ARESAMPLE_FILTER \ - RAWVIDEO_ENCODER PCM_S32LE_ENCODER \ - PCM_S32BE_ENCODER MATROSKA_MUXER \ - MATROSKA_DEMUXER H264_DECODER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, PCM_S32LE MP2, MATROSKA, \ + MPEGTS_DEMUXER H264_PARSER \ + H264_DECODER MPEGAUDIO_PARSER \ + EXTRACT_EXTRADATA_BSF \ + H264_METADATA_BSF \ + ARESAMPLE_FILTER \ + PCM_S32BE_ENCODER) \ += fate-matroska-h264-remux fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "" "-show_entries stream=index,codec_name:stream_tags=title,language" @@ -171,17 +154,12 @@ fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_int # it also tests setting a track as suitable for hearing impaired. # It also tests the capability of the VP8 parser to set the keyframe flag # (the input file lacks ReferenceBlock elements making everything a keyframe). -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MATROSKA_DEMUXER \ - VP8_PARSER MATROSKA_MUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP8_PARSER) \ += fate-matroska-vp8-alpha-remux fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "" "-show_entries stream_disposition:stream_side_data_list" # The audio stream to be remuxed here has AV_DISPOSITION_VISUAL_IMPAIRED. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER \ - AC3_DECODER MATROSKA_MUXER \ - MATROSKA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MPEGTS_DEMUXER AC3_DECODER) \ += fate-matroska-mpegts-remux fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired -default_mode infer" "-map 0 -c copy" "" "-show_entries stream_disposition:stream=index" @@ -192,9 +170,7 @@ fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entrie # It also tests that dispositions not supported by WebM are not written # (and therefore lost). It moreover tests that the muxer writes CuePoints # with multiple CueTrackPositions if the timestamps coincide. -FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WEBVTT_DEMUXER \ - WEBM_MUXER MATROSKA_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, WEBVTT_DEMUXER) \ += fate-webm-webvtt-remux fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32"

1 0

avcodec/xfacedec: Add AV_CODEC_CAP_DR1
by Andreas Rheinhardt 27 Apr '22

27 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 15 18:01:44 2022 +0200| [56a062f53cc020e271674c16650604f53f79ea2c] | committer: Andreas Rheinhardt avcodec/xfacedec: Add AV_CODEC_CAP_DR1 This decoder uses ff_get_buffer() and does nothing weird (it does not even rely on any alignment of the frame's data/linesize). Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56a062f53cc020e27… --- libavcodec/xfacedec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c index b103b5beda..f15bc2d773 100644 --- a/libavcodec/xfacedec.c +++ b/libavcodec/xfacedec.c @@ -180,6 +180,7 @@ const FFCodec ff_xface_decoder = { .p.long_name = NULL_IF_CONFIG_SMALL("X-face image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XFACE, + .p.capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(XFaceContext), .init = xface_decode_init, FF_CODEC_DECODE_CB(xface_decode_frame),

1 0

avcodec/pgxdec: Use unsigned types for unsigned values
by Andreas Rheinhardt 27 Apr '22

27 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Apr 15 17:05:45 2022 +0200| [a655b0a50656326d9b0bcec9df3b5a0f4c32da15] | committer: Andreas Rheinhardt avcodec/pgxdec: Use unsigned types for unsigned values Both AV_PIX_FMT_GRAY8 and AV_PIX_FMT_GRAY16 use unsigned values, not signed ones. The fact that the input might be signed in some cases in the original format doesn't change this. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a655b0a50656326d9… --- libavcodec/pgxdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 29de103167..52e2c2a36c 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -107,8 +107,8 @@ error: } \ } \ -WRITE_FRAME(8, int8_t, byte) -WRITE_FRAME(16, int16_t, be16) +WRITE_FRAME(8, uint8_t, byte) +WRITE_FRAME(16, uint16_t, be16) static int pgx_decode_frame(AVCodecContext *avctx, AVFrame *p, int *got_frame, AVPacket *avpkt)

1 0