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

avformat/jpegxl_probe: Fix potential incorrect and UB shift
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Apr 28 05:07:25 2022 +0200| [3946cb02fc67a0fdd23ff9e0678b2801fe479463] | committer: Andreas Rheinhardt avformat/jpegxl_probe: Fix potential incorrect and UB shift Fixes Coverity issue #1504273. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3946cb02fc67a0fdd… --- libavformat/jpegxl_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index 924b529ad5..9cd00da194 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -96,10 +96,10 @@ static uint64_t jpegxl_u64(GetBitContext *gb) ret = jxl_bits(12); while (jxl_bits(1)) { if (shift < 60) { - ret |= jxl_bits(8) << shift; + ret |= (uint64_t)jxl_bits(8) << shift; shift += 8; } else { - ret |= jxl_bits(4) << shift; + ret |= (uint64_t)jxl_bits(4) << shift; break; } }

1 0

avfilter/Makefile: Add fflcms2.h to SKIPHEADERS- if necessary
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Apr 28 01:40:24 2022 +0200| [5f8c83e95e4b871d1073c07233903cd4669949b7] | committer: Andreas Rheinhardt avfilter/Makefile: Add fflcms2.h to SKIPHEADERS- if necessary Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f8c83e95e4b871d1… --- libavfilter/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 1db097b464..e06acdf881 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -596,6 +596,7 @@ SHLIBOBJS += log2_tab.o # Windows resource file SLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o +SKIPHEADERS-$(CONFIG_LCMS2) += fflcms2.h SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h SKIPHEADERS-$(CONFIG_QSVVPP) += qsvvpp.h

1 0

avcodec/Makefile: Add libjxl.h to SKIPHEADERS if necessary
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Apr 28 01:39:37 2022 +0200| [2eb7e38cb85a6970f9f21b758385c0f17ac26cfd] | committer: Andreas Rheinhardt avcodec/Makefile: Add libjxl.h to SKIPHEADERS if necessary Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2eb7e38cb85a6970f… --- libavcodec/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d6ad23474d..cfaa6f196a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1229,6 +1229,7 @@ SKIPHEADERS-$(CONFIG_AMF) += amfenc.h SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_JNI) += ffjni.h +SKIPHEADERS-$(CONFIG_LIBJXL) += libjxl.h SKIPHEADERS-$(CONFIG_LIBVPX) += libvpx.h SKIPHEADERS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc_common.h SKIPHEADERS-$(CONFIG_MEDIACODEC) += mediacodecdec_common.h mediacodec_surface.h mediacodec_wrapper.h mediacodec_sw_buffer.h

1 0

