[PR] avcodec/tests/encinfo: Convert into API test (PR #24182)
mkver via ffmpeg-devel <[email protected]>
| Newsgroups | gmane.comp.video.ffmpeg.devel |
|---|---|
| Message-ID | <[email protected]> |
PR #24182 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24182 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24182.patch Not sure about the second patch. >From 56a4f1d3b04baf8f66dbff3c554d46412eb8905d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Mon, 17 Aug 2026 13:50:44 +0200 Subject: [PATCH 1/3] avcodec/tests/encinfo: Convert into API test It doesn't use any internals of lavc. Converting it to an API test tool reduces disk usage for shared builds. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/Makefile | 1 - libavcodec/tests/.gitignore | 1 - tests/api/Makefile | 1 + .../tests/encinfo.c => tests/api/api-enc-info-test.c | 0 tests/fate/wav.mak | 8 ++++---- 5 files changed, 5 insertions(+), 6 deletions(-) rename libavcodec/tests/encinfo.c => tests/api/api-enc-info-test.c (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e464811af6..8c9a122cf7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1378,7 +1378,6 @@ TESTPROGS = avcodec \ bitstream_be \ bitstream_le \ codec_desc \ - encinfo \ htmlsubtitles \ jpeg2000dwt \ mathops \ diff --git a/libavcodec/tests/.gitignore b/libavcodec/tests/.gitignore index 91a6cf1407..04e1e2518b 100644 --- a/libavcodec/tests/.gitignore +++ b/libavcodec/tests/.gitignore @@ -8,7 +8,6 @@ /celp_math /codec_desc /dct -/encinfo /golomb /hashtable /h264_levels diff --git a/tests/api/Makefile b/tests/api/Makefile index 987db1b785..e04790ce2f 100644 --- a/tests/api/Makefile +++ b/tests/api/Makefile @@ -4,6 +4,7 @@ APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264-slice APITESTPROGS-yes += api-seek api-dump-stream-meta APITESTPROGS-$(call DEMDEC, H263, H263) += api-band APITESTPROGS-$(HAVE_THREADS) += api-threadmessage +APITESTPROGS-$(CONFIG_AVCODEC) += api-enc-info APITESTPROGS-$(call ALLYES, H261_ENCODER H261_PARSER) += api-enc-parser APITESTPROGS += $(APITESTPROGS-yes) diff --git a/libavcodec/tests/encinfo.c b/tests/api/api-enc-info-test.c similarity index 100% rename from libavcodec/tests/encinfo.c rename to tests/api/api-enc-info-test.c diff --git a/tests/fate/wav.mak b/tests/fate/wav.mak index ab8a1d7195..81d9ef93fa 100644 --- a/tests/fate/wav.mak +++ b/tests/fate/wav.mak @@ -1,10 +1,10 @@ FATE_WAV_ENCINFO-$(CONFIG_ADPCM_MS_ENCODER) += fate-wav-enc-adpcm-ms-encinfo -fate-wav-enc-adpcm-ms-encinfo: libavcodec/tests/encinfo$(EXESUF) -fate-wav-enc-adpcm-ms-encinfo: CMD = run libavcodec/tests/encinfo$(EXESUF) adpcm_ms +fate-wav-enc-adpcm-ms-encinfo: tests/api/api-enc-info-test$(EXESUF) +fate-wav-enc-adpcm-ms-encinfo: CMD = run tests/api/api-enc-info-test$(EXESUF) adpcm_ms FATE_WAV_ENCINFO-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += fate-wav-enc-adpcm-ima-wav-encinfo -fate-wav-enc-adpcm-ima-wav-encinfo: libavcodec/tests/encinfo$(EXESUF) -fate-wav-enc-adpcm-ima-wav-encinfo: CMD = run libavcodec/tests/encinfo$(EXESUF) adpcm_ima_wav +fate-wav-enc-adpcm-ima-wav-encinfo: tests/api/api-enc-info-test$(EXESUF) +fate-wav-enc-adpcm-ima-wav-encinfo: CMD = run tests/api/api-enc-info-test$(EXESUF) adpcm_ima_wav FATE_WAV_BITRATE-$(call ALLYES, ADPCM_MS_ENCODER PCM_S16LE_DECODER WAV_MUXER WAV_DEMUXER FILE_PROTOCOL) += fate-wav-enc-adpcm-ms-bitrate fate-wav-enc-adpcm-ms-bitrate: tests/data/asynth-44100-2.wav -- 2.52.0 >From 9a072bb4c28c85c4959253671bc8fd3abadb1675 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Mon, 17 Aug 2026 14:11:35 +0200 Subject: [PATCH 2/3] tests/fate/wav: Deduplicate encinfo rules Signed-off-by: Andreas Rheinhardt <[email protected]> --- tests/fate/wav.mak | 11 ++++------- ...-ima-wav-encinfo => wav-enc-adpcm_ima_wav-encinfo} | 0 ...-enc-adpcm-ms-encinfo => wav-enc-adpcm_ms-encinfo} | 0 3 files changed, 4 insertions(+), 7 deletions(-) rename tests/ref/fate/{wav-enc-adpcm-ima-wav-encinfo => wav-enc-adpcm_ima_wav-encinfo} (100%) rename tests/ref/fate/{wav-enc-adpcm-ms-encinfo => wav-enc-adpcm_ms-encinfo} (100%) diff --git a/tests/fate/wav.mak b/tests/fate/wav.mak index 81d9ef93fa..9ec794d379 100644 --- a/tests/fate/wav.mak +++ b/tests/fate/wav.mak @@ -1,10 +1,7 @@ -FATE_WAV_ENCINFO-$(CONFIG_ADPCM_MS_ENCODER) += fate-wav-enc-adpcm-ms-encinfo -fate-wav-enc-adpcm-ms-encinfo: tests/api/api-enc-info-test$(EXESUF) -fate-wav-enc-adpcm-ms-encinfo: CMD = run tests/api/api-enc-info-test$(EXESUF) adpcm_ms - -FATE_WAV_ENCINFO-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += fate-wav-enc-adpcm-ima-wav-encinfo -fate-wav-enc-adpcm-ima-wav-encinfo: tests/api/api-enc-info-test$(EXESUF) -fate-wav-enc-adpcm-ima-wav-encinfo: CMD = run tests/api/api-enc-info-test$(EXESUF) adpcm_ima_wav +FATE_WAV_ENCINFO-$(CONFIG_ADPCM_MS_ENCODER) += fate-wav-enc-adpcm_ms-encinfo +FATE_WAV_ENCINFO-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += fate-wav-enc-adpcm_ima_wav-encinfo +fate-wav-enc-%-encinfo: tests/api/api-enc-info-test$(EXESUF) +fate-wav-enc-%-encinfo: CMD = run tests/api/api-enc-info-test$(EXESUF) $(@:fate-wav-enc-%-encinfo=%) FATE_WAV_BITRATE-$(call ALLYES, ADPCM_MS_ENCODER PCM_S16LE_DECODER WAV_MUXER WAV_DEMUXER FILE_PROTOCOL) += fate-wav-enc-adpcm-ms-bitrate fate-wav-enc-adpcm-ms-bitrate: tests/data/asynth-44100-2.wav diff --git a/tests/ref/fate/wav-enc-adpcm-ima-wav-encinfo b/tests/ref/fate/wav-enc-adpcm_ima_wav-encinfo similarity index 100% rename from tests/ref/fate/wav-enc-adpcm-ima-wav-encinfo rename to tests/ref/fate/wav-enc-adpcm_ima_wav-encinfo diff --git a/tests/ref/fate/wav-enc-adpcm-ms-encinfo b/tests/ref/fate/wav-enc-adpcm_ms-encinfo similarity index 100% rename from tests/ref/fate/wav-enc-adpcm-ms-encinfo rename to tests/ref/fate/wav-enc-adpcm_ms-encinfo -- 2.52.0 >From 06c9b31e1fb2c8cdf20c631f4def5f4e8d83ec37 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Mon, 17 Aug 2026 14:20:16 +0200 Subject: [PATCH 3/3] tests/api/Makefile: Don't undef main Should be unnecessary since fde3bb16f90ac456709c7305b9e230e8327d8625. Signed-off-by: Andreas Rheinhardt <[email protected]> --- tests/api/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/api/Makefile b/tests/api/Makefile index e04790ce2f..7513c5bc9e 100644 --- a/tests/api/Makefile +++ b/tests/api/Makefile @@ -14,7 +14,6 @@ APITESTPROGS := $(APITESTPROGS:%=$(APITESTSDIR)/%-test$(EXESUF)) $(APITESTOBJS): | $(sort $(dir $(APITESTOBJS))) $(APITESTOBJS) $(APITESTOBJS:.o=.i): CPPFLAGS += -DTEST -$(APITESTOBJS) $(APITESTOBJS:.o=.i): CFLAGS += -Umain $(APITESTPROGS): %$(EXESUF): %.o $(FF_DEP_LIBS) $(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter %.o,$^) $(FF_EXTRALIBS) $(ELIBS)) -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]