[5/5] fate: voice: Add dependencies

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

Commit Message

Diego Biurrun Nov. 28, 2012, 7:04 p.m.
---
 tests/fate/voice.mak |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

Comments

Janne Grunau Dec. 6, 2012, 5:24 p.m. | #1
On 2012-11-28 20:04:12 +0100, Diego Biurrun wrote:
> ---
>  tests/fate/voice.mak |   32 ++++++++++++++++++--------------
>  1 files changed, 18 insertions(+), 14 deletions(-)
> 
> diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
> index 8fe445a..e6569a3 100644
> --- a/tests/fate/voice.mak
> +++ b/tests/fate/voice.mak
> @@ -1,13 +1,13 @@
> -FATE_G722 += fate-g722dec-1
> +FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1
>  fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
>  
> -FATE_G722 += fate-g722-encode
> +FATE_G722-$(call ENCDEC, ADPCM_G722, WAV) += fate-g722-encode
>  fate-g722-encode: tests/data/asynth-16000-1.wav
>  fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
>  fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722

probably missing dependency on s16le decoder

> -FATE_SAMPLES_AVCONV += $(FATE_G722)
> -fate-g722: $(FATE_G722)
> +FATE_SAMPLES_AVCONV += $(FATE_G722-yes)
> +fate-g722: $(FATE_G722-yes)
>  
>  FATE_G723_1 += fate-g723_1-dec-1
>  fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/ineqd53.tco
> @@ -33,8 +33,10 @@ fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63b.tco
>  FATE_G723_1 += fate-g723_1-dec-8
>  fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63e.tco
>  
> -FATE_SAMPLES_AVCONV += $(FATE_G723_1)
> -fate-g723_1: $(FATE_G723_1)
> +FATE_G723_1-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1)
> +
> +FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes)
> +fate-g723_1: $(FATE_G723_1-yes)
>  
>  FATE_G726 += fate-g726-encode-2bit
>  fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k
> @@ -51,24 +53,26 @@ fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
>  $(FATE_G726): tests/data/asynth-8000-1.wav
>  $(FATE_G726): SRC = tests/data/asynth-8000-1.wav
>  
> -FATE_SAMPLES_AVCONV += $(FATE_G726)
> -fate-g726: $(FATE_G726)
> +FATE_G726-$(call ENCDEC, ADPCM_G726, WAV) += $(FATE_G726)

this too, also is md5 protocol generally available?

Janne
Mans Rullgard Dec. 6, 2012, 5:41 p.m. | #2
Janne Grunau <janne-libav@jannau.net> writes:

> On 2012-11-28 20:04:12 +0100, Diego Biurrun wrote:
>> ---
>>  tests/fate/voice.mak |   32 ++++++++++++++++++--------------
>>  1 files changed, 18 insertions(+), 14 deletions(-)
>> 
>> diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
>> index 8fe445a..e6569a3 100644
>> --- a/tests/fate/voice.mak
>> +++ b/tests/fate/voice.mak
>> @@ -1,13 +1,13 @@
>> -FATE_G722 += fate-g722dec-1
>> +FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1
>>  fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
>>  
>> -FATE_G722 += fate-g722-encode
>> +FATE_G722-$(call ENCDEC, ADPCM_G722, WAV) += fate-g722-encode
>>  fate-g722-encode: tests/data/asynth-16000-1.wav
>>  fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
>>  fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722
>
> probably missing dependency on s16le decoder

s16le is required for _all_ audio tests.  Listing it explicitly only
makes things harder to read.

Patch

diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 8fe445a..e6569a3 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -1,13 +1,13 @@ 
-FATE_G722 += fate-g722dec-1
+FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1
 fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
 
-FATE_G722 += fate-g722-encode
+FATE_G722-$(call ENCDEC, ADPCM_G722, WAV) += fate-g722-encode
 fate-g722-encode: tests/data/asynth-16000-1.wav
 fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
 fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722
 
-FATE_SAMPLES_AVCONV += $(FATE_G722)
-fate-g722: $(FATE_G722)
+FATE_SAMPLES_AVCONV += $(FATE_G722-yes)
+fate-g722: $(FATE_G722-yes)
 
 FATE_G723_1 += fate-g723_1-dec-1
 fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/ineqd53.tco
@@ -33,8 +33,10 @@  fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63b.tco
 FATE_G723_1 += fate-g723_1-dec-8
 fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63e.tco
 
-FATE_SAMPLES_AVCONV += $(FATE_G723_1)
-fate-g723_1: $(FATE_G723_1)
+FATE_G723_1-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1)
+
+FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes)
+fate-g723_1: $(FATE_G723_1-yes)
 
 FATE_G726 += fate-g726-encode-2bit
 fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k
@@ -51,24 +53,26 @@  fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
 $(FATE_G726): tests/data/asynth-8000-1.wav
 $(FATE_G726): SRC = tests/data/asynth-8000-1.wav
 
-FATE_SAMPLES_AVCONV += $(FATE_G726)
-fate-g726: $(FATE_G726)
+FATE_G726-$(call ENCDEC, ADPCM_G726, WAV) += $(FATE_G726)
+
+FATE_SAMPLES_AVCONV += $(FATE_G726-yes)
+fate-g726: $(FATE_G726-yes)
 
-FATE_GSM += fate-gsm-ms
+FATE_GSM-$(call DEMDEC, WAV, GSM_MS) += fate-gsm-ms
 fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
 
-FATE_GSM += fate-gsm-toast
+FATE_GSM-$(call DEMDEC, MOV, GSM) += fate-gsm-toast
 fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
 
-FATE_SAMPLES_AVCONV += $(FATE_GSM)
-fate-gsm: $(FATE_GSM)
+FATE_SAMPLES_AVCONV += $(FATE_GSM-yes)
+fate-gsm: $(FATE_GSM-yes)
 
-FATE_SAMPLES_AVCONV += fate-qcelp
+FATE_SAMPLES_AVCONV-$(call DEMDEC, QCP, QCELP) += fate-qcelp
 fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP
 fate-qcelp: CMP = oneoff
 fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm
 
-FATE_SAMPLES_AVCONV += fate-truespeech
+FATE_SAMPLES_AVCONV-$(call DEMDEC, WAV, TRUESPEECH) += fate-truespeech
 fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav
 fate-truespeech: CMP = oneoff
 fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm