[4/5] fate: pcm: Add dependencies

Message ID 1354129452-19235-4-git-send-email-diego@biurrun.de
State New
Headers show

Commit Message

Diego Biurrun Nov. 28, 2012, 7:04 p.m.
---
 tests/fate/pcm.mak |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

Comments

Janne Grunau Dec. 6, 2012, 5:10 p.m. | #1
On 2012-11-28 20:04:11 +0100, Diego Biurrun wrote:
> ---
>  tests/fate/pcm.mak |   27 +++++++++++++++------------
>  1 files changed, 15 insertions(+), 12 deletions(-)
> 
> diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
> index c84de9e..ca586e2 100644
> --- a/tests/fate/pcm.mak
> +++ b/tests/fate/pcm.mak
> @@ -1,32 +1,35 @@
> -FATE_SAMPLES_PCM += fate-iff-pcm
> +FATE_SAMPLES_PCM-$(call DEMDEC, WAV, PCM_U8) += fate-iff-pcm
>  fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le

This probably depends on avresample. Is that generally available for
FATE_SAMPLES_AVCONV tests?

> -FATE_SAMPLES_PCM += fate-pcm_dvd
> +FATE_SAMPLES_PCM-$(call DEMDEC, MPEGPS, PCM_DVD) += fate-pcm_dvd
>  fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
>  
> -FATE_SAMPLES_PCM += fate-pcm-planar
> +FATE_SAMPLES_PCM-$(call DEMDEC, EA, PCM_S16LE_PLANAR) += fate-pcm-planar
>  fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn
>  
> -FATE_SAMPLES_PCM += fate-pcm_s16be-stereo
> +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16BE) += fate-pcm_s16be-stereo
>  fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
>  
> -FATE_SAMPLES_PCM += fate-pcm_s16le-stereo
> +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16LE) += fate-pcm_s16le-stereo
>  fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
>  
> -FATE_SAMPLES_PCM += fate-pcm_u8-mono
> +FATE_PCM_U8 += fate-pcm_u8-mono
>  fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
>  
> -FATE_SAMPLES_PCM += fate-pcm_u8-stereo
> +FATE_PCM_U8 += fate-pcm_u8-stereo
>  fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
>  
> -FATE_SAMPLES_PCM += fate-w64
> +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += $(FATE_PCM_U8)
> +

stray change? there is no FATE_PCM_U8 in the current tree and I don't
see it added in this patch

> +FATE_SAMPLES_PCM-$(call DEMDEC, W64, PCM_S16LE) += fate-w64
>  fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
>  
> -FATE_PCM += fate-dcinema-encode
> +FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes)
> +
> +FATE_PCM-$(call ENCDEC, PCM_S24DAUD, WAV) += fate-dcinema-encode
>  fate-dcinema-encode: tests/data/asynth-96000-6.wav
>  fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav
>  fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud

this doesn't depend on the s16le decoder?


Janne
Diego Biurrun Dec. 30, 2012, 2:04 p.m. | #2
On Thu, Dec 06, 2012 at 06:10:12PM +0100, Janne Grunau wrote:
> On 2012-11-28 20:04:11 +0100, Diego Biurrun wrote:
> > --- a/tests/fate/pcm.mak
> > +++ b/tests/fate/pcm.mak
> > @@ -1,32 +1,35 @@
> > -FATE_SAMPLES_PCM += fate-iff-pcm
> > +FATE_SAMPLES_PCM-$(call DEMDEC, WAV, PCM_U8) += fate-iff-pcm
> >  fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
> 
> This probably depends on avresample. Is that generally available for
> FATE_SAMPLES_AVCONV tests?

avconv now depends on it, so yes.

> > -FATE_SAMPLES_PCM += fate-pcm_dvd
> > +FATE_SAMPLES_PCM-$(call DEMDEC, MPEGPS, PCM_DVD) += fate-pcm_dvd
> >  fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
> >  
> > -FATE_SAMPLES_PCM += fate-pcm-planar
> > +FATE_SAMPLES_PCM-$(call DEMDEC, EA, PCM_S16LE_PLANAR) += fate-pcm-planar
> >  fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn
> >  
> > -FATE_SAMPLES_PCM += fate-pcm_s16be-stereo
> > +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16BE) += fate-pcm_s16be-stereo
> >  fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
> >  
> > -FATE_SAMPLES_PCM += fate-pcm_s16le-stereo
> > +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16LE) += fate-pcm_s16le-stereo
> >  fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
> >  
> > -FATE_SAMPLES_PCM += fate-pcm_u8-mono
> > +FATE_PCM_U8 += fate-pcm_u8-mono
> >  fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
> >  
> > -FATE_SAMPLES_PCM += fate-pcm_u8-stereo
> > +FATE_PCM_U8 += fate-pcm_u8-stereo
> >  fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
> >  
> > -FATE_SAMPLES_PCM += fate-w64
> > +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += $(FATE_PCM_U8)
> 
> stray change? there is no FATE_PCM_U8 in the current tree and I don't
> see it added in this patch

Look up two lines :)

> > +FATE_SAMPLES_PCM-$(call DEMDEC, W64, PCM_S16LE) += fate-w64
> >  fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
> >  
> > -FATE_PCM += fate-dcinema-encode
> > +FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes)
> > +
> > +FATE_PCM-$(call ENCDEC, PCM_S24DAUD, WAV) += fate-dcinema-encode
> >  fate-dcinema-encode: tests/data/asynth-96000-6.wav
> >  fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav
> >  fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud
> 
> this doesn't depend on the s16le decoder?

Basically everything does.  I have added that dependency locally.  It's
not yet clear what the best way to handle it would be.

Diego

Patch

diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index c84de9e..ca586e2 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -1,32 +1,35 @@ 
-FATE_SAMPLES_PCM += fate-iff-pcm
+FATE_SAMPLES_PCM-$(call DEMDEC, WAV, PCM_U8) += fate-iff-pcm
 fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_dvd
+FATE_SAMPLES_PCM-$(call DEMDEC, MPEGPS, PCM_DVD) += fate-pcm_dvd
 fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
 
-FATE_SAMPLES_PCM += fate-pcm-planar
+FATE_SAMPLES_PCM-$(call DEMDEC, EA, PCM_S16LE_PLANAR) += fate-pcm-planar
 fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn
 
-FATE_SAMPLES_PCM += fate-pcm_s16be-stereo
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16BE) += fate-pcm_s16be-stereo
 fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_s16le-stereo
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16LE) += fate-pcm_s16le-stereo
 fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_u8-mono
+FATE_PCM_U8 += fate-pcm_u8-mono
 fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_u8-stereo
+FATE_PCM_U8 += fate-pcm_u8-stereo
 fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-w64
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += $(FATE_PCM_U8)
+
+FATE_SAMPLES_PCM-$(call DEMDEC, W64, PCM_S16LE) += fate-w64
 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
 
-FATE_PCM += fate-dcinema-encode
+FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes)
+
+FATE_PCM-$(call ENCDEC, PCM_S24DAUD, WAV) += fate-dcinema-encode
 fate-dcinema-encode: tests/data/asynth-96000-6.wav
 fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav
 fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud
 
-FATE_AVCONV += $(FATE_PCM)
-FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM)
-fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM)
+FATE_AVCONV += $(FATE_PCM-yes)
+fate-pcm: $(FATE_PCM-yes) $(FATE_SAMPLES_PCM-yes)