avfilter/af_adynamicequalizer: set target filter type
by Paul B Mahol 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Apr 28 21:57:49 2022 +0200| [c27123606a4413a9ee39ffe4271b1c28013970ef] | committer: Paul B Mahol avfilter/af_adynamicequalizer: set target filter type > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c27123606a4413a9e… --- doc/filters.texi | 10 ++++++++++ libavfilter/af_adynamicequalizer.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 52c40833eb..66f1c543be 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -913,6 +913,16 @@ Cut frequencies above detection threshold. Boost frequencies bellow detection threshold. @end table Default mode is @samp{cut}. + +@item tftype +Set the type of target filter, can be one of the following: + +@table @samp +@item bell +@item lowshelf +@item highshelf +@end table +Default type is @samp{bell}. @end table @subsection Commands diff --git a/libavfilter/af_adynamicequalizer.c b/libavfilter/af_adynamicequalizer.c index b51491391d..b6d438f698 100644 --- a/libavfilter/af_adynamicequalizer.c +++ b/libavfilter/af_adynamicequalizer.c @@ -42,6 +42,7 @@ typedef struct AudioDynamicEqualizerContext { double attack_coef; double release_coef; int mode; + int type; AVFrame *state; } AudioDynamicEqualizerContext; @@ -160,6 +161,7 @@ static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo const int start = (in->ch_layout.nb_channels * jobnr) / nb_jobs; const int end = (in->ch_layout.nb_channels * (jobnr+1)) / nb_jobs; const int mode = s->mode; + const int type = s->type; const double knee = s->knee; const double slew = s->slew; const double aattack = exp(-1000. / ((s->attack + 2.0 * (slew - 1.)) * sample_rate)); @@ -186,6 +188,7 @@ static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo for (int n = 0; n < out->nb_samples; n++) { double detect, gain, v, listen; double fa[3], fm[3]; + double k, g; detect = listen = get_svf(src[n], dm, da, state); detect = fabs(detect); @@ -194,8 +197,9 @@ static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo aattack, iratio, knee, range, threshold, slew, &state[4], attack, release, nc); - { - double k = 1. / (tqfactor * gain); + switch (type) { + case 0: + k = 1. / (tqfactor * gain); fa[0] = 1. / (1. + fg * (fg + k)); fa[1] = fg * fa[0]; @@ -204,6 +208,31 @@ static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo fm[0] = 1.; fm[1] = k * (gain * gain - 1.); fm[2] = 0.; + break; + case 1: + k = 1. / tqfactor; + g = fg / sqrt(gain); + + fa[0] = 1. / (1. + g * (g + k)); + fa[1] = g * fa[0]; + fa[2] = g * fa[1]; + + fm[0] = 1.; + fm[1] = k * (gain - 1.); + fm[2] = gain * gain - 1.; + break; + case 2: + k = 1. / tqfactor; + g = fg / sqrt(gain); + + fa[0] = 1. / (1. + g * (g + k)); + fa[1] = g * fa[0]; + fa[2] = g * fa[1]; + + fm[0] = gain * gain; + fm[1] = k * (1. - gain) * gain; + fm[2] = 1. - gain * gain; + break; } v = get_svf(src[n], fm, fa, &state[2]); @@ -279,6 +308,10 @@ static const AVOption adynamicequalizer_options[] = { { "listen", 0, 0, AV_OPT_TYPE_CONST, {.i64=-1}, 0, 0, FLAGS, "mode" }, { "cut", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "mode" }, { "boost", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "mode" }, + { "tftype", "set target filter type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, FLAGS, "type" }, + { "bell", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "type" }, + { "lowshelf", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "type" }, + { "highshelf",0, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "type" }, { NULL } };

1 0

avfilter/af_adynamicequalizer: improve threshold usage
by Paul B Mahol 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Apr 28 21:35:53 2022 +0200| [4e284837e4ae4e2d7b2eccdd64ac92799c994a5d] | committer: Paul B Mahol avfilter/af_adynamicequalizer: improve threshold usage > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e284837e4ae4e2d7… --- libavfilter/af_adynamicequalizer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_adynamicequalizer.c b/libavfilter/af_adynamicequalizer.c index 4ebdd1815d..b51491391d 100644 --- a/libavfilter/af_adynamicequalizer.c +++ b/libavfilter/af_adynamicequalizer.c @@ -113,7 +113,7 @@ static double get_gain(double in, double srate, double makeup, if (Lyg >= state[2]) attslew = 1; } - } else if (2. * (Lxg-thresdb) > width) { + } else if (2. * (Lxg - thresdb) > width) { Lyg = thresdb + (Lxg - thresdb) * iratio; } @@ -121,7 +121,7 @@ static double get_gain(double in, double srate, double makeup, Lxl = Lxg - Lyg; - Ly1 = fmaxf(Lxl, release_coeff * state[1] +(1. - release_coeff) * Lxl); + Ly1 = fmax(Lxl, release_coeff * state[1] +(1. - release_coeff) * Lxl); Lyl = attack_coeff * state[0] + (1. - attack_coeff) * Ly1; cdb = -Lyl; @@ -150,7 +150,7 @@ static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo const double range = s->range; const double dfrequency = fmin(s->dfrequency, sample_rate * 0.5); const double tfrequency = fmin(s->tfrequency, sample_rate * 0.5); - const double threshold = log(s->threshold + DBL_EPSILON); + const double threshold = to_dB(s->threshold + DBL_EPSILON); const double release = s->release_coef; const double attack = s->attack_coef; const double dqfactor = s->dqfactor;

1 0

doc/encoders: document libjxl encoder options
by Leo Izen 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Leo Izen <leo.izen(a)gmail.com> | Wed Apr 27 11:00:57 2022 -0400| [ec07b1547753864d1fb47eb2747613dddba507b2] | committer: Gyan Doshi doc/encoders: document libjxl encoder options Add more detailed documenation for the libjxl encoder wrapper than is present currently inside libavcodec. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec07b1547753864d1… --- doc/encoders.texi | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index aac9f25e55..966032a720 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1809,6 +1809,41 @@ by ":". See the SVT-AV1 encoder user guide for a list of accepted parameters. @end table +@section libjxl + +libjxl JPEG XL encoder wrapper. + +Requires the presence of the libjxl headers and library during +configuration. You need to explicitly configure the build with +@code{--enable-libjxl}. + +@subsection Options + +The libjxl wrapper supports the following options: + +@table @option + +@item distance +Set the target Butteraugli distance. This is a quality setting: lower +distance yields higher quality, with distance=1.0 roughly comparable to +libjpeg Quality 90 for photographic content. Setting distance=0.0 yields +true lossless encoding. Valid values range between 0.0 and 15.0, and sane +values rarely exceed 5.0. Setting distance=0.1 usually attains +transparency for most input. The default is 1.0. + +@item effort +Set the encoding effort used. Higher effort values produce more consistent +quality and usually produces a better quality/bpp curve, at the cost of +more CPU time required. Valid values range from 1 to 9, and the default is 7. + +@item modular +Force the encoder to use Modular mode instead of choosing automatically. The +default is to use VarDCT for lossy encoding and Modular for lossless. VarDCT +is generally superior to Modular for lossy encoding but does not support +lossless encoding. + +@end table + @section libkvazaar Kvazaar H.265/HEVC encoder.

1 0

fate/concatdec: Don't duplicate test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 24 02:05:18 2022 +0200| [34088eb7bbd595cf6984e57974f8acdcab15a662] | committer: Andreas Rheinhardt fate/concatdec: Don't duplicate test requirements The tests in concatdec.mak reuse files created by tests from lavf-container. Therefore these tests have the other tests as prerequisite and mostly duplicate their CONFIG-requirements. (The mxf_d10 tests did it incorrect as they only required the MXF muxer.) This duplication is of course bad as usual, so stop it by using the corresponding variable that contains the non-lavf-container-tests that are enabled to filter out all the concat-tests without a corresponding enabled non-concat test. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34088eb7bbd595cf6… --- tests/Makefile | 1 + tests/fate/concatdec.mak | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index e02eb57035..6e8fc5906e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -141,6 +141,7 @@ include $(SRC_PATH)/tests/fate/canopus.mak include $(SRC_PATH)/tests/fate/cbs.mak include $(SRC_PATH)/tests/fate/cdxl.mak include $(SRC_PATH)/tests/fate/checkasm.mak +# Must be included after lavf-container.mak include $(SRC_PATH)/tests/fate/concatdec.mak include $(SRC_PATH)/tests/fate/cover-art.mak include $(SRC_PATH)/tests/fate/dca.mak diff --git a/tests/fate/concatdec.mak b/tests/fate/concatdec.mak index 988559d251..26d4a63179 100644 --- a/tests/fate/concatdec.mak +++ b/tests/fate/concatdec.mak @@ -1,21 +1,22 @@ -FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf_d10 +FATE_CONCAT_DEMUXER_SIMPLE1_LAVF := mxf mxf_d10 -FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts +FATE_CONCAT_DEMUXER_SIMPLE2_LAVF := ts -FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf_d10 +FATE_CONCAT_DEMUXER_EXTENDED_LAVF := mxf mxf_d10 -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval fate-concat-demuxer-simple1-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D))) -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval fate-concat-demuxer-simple1-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D))) -FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes:%=fate-concat-demuxer-simple1-lavf-%) +$(foreach D,SIMPLE1 SIMPLE2 EXTENDED,$(eval FATE_CONCAT_DEMUXER_$(D)_LAVF := $$(filter $$(FATE_LAVF_CONTAINER:fate-lavf-%=%),$$(FATE_CONCAT_DEMUXER_$(D)_LAVF)))) -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D))) -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple2.ffconcat ../lavf/lavf.$(D))) -FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes:%=fate-concat-demuxer-simple2-lavf-%) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF),$(eval fate-concat-demuxer-simple1-lavf-$(D): fate-lavf-$(D))) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF),$(eval fate-concat-demuxer-simple1-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D))) +FATE_CONCAT_DEMUXER += $(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF:%=fate-concat-demuxer-simple1-lavf-%) -$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D))) -$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): CMD = concat $(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5)) -FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes:%=fate-concat-demuxer-extended-lavf-%) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF),$(eval fate-concat-demuxer-simple2-lavf-$(D): fate-lavf-$(D))) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF),$(eval fate-concat-demuxer-simple2-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple2.ffconcat ../lavf/lavf.$(D))) +FATE_CONCAT_DEMUXER += $(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF:%=fate-concat-demuxer-simple2-lavf-%) -FATE-$(CONFIG_FFPROBE) += $(FATE_CONCAT_DEMUXER-yes) +$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF),$(eval fate-concat-demuxer-extended-lavf-$(D): fate-lavf-$(D))) +$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF),$(eval fate-concat-demuxer-extended-lavf-$(D): CMD = concat $(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5)) +FATE_CONCAT_DEMUXER += $(FATE_CONCAT_DEMUXER_EXTENDED_LAVF:%=fate-concat-demuxer-extended-lavf-%) + +FATE_CONCAT_DEMUXER := $(if $(CONFIG_CONCAT_DEMUXER), $(FATE_CONCAT_DEMUXER)) +FATE_FFPROBE += $(FATE_CONCAT_DEMUXER)

1 0

fate/lavf-container: Fix test requirements
by Andreas Rheinhardt 28 Apr '22

28 Apr '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 24 01:08:34 2022 +0200| [555c31de9da0ef1b4b0cea75bb7a6d6a246a1ebd] | committer: Andreas Rheinhardt fate/lavf-container: Fix test requirements Automatically inherited by the fate-seek-lavf tests based upon these tests. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=555c31de9da0ef1b4… --- tests/fate/lavf-container.mak | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 9e0eed4851..7fb54d7406 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -13,12 +13,22 @@ FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) + FATE_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom mxf_opatom_audio FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut FATE_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm -FATE_LAVF_CONTAINER-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg +FATE_LAVF_CONTAINER-$(call ENCDEC2, MJPEG, PCM_S16LE, SMJPEG) += smjpeg FATE_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts FATE_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv +FATE_LAVF_CONTAINER_RESAMPLE := asf avi dv_pal dv_ntsc gxf_pal gxf_ntsc \ + mkv mkv_attachment mpg mxf nut rm ts wtv +FATE_LAVF_CONTAINER-$(!CONFIG_ARESAMPLE_FILTER) := $(filter-out $(FATE_LAVF_CONTAINER_RESAMPLE),$(FATE_LAVF_CONTAINER-yes)) + +FATE_LAVF_CONTAINER_SCALE := dv dv_pal dv_ntsc flm gxf gxf_pal gxf_ntsc \ + mxf_dv25 mxf_dvcpro50 mxf_d10 mxf_opatom \ + smjpeg +FATE_LAVF_CONTAINER-$(!CONFIG_SCALE_FILTER) := $(filter-out $(FATE_LAVF_CONTAINER_SCALE),$(FATE_LAVF_CONTAINER-yes)) + FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%) +FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER), $(FATE_LAVF_CONTAINER)) $(FATE_LAVF_CONTAINER): CMD = lavf_container $(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)

1 0

fate/lavf-audio: 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 23 22:25:52 2022 +0200| [0dbe08aa10f9fe0a91a8f150e6f17941fff04bd4] | committer: Andreas Rheinhardt fate/lavf-audio: Fix requirements of tests These changes are automatically inherited by the fate-seek-tests based upon lavf-audio. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dbe08aa10f9fe0a9… --- tests/fate/lavf-audio.mak | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/fate/lavf-audio.mak b/tests/fate/lavf-audio.mak index a0600491a8..b03030176c 100644 --- a/tests/fate/lavf-audio.mak +++ b/tests/fate/lavf-audio.mak @@ -1,14 +1,10 @@ FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AIFF) += aiff FATE_LAVF_AUDIO-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al -FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE_PLANAR, AST) += ast FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AU) += au FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, CAF) += caf FATE_LAVF_AUDIO-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf FATE_LAVF_AUDIO-$(call ENCDEC, FLAC, OGG) += ogg -FATE_LAVF_AUDIO-$(call ENCDEC, PCM_U8, RSO) += rso -FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, SOX) += sox FATE_LAVF_AUDIO-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul -FATE_LAVF_AUDIO-$(call ENCDEC, PCM_U8, VOC) += voc FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, IRCAM) += ircam FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, VOC) += s16.voc FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, WAV) += wav @@ -17,9 +13,15 @@ FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, WAV) += peak_only.wav FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, W64) += w64 FATE_LAVF_AUDIO-$(call ENCDEC, TTA, TTA) += tta FATE_LAVF_AUDIO-$(call ENCMUX, TTA, MATROSKA_AUDIO) += mka -FATE_LAVF_AUDIO-$(call ENCDEC, WAVPACK, WV) += wv +FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_S16BE_PLANAR, AST) += ast +FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_U8, RSO) += rso +FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_S16LE, SOX) += sox +FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_U8, VOC) += voc +FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, WAVPACK, WV) += wv +FATE_LAVF_AUDIO-$(CONFIG_ARESAMPLE_FILTER) += $(FATE_LAVF_AUDIO_RESAMPLE-yes) FATE_LAVF_AUDIO = $(FATE_LAVF_AUDIO-yes:%=fate-lavf-%) +FATE_LAVF_AUDIO := $(if $(call ENCDEC, PCM_S16LE, CRC PCM_S16LE), $(FATE_LAVF_AUDIO)) $(FATE_LAVF_AUDIO): CMD = lavf_audio $(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)

