Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'

* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
	tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --combined tests/fate/audio.mak
index b7e5362eaff0d3477f90edaed3a78f18238c193f,397b4ecb4b4ec10baefba5bbd4a2ee97e39bf142..da6f0bb55f8dd1d3b3a002749f01bd66e7d07496
--- 1/tests/fate/audio.mak
--- 2/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@@ -10,60 -10,45 +10,64 @@@ fate-binkaudio-rdft: FUZZ = 
  
  $(FATE_BINKAUDIO-yes): CMP = oneoff
  
 -FATE_SAMPLES_AVCONV += $(FATE_BINKAUDIO-yes)
 +FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO-yes)
  fate-binkaudio: $(FATE_BINKAUDIO-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
  fate-bmv-audio: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
  fate-delphine-cin-audio: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp
++FATE_SAMPLES_AUDIO-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp
+ fate-dss-lp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/lp.dss -frames 30
+ fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, DCA) += fate-dts
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, MPEGTS, DCA) += fate-dts
  fate-dts: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts
  fate-dts: CMP = oneoff
  fate-dts: REF = $(SAMPLES)/dts/dts.pcm
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, IMC) += fate-imc
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, DTS, DCA) += fate-dts_es
 +fate-dts_es: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts_es.dts
 +fate-dts_es: CMP = oneoff
 +fate-dts_es: REF = $(SAMPLES)/dts/dts_es.pcm
 +
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, IMC) += fate-imc
  fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi
  fate-imc: CMP = oneoff
  fate-imc: REF = $(SAMPLES)/imc/imc.pcm
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser
  fate-nellymoser: CMD = pcm -i $(TARGET_SAMPLES)/nellymoser/nellymoser.flv
  fate-nellymoser: CMP = oneoff
  fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc
 +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 = -256
 +fate-nellymoser-aref-encode: CMP_TARGET = 3863
 +fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
 +
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc
  fate-on2avc: CMD = framecrc -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
 +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_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)