diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:40:22 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:40:22 +0400 |
| commit | e79c3858b35fcc77c68c33b627958e736686957e (patch) | |
| tree | 5f933517c2909def4e2930a409b0a460eb4f41fd /tests | |
| parent | cd37963684d8ee9819af15ccebe09d84839101dd (diff) | |
| parent | 14f031d7ecfabba0ef02776d4516aa3dcb7c40d8 (diff) | |
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
dv: use AVStream.index instead of abusing AVStream.id
lavfi: add ashowinfo filter
avcodec: Add a RFC 3389 comfort noise codec
lpc: Add a function for calculating reflection coefficients from samples
lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
lavr: document upper bound on number of output samples.
lavr: add general API usage doxy
indeo3: remove duplicate capabilities line.
fate: ac3: Add dependencies
Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/ac3.mak | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index d15c7cd5be..cde214175c 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -44,14 +44,17 @@ fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small.pcm $(FATE_AC3) $(FATE_EAC3): CMP = oneoff -FATE_AC3_ENCODE += fate-ac3-encode +FATE_AC3-$(call DEMDEC, AC3, AC3) += $(FATE_AC3) +FATE_EAC3-$(call DEMDEC, EAC3, EAC3) += $(FATE_EAC3) + +FATE_AC3-$(call ENCDEC, AC3, AC3) += fate-ac3-encode fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(REF) -c:a ac3 -b:a 128k fate-ac3-encode: CMP_SHIFT = -1024 fate-ac3-encode: CMP_TARGET = 399.62 fate-ac3-encode: SIZE_TOLERANCE = 488 fate-ac3-encode: FUZZ = 4 -FATE_EAC3_ENCODE += fate-eac3-encode +FATE_EAC3-$(call ENCDEC, EAC3, EAC3) += fate-eac3-encode fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k fate-eac3-encode: CMP_SHIFT = -1024 fate-eac3-encode: CMP_TARGET = 514.02 @@ -61,15 +64,13 @@ fate-eac3-encode: FUZZ = 3 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_FIXED_ENCODE += fate-ac3-fixed-encode +FATE_AC3-$(call ENCMUX, AC3_FIXED, AC3) += 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 -ab 128k -f ac3 -flags +bitexact fate-ac3-fixed-encode: CMP = oneline fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1 -FATE_SAMPLES_AVCONV += $(FATE_AC3) $(FATE_AC3_ENCODE) $(FATE_AC3_FIXED_ENCODE) -FATE_SAMPLES_AVCONV += $(FATE_EAC3) $(FATE_EAC3_ENCODE) +FATE_SAMPLES_AVCONV- += $(FATE_AC3-yes) $(FATE_EAC3-yes) -fate-ac3: $(FATE_AC3) $(FATE_AC3_ENCODE) $(FATE_AC3_FIXED_ENCODE) -fate-ac3: $(FATE_EAC3) $(FATE_EAC3_ENCODE) +fate-ac3: $(FATE_AC3-yes) $(FATE_EAC3-yes) |