diff mbox series

[FFmpeg-devel] fate/demux, gapless, image: Add missing ffprobe dependencies

Message ID AM7PR03MB66600F5C858CBBED0F31C4EA8FDF9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit d69332e68856323858aca244990e95266077e81f
Headers show
Series [FFmpeg-devel] fate/demux, gapless, image: Add missing ffprobe dependencies
Related show

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 19, 2021, 1:49 a.m. UTC
And remove the unnecessary ffmpeg dependencies while at it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/demux.mak   | 14 ++++++++------
 tests/fate/gapless.mak |  6 +++---
 tests/fate/image.mak   |  8 +++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

Comments

Soft Works Sept. 19, 2021, 2:15 a.m. UTC | #1
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Andreas
> Rheinhardt
> Sent: Sunday, 19 September 2021 03:49
> To: ffmpeg-devel@ffmpeg.org
> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Subject: [FFmpeg-devel] [PATCH] fate/demux, gapless, image: Add missing
> ffprobe dependencies
> 
> And remove the unnecessary ffmpeg dependencies while at it.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  tests/fate/demux.mak   | 14 ++++++++------
>  tests/fate/gapless.mak |  6 +++---
>  tests/fate/image.mak   |  8 +++++---
>  3 files changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
> index ab49be94cd..6ddbbcbd4d 100644
> --- a/tests/fate/demux.mak
> +++ b/tests/fate/demux.mak
> @@ -48,7 +48,7 @@ FATE_SAMPLES_DEMUX-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER
> GIF_DECODER FITS_ENCO
>  fate-fits-demux: tests/data/fits-multi.fits
>  fate-fits-demux: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits
> -c:v copy
> 
> -FATE_SAMPLES_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux
> +FATE_FFPROBE_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux
>  fate-flv-demux: CMD = ffprobe_demux
> $(TARGET_SAMPLES)/flv/Enigma_Principles_of_Lust-part.flv
> 
>  FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux
> @@ -79,10 +79,10 @@ fate-mlv-demux: CMD = crc -i $(TARGET_SAMPLES)/mlv/M19-
> 0333-cut.MLV -c copy
>  FATE_SAMPLES_DEMUX-$(CONFIG_MOV_DEMUXER) += fate-mov-mp3-demux
>  fate-mov-mp3-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/mpegaudio/packed_maindata.mp3.mp4 -c copy
> 
> -FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux
> +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux
>  fate-ts-opus-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/opus/test-8-
> 7.1.opus-small.ts
> 
> -FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux
> +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux
>  fate-ts-small-demux: CMD = ffprobe_demux
> $(TARGET_SAMPLES)/mpegts/h264small.ts
> 
>  FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv
> @@ -100,7 +100,7 @@ fate-nistsphere-demux: CMD = crc -i
> $(TARGET_SAMPLES)/nistsphere/nist-ulaw.nist
>  FATE_SAMPLES_DEMUX-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux
>  fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-
> 51kbps.nsv -t 6 -c:v copy -c:a copy
> 
> -FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux
> +FATE_FFPROBE_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux
>  fate-oggopus-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ogg/intro-
> partial.opus
> 
>  FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggvp8-demux
> @@ -157,9 +157,11 @@ fate-xmv-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/xmv/logos1p.fmv -c:v copy -c
>  FATE_SAMPLES_DEMUX-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
>  fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy
> 
> -FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
> +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
>  fate-ts-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ac3/mp3ac325-4864-
> small.ts
> 
>  FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes)
>  FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX)
> -fate-demux: $(FATE_SAMPLES_DEMUX)
> +FATE_FFPROBE_DEMUX   += $(FATE_FFPROBE_DEMUX-yes)
> +FATE_SAMPLES_FFPROBE += $(FATE_FFPROBE_DEMUX)
> +fate-demux: $(FATE_SAMPLES_DEMUX) $(FATE_FFPROBE_DEMUX)
> diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak
> index b035e18d03..68a396e187 100644
> --- a/tests/fate/gapless.mak
> +++ b/tests/fate/gapless.mak
> @@ -1,7 +1,7 @@
>  FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3
>  fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-c:a
> mp3"
> 
> -FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3-side-data
> +FATE_GAPLESSINFO_PROBE-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3-side-data
>  fate-gapless-mp3-side-data: CMD = ffprobe_demux
> $(TARGET_SAMPLES)/gapless/gapless.mp3
> 
>  FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-audiomatch-square-mp3
> @@ -122,7 +122,7 @@ FATE_GAPLESSENC-$(CONFIG_FFPROBE) =
> $(FATE_GAPLESSENC_PROBE-yes)
>  FATE_GAPLESSENC = $(FATE_GAPLESSENC-yes)
> 
>  FATE_SAMPLES_AVCONV += $(FATE_GAPLESS)
> -FATE_SAMPLES_AVCONV += $(FATE_GAPLESSINFO)
> -FATE_SAMPLES_AVCONV += $(FATE_GAPLESSENC)
> +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_GAPLESSENC)
> +FATE_SAMPLES_FFPROBE += $(FATE_GAPLESSINFO)
> 
>  fate-gapless: $(FATE_GAPLESS) $(FATE_GAPLESSINFO) $(FATE_GAPLESSENC)
> diff --git a/tests/fate/image.mak b/tests/fate/image.mak
> index 3b58972a53..e99fa0e1ce 100644
> --- a/tests/fate/image.mak
> +++ b/tests/fate/image.mak
> @@ -374,17 +374,19 @@ $(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call
> FATE_IMGSUITE_PNG,$(CLSP))))
>  FATE_PNG += fate-png-int-rgb24
>  fate-png-int-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-
> int_rgb24.png -sws_flags +accurate_rnd+bitexact
> 
> -FATE_PNG += fate-png-frame-metadata
> +FATE_PNG_PROBE += fate-png-frame-metadata
>  fate-png-frame-metadata: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries
> frame_tags \
>      -i $(TARGET_SAMPLES)/filter/pixelart0.png
> 
> -FATE_PNG += fate-png-side-data
> +FATE_PNG_PROBE += fate-png-side-data
>  fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \
>      -i $(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-png: $(FATE_PNG-yes)
> +FATE_IMAGE_PROBE += $(FATE_PNG_PROBE-yes)
> +fate-png: $(FATE_PNG-yes) $(FATE_PNG_PROBE-yes)
> 
>  FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
>  fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt
> rgb24 -vf scale
> --


LGTM.

I can confirm that this resolves the issue I was seeing when 
running fate with -j8

Thank you!

sw
diff mbox series

Patch

diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index ab49be94cd..6ddbbcbd4d 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -48,7 +48,7 @@  FATE_SAMPLES_DEMUX-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_ENCO
 fate-fits-demux: tests/data/fits-multi.fits
 fate-fits-demux: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -c:v copy
 
-FATE_SAMPLES_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux
+FATE_FFPROBE_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux
 fate-flv-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/flv/Enigma_Principles_of_Lust-part.flv
 
 FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux
@@ -79,10 +79,10 @@  fate-mlv-demux: CMD = crc -i $(TARGET_SAMPLES)/mlv/M19-0333-cut.MLV -c copy
 FATE_SAMPLES_DEMUX-$(CONFIG_MOV_DEMUXER) += fate-mov-mp3-demux
 fate-mov-mp3-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mpegaudio/packed_maindata.mp3.mp4 -c copy
 
-FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux
+FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux
 fate-ts-opus-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/opus/test-8-7.1.opus-small.ts
 
-FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux
+FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux
 fate-ts-small-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/mpegts/h264small.ts
 
 FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv
@@ -100,7 +100,7 @@  fate-nistsphere-demux: CMD = crc -i $(TARGET_SAMPLES)/nistsphere/nist-ulaw.nist
 FATE_SAMPLES_DEMUX-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux
 fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -c:v copy -c:a copy
 
-FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux
+FATE_FFPROBE_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux
 fate-oggopus-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ogg/intro-partial.opus
 
 FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggvp8-demux
@@ -157,9 +157,11 @@  fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -c:v copy -c
 FATE_SAMPLES_DEMUX-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
 fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy
 
-FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
+FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
 fate-ts-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ac3/mp3ac325-4864-small.ts
 
 FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes)
 FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX)
