diff mbox series

[FFmpeg-devel,4/4] fate/oma: Use REMUX where appropriate

Message ID AS8PR01MB7944424B7C1B86B54CC856748FED9@AS8PR01MB7944.eurprd01.prod.exchangelabs.com
State Accepted
Commit fe2eb9760f3d1552298d8d12c7045eb327e70220
Headers show
Series [FFmpeg-devel,1/4] tests/Makefile: Add auxiliary functions for transcode and stream_remux | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Andreas Rheinhardt April 12, 2022, 1:52 a.m. UTC 
Simplifies the checks.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/oma.mak | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Martin Storsjö April 13, 2022, 8:19 a.m. UTC | #1 
On Tue, 12 Apr 2022, Andreas Rheinhardt wrote:

> Simplifies the checks.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> tests/fate/oma.mak | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak
> index a088feff21..7e2020b7d0 100644
> --- a/tests/fate/oma.mak
> +++ b/tests/fate/oma.mak
> @@ -8,14 +8,8 @@ fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sampl
> FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux
> fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1"
>
> -FATE_OMA_FFMPEG-$(call ALLYES, FILE_PROTOCOL OMA_MUXER    \
> -                               OMA_DEMUXER FRAMECRC_MUXER \
> -                               PIPE_PROTOCOL)             \
> -                               += $(FATE_OMA_REMUX-yes)
> -FATE_OMA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OMA_MUXER    \
> -                                       OMA_DEMUXER FRAMECRC_MUXER \
> -                                       PIPE_PROTOCOL)             \
> -                                       += $(FATE_OMA_REMUX_FFPROBE-yes)
> +FATE_OMA_FFMPEG-$(call REMUX, OMA) += $(FATE_OMA_REMUX-yes)
> +FATE_OMA_FFMPEG_FFPROBE-$(call REMUX, OMA) += $(FATE_OMA_REMUX_FFPROBE-yes)
> FATE_SAMPLES_FFMPEG         += $(FATE_OMA_FFMPEG-yes)
> FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes)
> fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes)
> -- 
> 2.32.0

LGTM

// Martin
diff mbox series

Patch

diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak
index a088feff21..7e2020b7d0 100644
--- a/tests/fate/oma.mak
+++ b/tests/fate/oma.mak
@@ -8,14 +8,8 @@  fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sampl
 FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux
 fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1"
 
-FATE_OMA_FFMPEG-$(call ALLYES, FILE_PROTOCOL OMA_MUXER    \
-                               OMA_DEMUXER FRAMECRC_MUXER \
-                               PIPE_PROTOCOL)             \
-                               += $(FATE_OMA_REMUX-yes)
-FATE_OMA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OMA_MUXER    \
-                                       OMA_DEMUXER FRAMECRC_MUXER \
-                                       PIPE_PROTOCOL)             \
-                                       += $(FATE_OMA_REMUX_FFPROBE-yes)
+FATE_OMA_FFMPEG-$(call REMUX, OMA) += $(FATE_OMA_REMUX-yes)
+FATE_OMA_FFMPEG_FFPROBE-$(call REMUX, OMA) += $(FATE_OMA_REMUX_FFPROBE-yes)
 FATE_SAMPLES_FFMPEG         += $(FATE_OMA_FFMPEG-yes)
 FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes)
 fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes)