Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'

[ffmpeg] / tests / fate / alac.mak

diff --git a/tests/fate/alac.mak b/tests/fate/alac.mak
index b55b5949b632c1bbe3fba40c7fb065589883e075..5e29e90cbd95ff91c0db165ef8c0f81769366957 100644 (file)
--- a/tests/fate/alac.mak
+++ b/tests/fate/alac.mak
@@ -1,15 +1,24 @@
-FATE_ALAC += fate-alac-level-0                                          \
-             fate-alac-level-1                                          \
-             fate-alac-level-2                                          \
-             fate-alac-lpc-orders                                       \
+FATE_ALAC += fate-alac-16-level-0                                       \
+             fate-alac-16-level-1                                       \
+             fate-alac-16-level-2                                       \
+             fate-alac-16-lpc-orders                                    \
+             fate-alac-24-level-0                                       \
+             fate-alac-24-level-1                                       \
+             fate-alac-24-level-2                                       \
+             fate-alac-24-lpc-orders                                    \
 
-fate-alac-level-%: OPTS = -compression_level $(@:fate-alac-level-%=%)
-fate-alac-lpc-orders: OPTS = -min_prediction_order 1 -max_prediction_order 30
+fate-alac-16-level-%:    OPTS = -compression_level $(@:fate-alac-16-level-%=%)
+fate-alac-24-level-%:    OPTS = -compression_level $(@:fate-alac-24-level-%=%)
+fate-alac-%-lpc-orders:  OPTS = -min_prediction_order 1 -max_prediction_order 30
+
+fate-alac-16-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-alac-16-%: CMD = enc_dec_pcm mov wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c alac $(OPTS)
+
+fate-alac-24-%: REF = $(SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav
+fate-alac-24-%: CMD = enc_dec_pcm mov wav s24le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c alac $(OPTS)
 
-fate-alac-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
-fate-alac-%: CMD = enc_dec_pcm mov wav s16le $(REF) -c alac $(OPTS)
 fate-alac-%: CMP = oneoff
 fate-alac-%: FUZZ = 0
 
-FATE_SAMPLES_AVCONV += $(FATE_ALAC)
+FATE_SAMPLES_AVCONV-$(call ENCDEC, ALAC, MOV) += $(FATE_ALAC)
 fate-alac: $(FATE_ALAC)