diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:04:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:15:56 +0200 |
| commit | 029353e427dab092444008085ac330009a1707bd (patch) | |
| tree | 8d2bbfcd2e955e8745c6b544f4e14730cbb98e1b /tests | |
| parent | cf6ed1f1293c2dd69b76d9246a916925b58b7bbf (diff) | |
| parent | e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68 (diff) | |
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
Monkey's Audio old versions FATE tests
h264_parser: Set field_order and picture_structure.
Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/fate/lossless-audio.mak | 3 | ||||
| -rw-r--r-- | tests/fate/monkeysaudio.mak | 20 | ||||
| -rw-r--r-- | tests/ref/fate/lossless-monkeysaudio-399 (renamed from tests/ref/fate/lossless-monkeysaudio) | 0 |
4 files changed, 21 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile index 99be14fc77..cd8c1e2821 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -100,6 +100,7 @@ include $(SRC_PATH)/tests/fate/libavutil.mak include $(SRC_PATH)/tests/fate/lossless-audio.mak include $(SRC_PATH)/tests/fate/lossless-video.mak include $(SRC_PATH)/tests/fate/microsoft.mak +include $(SRC_PATH)/tests/fate/monkeysaudio.mak include $(SRC_PATH)/tests/fate/mp3.mak include $(SRC_PATH)/tests/fate/mpc.mak include $(SRC_PATH)/tests/fate/pcm.mak diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 8dc0f06334..486920d7c5 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -4,9 +4,6 @@ fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le -FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio -fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le - FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, RM, RALF) += fate-ralf fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le diff --git a/tests/fate/monkeysaudio.mak b/tests/fate/monkeysaudio.mak new file mode 100644 index 0000000000..70fca49b91 --- /dev/null +++ b/tests/fate/monkeysaudio.mak @@ -0,0 +1,20 @@ +APE_VERSIONS = 380 388 389b1 391b1 392b2 394b1 + +define FATE_APE_SUITE +FATE_APE += fate-lossless-monkeysaudio-$(1)-normal +fate-lossless-monkeysaudio-$(1)-normal: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-mac$(1)-c2000.ape -af atrim=end_sample=73728 +fate-lossless-monkeysaudio-$(1)-normal: REF = CRC=0x5d08c17e +fate-lossless-monkeysaudio-$(1)-normal: CMP = oneline +FATE_APE += fate-lossless-monkeysaudio-$(1)-extrahigh +fate-lossless-monkeysaudio-$(1)-extrahigh: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-mac$(1)-c4000.ape -af atrim=end_sample=73728 +fate-lossless-monkeysaudio-$(1)-extrahigh: REF = CRC=0x5d08c17e +fate-lossless-monkeysaudio-$(1)-extrahigh: CMP = oneline +endef + +$(foreach N,$(APE_VERSIONS),$(eval $(call FATE_APE_SUITE,$(N)))) + +FATE_APE += fate-lossless-monkeysaudio-399 +fate-lossless-monkeysaudio-399: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le + +FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += $(FATE_APE) +fate-lossless-monkeysaudio: $(FATE_APE) diff --git a/tests/ref/fate/lossless-monkeysaudio b/tests/ref/fate/lossless-monkeysaudio-399 index 4b8caa1f00..4b8caa1f00 100644 --- a/tests/ref/fate/lossless-monkeysaudio +++ b/tests/ref/fate/lossless-monkeysaudio-399 |