From b182d5c4f31f6ba54fdd95bc624d363bcc389927 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 12 Apr 2022 17:28:38 +0200 Subject: [PATCH] fate/amr[nw]b: Use REMUX where appropriate Signed-off-by: Andreas Rheinhardt --- 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