-fate-demux: $(FATE_SAMPLES_DEMUX)
+FATE_FFPROBE_DEMUX   += $(FATE_FFPROBE_DEMUX-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_FFPROBE_DEMUX)
+fate-demux: $(FATE_SAMPLES_DEMUX) $(FATE_FFPROBE_DEMUX)
diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak
index b035e18d03..68a396e187 100644
--- a/tests/fate/gapless.mak
+++ b/tests/fate/gapless.mak
@@ -1,7 +1,7 @@ 
 FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3
 fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-c:a mp3"
 
-FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3-side-data
+FATE_GAPLESSINFO_PROBE-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3-side-data
 fate-gapless-mp3-side-data: CMD = ffprobe_demux $(TARGET_SAMPLES)/gapless/gapless.mp3
 
 FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-audiomatch-square-mp3
@@ -122,7 +122,7 @@  FATE_GAPLESSENC-$(CONFIG_FFPROBE) = $(FATE_GAPLESSENC_PROBE-yes)
 FATE_GAPLESSENC = $(FATE_GAPLESSENC-yes)
 
 FATE_SAMPLES_AVCONV += $(FATE_GAPLESS)
-FATE_SAMPLES_AVCONV += $(FATE_GAPLESSINFO)
-FATE_SAMPLES_AVCONV += $(FATE_GAPLESSENC)
+FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_GAPLESSENC)
+FATE_SAMPLES_FFPROBE += $(FATE_GAPLESSINFO)
 
 fate-gapless: $(FATE_GAPLESS) $(FATE_GAPLESSINFO) $(FATE_GAPLESSENC)
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 3b58972a53..e99fa0e1ce 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -374,17 +374,19 @@  $(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP))))
 FATE_PNG += fate-png-int-rgb24
 fate-png-int-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png -sws_flags +accurate_rnd+bitexact
 
-FATE_PNG += fate-png-frame-metadata
+FATE_PNG_PROBE += fate-png-frame-metadata
 fate-png-frame-metadata: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries frame_tags \
     -i $(TARGET_SAMPLES)/filter/pixelart0.png
 
-FATE_PNG += fate-png-side-data
+FATE_PNG_PROBE += fate-png-side-data
 fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \
     -i $(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-png: $(FATE_PNG-yes)
+FATE_IMAGE_PROBE += $(FATE_PNG_PROBE-yes)
+fate-png: $(FATE_PNG-yes) $(FATE_PNG_PROBE-yes)
 
 FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -vf scale