1 0

fate/lavf-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 23 21:44:27 2022 +0200| [eaecd632a61e50815853003f6dece5108b8372ef] | committer: Andreas Rheinhardt fate/lavf-video: Fix test requirements The new requirements are also automatically inherited by the FATE_SEEK_LAVF_VIDEO seek-tests. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eaecd632a61e50815… --- tests/fate/lavf-video.mak | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/fate/lavf-video.mak b/tests/fate/lavf-video.mak index f6e98246c4..7557283dd3 100644 --- a/tests/fate/lavf-video.mak +++ b/tests/fate/lavf-video.mak @@ -1,15 +1,19 @@ -FATE_LAVF_VIDEO-$(call ENCDEC, APNG, APNG) += apng -FATE_LAVF_VIDEO-$(call ENCDEC, APNG, APNG) += apng.png -FATE_LAVF_VIDEO-$(call ENCDEC, FITS, FITS) += gray.fits -FATE_LAVF_VIDEO-$(call ENCDEC, FITS, FITS) += gray16be.fits -FATE_LAVF_VIDEO-$(call ENCDEC, FITS, FITS) += gbrp.fits -FATE_LAVF_VIDEO-$(call ENCDEC, FITS, FITS) += gbrap.fits -FATE_LAVF_VIDEO-$(call ENCDEC, FITS, FITS) += gbrp16be.fits -FATE_LAVF_VIDEO-$(call ENCDEC, FITS, FITS) += gbrap16be.fits -FATE_LAVF_VIDEO-$(call ENCDEC, GIF, GIF) += gif -FATE_LAVF_VIDEO-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, APNG, APNG) += apng +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, APNG PNG, APNG) += apng.png +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, FITS, FITS) += gray.fits +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, FITS, FITS) += gray16be.fits +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, FITS, FITS) += gbrp.fits +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, FITS, FITS) += gbrap.fits +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, FITS, FITS) += gbrp16be.fits +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, FITS, FITS) += gbrap16be.fits +FATE_LAVF_VIDEO_SCALE-$(call ENCDEC, GIF, GIF) += gif +FATE_LAVF_VIDEO-$(call ENCDEC, WRAPPED_AVFRAME RAWVIDEO, YUV4MPEGPIPE) += y4m +FATE_LAVF_VIDEO-$(CONFIG_SCALE_FILTER) += $(FATE_LAVF_VIDEO_SCALE-yes) FATE_LAVF_VIDEO = $(FATE_LAVF_VIDEO-yes:%=fate-lavf-%) +FATE_LAVF_VIDEO := $(if $(call ALLYES, IMAGE2_DEMUXER PGMYUV_DECODER \ + RAWVIDEO_ENCODER CRC_MUXER), \ + $(FATE_LAVF_VIDEO)) $(FATE_LAVF_VIDEO): CMD = lavf_video $(FATE_LAVF_VIDEO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)

1 0