diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:17:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:23:01 +0100 |
commit | e1f37c48e54f98d34f8a032e1d96f7a135a8545d (patch) | |
tree | 74c11781b08a32228c081d6e679d778b6ac686a5 /tests | |
parent | fa4bb7c5b249da60cd16113b795a64f0055ef164 (diff) | |
parent | 247e370e2a913db52ca079b347a174c8d393b171 (diff) | |
download | ffmpeg-e1f37c48e54f98d34f8a032e1d96f7a135a8545d.tar.gz |
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
* commit '247e370e2a913db52ca079b347a174c8d393b171':
TDSC decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/video.mak | 3 | ||||
-rw-r--r-- | tests/ref/fate/tdsc | 42 |
2 files changed, 45 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 08eae8642d..47f1d39f66 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -256,6 +256,9 @@ fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi +FATE_VIDEO-$(call DEMDEC, ASF, TDSC) += fate-tdsc +fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24 + FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an diff --git a/tests/ref/fate/tdsc b/tests/ref/fate/tdsc new file mode 100644 index 0000000000..d6925e9a99 --- /dev/null +++ b/tests/ref/fate/tdsc @@ -0,0 +1,42 @@ +#tb 0: 1/30 +0, 0, 0, 1, 3888000, 0x9c498657 +0, 7, 7, 1, 3888000, 0x72a2ae22 +0, 8, 8, 1, 3888000, 0x72a2ae22 +0, 10, 10, 1, 3888000, 0x72a2ae22 +0, 16, 16, 1, 3888000, 0x72a2ae22 +0, 17, 17, 1, 3888000, 0x72a2ae22 +0, 20, 20, 1, 3888000, 0x550e417b +0, 29, 29, 1, 3888000, 0x550e417b +0, 30, 30, 1, 3888000, 0x550e417b +0, 31, 31, 1, 3888000, 0x550e417b +0, 32, 32, 1, 3888000, 0x550e417b +0, 34, 34, 1, 3888000, 0x550e417b +0, 35, 35, 1, 3888000, 0x38dcde13 +0, 47, 47, 1, 3888000, 0x2b7c0edd +0, 48, 48, 1, 3888000, 0xaaaf3c7b +0, 49, 49, 1, 3888000, 0x26d1710f +0, 50, 50, 1, 3888000, 0xa6609f3f +0, 51, 51, 1, 3888000, 0xaa41c6f3 +0, 52, 52, 1, 3888000, 0xc0ffd4d5 +0, 53, 53, 1, 3888000, 0x44d4f383 +0, 55, 55, 1, 3888000, 0x517047eb +0, 56, 56, 1, 3888000, 0x1d5a4d5b +0, 57, 57, 1, 3888000, 0x7d2da2f6 +0, 58, 58, 1, 3888000, 0x27f7a2f6 +0, 59, 59, 1, 3888000, 0x9de49edb +0, 60, 60, 1, 3888000, 0x5ccb9f38 +0, 61, 61, 1, 3888000, 0x88069fb2 +0, 62, 62, 1, 3888000, 0x1d059fd3 +0, 63, 63, 1, 3888000, 0xe16d9fd3 +0, 64, 64, 1, 3888000, 0xb6a69fd3 +0, 65, 65, 1, 3888000, 0xb6a69fd3 +0, 66, 66, 1, 3888000, 0x61709fd3 +0, 67, 67, 1, 3888000, 0xb6f59fd3 +0, 68, 68, 1, 3888000, 0x5c7b9fd3 +0, 69, 69, 1, 3888000, 0x57869fd3 +0, 70, 70, 1, 3888000, 0x9d3f9fd3 +0, 73, 73, 1, 3888000, 0x5e6082a5 +0, 74, 74, 1, 3888000, 0x5e6082a5 +0, 75, 75, 1, 3888000, 0x5e6082a5 +0, 76, 76, 1, 3888000, 0x48ce82f3 +0, 77, 77, 1, 3888000, 0x4c5ebeaf |