Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 21:38:30 +0000 (23:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 21:43:02 +0000 (23:43 +0200)
* qatar/master:
  fate: add tests for SANM and VIMA

Conflicts:
tests/fate/video.mak
tests/ref/fate/sanm

See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/adpcm.mak
tests/fate/audio.mak

Simple merge
@@@ -34,31 -34,14 +34,28 @@@ fate-nellymoser: CMD = pcm -i $(TARGET_
  fate-nellymoser: CMP = oneoff
  fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
 +FATE_SAMPLES_AUDIO-$(call ENCMUX, NELLYMOSER, FLV) += fate-nellymoser-aref-encode
 +fate-nellymoser-aref-encode: $(AREF) ./tests/data/asynth-16000-1.wav
 +fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser
 +fate-nellymoser-aref-encode: CMP = stddev
 +fate-nellymoser-aref-encode: REF = ./tests/data/asynth-16000-1.wav
 +fate-nellymoser-aref-encode: CMP_SHIFT = -244
 +fate-nellymoser-aref-encode: CMP_TARGET = 9612
 +fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
 +
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
  fate-paf-audio: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, VMD, VMDAUDIO) += fate-sierra-vmd-audio
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, VMD, VMDAUDIO) += fate-sierra-vmd-audio
  fate-sierra-vmd-audio: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio
  fate-smacker-audio: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -vn
  
- FATE_SAMPLES_AUDIO-$(call DEMDEC, SMUSH, VIMA) += fate-vima
- fate-vima: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -vn
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd
  fate-ws_snd: CMD = md5 -i $(TARGET_SAMPLES)/vqa/ws_snd.vqa -f s16le
 +
 +FATE_SAMPLES_AUDIO += $(FATE_SAMPLES_AUDIO-yes)
 +
 +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_AUDIO)
 +fate-audio: $(FATE_SAMPLES_AUDIO)