Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled

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

tests/Makefile

@@ -107,6 +107,7 @@ include $(SRC_PATH)/tests/fate/indeo.mak
 include $(SRC_PATH)/tests/fate/libavcodec.mak
 include $(SRC_PATH)/tests/fate/libavdevice.mak
 include $(SRC_PATH)/tests/fate/libavformat.mak
+include $(SRC_PATH)/tests/fate/libavresample.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak

tests/fate/libavresample.mak

@@ -0,0 +1,26 @@
+CROSS_TEST = $(foreach I,$(1),                                        \
+                 $(foreach J,$(1),                                    \
+                     $(if $(filter-out $(I),$(J)),                    \
+                         $(eval $(call $(2),$(I),$(J),$(3),$(4))),    \
+                     )))
+
+MIX_CHANNELS = 1 2 3 4 5 6 7 8
+
+define MIX
+FATE_LAVR_MIX += fate-lavr-mix-$(3)-$(1)-$(2)
+fate-lavr-mix-$(3)-$(1)-$(2): tests/data/asynth-44100-$(1).wav
+fate-lavr-mix-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-$(1).wav -ac $(2) -mix_coeff_type $(3) -internal_sample_fmt $(4) -f s16le -af atrim=end_sample=1024 -
+fate-lavr-mix-$(3)-$(1)-$(2): CMP = oneoff
+fate-lavr-mix-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-mix-$(3)-$(1)-$(2)
+endef
+
+$(call CROSS_TEST,$(MIX_CHANNELS),MIX,q8,s16p)
+$(call CROSS_TEST,$(MIX_CHANNELS),MIX,q15,s16p)
+$(call CROSS_TEST,$(MIX_CHANNELS),MIX,flt,fltp)
+
+FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_MIX)
+fate-lavr-mix: $(FATE_LAVR_MIX-yes)
+#FATE_LAVR += $(FATE_LAVR_MIX-yes)
+
+FATE_SAMPLES_AVCONV += $(FATE_LAVR)
+fate-lavr: $(FATE_LAVR)