Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 12:13:51 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 12:13:51 +0000 (14:13 +0200)
* qatar/master:
  build: sanitize linking of tools and test programs
  fate: Refactor setting of environment variables for groups of tests

Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
library.mak
tests/fate/ac3.mak
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak

diff --cc library.mak
Simple merge
@@@ -58,23 -49,22 +49,22 @@@ fate-ac3-encode: CMD = enc_dec_pcm ac3 
  fate-ac3-encode: CMP_SHIFT = -1024
  fate-ac3-encode: CMP_TARGET = 399.62
  fate-ac3-encode: SIZE_TOLERANCE = 488
 -fate-ac3-encode: FUZZ = 3
 +fate-ac3-encode: FUZZ = 4
  
- FATE_AC3 += fate-eac3-encode
+ FATE_AC3_ENCODE += fate-eac3-encode
  fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k
- fate-eac3-encode: CMP = stddev
- fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
  fate-eac3-encode: CMP_SHIFT = -1024
  fate-eac3-encode: CMP_TARGET = 514.02
  fate-eac3-encode: SIZE_TOLERANCE = 488
  fate-eac3-encode: FUZZ = 3
  
- FATE_AC3 += fate-ac3-fixed-encode
+ fate-ac3-encode fate-eac3-encode: CMP = stddev
+ fate-ac3-encode fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+ FATE_AC3_ENCODE += fate-ac3-fixed-encode
  fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav
  fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
 -fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3 -flags bitexact
 +fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3 -flags +bitexact
  fate-ac3-fixed-encode: CMP = oneline
  fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1
  
@@@ -9,17 -8,18 +8,18 @@@ fate-binkaudio-rdft: CMD = pcm -i $(SAM
  fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm
  fate-binkaudio-rdft: FUZZ = 2
  
 -FATE_SAMPLES_AVCONV += $(FATE_BINKAUDIO)
+ $(FATE_BINKAUDIO): CMP = oneoff
 +FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO)
  fate-binkaudio: $(FATE_BINKAUDIO)
  
 -FATE_SAMPLES_AVCONV += fate-bmv-audio
 +FATE_SAMPLES_AUDIO += fate-bmv-audio
  fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn
  
 -FATE_SAMPLES_AVCONV += fate-delphine-cin-audio
 +FATE_SAMPLES_AUDIO += fate-delphine-cin-audio
  fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
  
 -FATE_SAMPLES_AVCONV += fate-dts
 +FATE_SAMPLES_AUDIO += fate-dts
  fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
  fate-dts: CMP = oneoff
  fate-dts: REF = $(SAMPLES)/dts/dts.pcm
@@@ -38,11 -35,9 +35,12 @@@ fate-sipr-8k5: REF = $(SAMPLES)/sipr/si
  
  FATE_SIPR += fate-sipr-16k
  fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm
- fate-sipr-16k: CMP = oneoff
  fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm
  
 -FATE_SAMPLES_AVCONV += $(FATE_SIPR)
+ $(FATE_SIPR): CMP = oneoff
 +FATE_REAL += $(FATE_SIPR)
  fate-sipr: $(FATE_SIPR)
 +
 +FATE_SAMPLES_FFMPEG += $(FATE_REAL)
 +fate-real: $(FATE_REAL)
@@@ -50,13 -46,12 +46,12 @@@ FATE_G726 += fate-g726-encode-4bi
  fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k
  
  FATE_G726 += fate-g726-encode-5bit
- fate-g726-encode-5bit: tests/data/asynth-8000-1.wav
- fate-g726-encode-5bit: SRC = tests/data/asynth-8000-1.wav
  fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
  
 -FATE_SAMPLES_AVCONV += $(FATE_G726)
+ $(FATE_G726): tests/data/asynth-8000-1.wav
+ $(FATE_G726): SRC = tests/data/asynth-8000-1.wav
 +FATE_VOICE += $(FATE_G726)
  fate-g726: $(FATE_G726)
  
  FATE_GSM += fate-gsm-ms