diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 18:24:35 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 18:26:53 +0400 |
commit | aa36dcf53441a0835f45bc8667de9b157f064809 (patch) | |
tree | b39aef9cf7c13f2acef06cca44ea9b16b710d1c4 /tests | |
parent | 3f9e2aad34513597a2265478e8eb6c0c8a2eba6c (diff) | |
parent | 04ffd2203065b4bc6b85dfc3c7c8e14c98e40943 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add xvid test for custom matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile | 1 | ||||
-rw-r--r-- | tests/fate/xvid.mak | 6 | ||||
-rw-r--r-- | tests/ref/fate/xvid-custom-matrix | 25 |
3 files changed, 32 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index a75401ce66..ff5fc2b34d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -135,6 +135,7 @@ include $(SRC_PATH)/tests/fate/vpx.mak include $(SRC_PATH)/tests/fate/vqf.mak include $(SRC_PATH)/tests/fate/wavpack.mak include $(SRC_PATH)/tests/fate/wma.mak +include $(SRC_PATH)/tests/fate/xvid.mak FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) diff --git a/tests/fate/xvid.mak b/tests/fate/xvid.mak new file mode 100644 index 0000000000..50ab231ae9 --- /dev/null +++ b/tests/fate/xvid.mak @@ -0,0 +1,6 @@ +fate-xvid-custom-matrix: CMD = framemd5 -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 + +FATE_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix +FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) + +fate-xvid: $(FATE_XVID-yes) diff --git a/tests/ref/fate/xvid-custom-matrix b/tests/ref/fate/xvid-custom-matrix new file mode 100644 index 0000000000..e8daaea7a0 --- /dev/null +++ b/tests/ref/fate/xvid-custom-matrix @@ -0,0 +1,25 @@ +#format: frame checksums +#version: 1 +#hash: MD5 +#tb 0: 1/25 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 622080, fec19d49e4433046ac5f7a9f3dff2078 +0, 1, 1, 1, 622080, 77aa1a369ce3e180648eaccce95cb618 +0, 2, 2, 1, 622080, d3ff08bc77e247a4b033d37ff780c2a2 +0, 3, 3, 1, 622080, 362c6b7411f23134880b4ceeaf09aafb +0, 4, 4, 1, 622080, 52ba7f7611160ed9516a3b94dd889254 +0, 5, 5, 1, 622080, e11bf4956dfa43a760cdb8a6c46201eb +0, 6, 6, 1, 622080, 5305b5775b9481b136e84c0f1c2c52c7 +0, 7, 7, 1, 622080, 65510ff0135a41e5acc99071893c99b2 +0, 8, 8, 1, 622080, cab3a8991f0d404bb42386efb430abc7 +0, 9, 9, 1, 622080, b7a8305768527a9b54248e620a5e7117 +0, 10, 10, 1, 622080, 67adbfe7c321a2a74244d2a268de598a +0, 11, 11, 1, 622080, 9bcaed10aa15b8a5278c5c4840cfb9c8 +0, 12, 12, 1, 622080, 0e3065f441313496cb390ba1a6c92b11 +0, 13, 13, 1, 622080, f741816f762c000fc6fa77d9d1d96cdc +0, 14, 14, 1, 622080, 259686747b597c168440d5cfe75cdfbf +0, 15, 15, 1, 622080, d37341f0bea41b6d0421e984cd079673 +0, 16, 16, 1, 622080, 97428665f84e4364bdba768ad604bcdc +0, 17, 17, 1, 622080, 8c32ce967ee34df1ccbdf4e8b6aa8c8d +0, 18, 18, 1, 622080, 7fee903f21d29d6d8215fc04c8b3af34 +0, 21, 21, 1, 622080, 3d67c55cc62f0308cd4549c7ac46081a |