[FFmpeg-devel] fate: add aresample check to tests that needs it

Submitted by Paul B Mahol on May 1, 2018, 9:54 p.m.

Details

Message ID 20180501215440.24704-1-onemda@gmail.com
State New
Headers show

Commit Message

Paul B Mahol May 1, 2018, 9:54 p.m.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---

For single FATE box and for now single test.

---
 tests/Makefile          | 4 ++++
 tests/fate/avformat.mak | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

James Almer May 1, 2018, 10:34 p.m.
On 5/1/2018 6:54 PM, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
> 
> For single FATE box and for now single test.
> 
> ---
>  tests/Makefile          | 4 ++++
>  tests/fate/avformat.mak | 2 +-
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 6074ac748e..9286e079df 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -72,6 +72,10 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
>                           $(firstword $(2))_ENCODER $(lastword $(2))_DECODER  \
>                           $(firstword $(3))_MUXER   $(lastword $(3))_DEMUXER)
>  
> +ENCDECF = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
> +                         $(firstword $(2))_MUXER   $(lastword $(2))_DEMUXER  \
> +                         $(firstword $(3))_FILTER)

Call it FILTERENCDEC, so it's consistent with the other similar macros.

> +
>  DEMDEC  = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
>  ENCMUX  = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER)
>  
> diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
> index a12f9ccc71..5326b6236a 100644
> --- a/tests/fate/avformat.mak
> +++ b/tests/fate/avformat.mak
> @@ -42,7 +42,7 @@ FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
>  FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
>  FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
>  FATE_LAVF-$(call ENCMUX,  MJPEG PCM_S16LE,       SMJPEG)             += smjpeg
> -FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox
> +FATE_LAVF-$(call ENCDECF, PCM_S16LE,             SOX, ARESAMPLE)     += sox
>  FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sunrast
>  FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
>  FATE_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)             += tga
>

Patch hide | download patch | download mbox

diff --git a/tests/Makefile b/tests/Makefile
index 6074ac748e..9286e079df 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,6 +72,10 @@  ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
                          $(firstword $(2))_ENCODER $(lastword $(2))_DECODER  \
                          $(firstword $(3))_MUXER   $(lastword $(3))_DEMUXER)
 
+ENCDECF = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
+                         $(firstword $(2))_MUXER   $(lastword $(2))_DEMUXER  \
+                         $(firstword $(3))_FILTER)
+
 DEMDEC  = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
 ENCMUX  = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER)
 
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index a12f9ccc71..5326b6236a 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -42,7 +42,7 @@  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
 FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
 FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
 FATE_LAVF-$(call ENCMUX,  MJPEG PCM_S16LE,       SMJPEG)             += smjpeg
-FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox
+FATE_LAVF-$(call ENCDECF, PCM_S16LE,             SOX, ARESAMPLE)     += sox
 FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sunrast
 FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
 FATE_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)             += tga