diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 20:54:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 21:03:58 +0100 |
| commit | b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d (patch) | |
| tree | 2dc3dff697c834df2385c8542f62f6f2d23c8fc3 | |
| parent | 75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70 (diff) | |
| parent | 994d8f3095180ba1b2c6040a97718e931a782b34 (diff) | |
| download | ffmpeg-b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d.tar.gz | |
Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'
* commit '994d8f3095180ba1b2c6040a97718e931a782b34':
fate: Add AIC test with odd sizes
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/video.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/aic-oddsize | 58 |
2 files changed, 61 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index be1fe00655..71220c8baa 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -13,6 +13,9 @@ fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb2 FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic fate-aic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/small_apple_intermediate_codec.mov -an -vframes 15 +FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize +fate-aic-oddsize: CMD = framecrc -i $(TARGET_SAMPLES)/aic/aic_odd_dimensions.mov + FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 diff --git a/tests/ref/fate/aic-oddsize b/tests/ref/fate/aic-oddsize new file mode 100644 index 0000000000..9183089971 --- /dev/null +++ b/tests/ref/fate/aic-oddsize @@ -0,0 +1,58 @@ +#tb 0: 1000/14587 +0, 0, 0, 1, 174243, 0xa40491e1 +0, 1, 1, 1, 174243, 0xa12cbb56 +0, 2, 2, 1, 174243, 0xa12cbb56 +0, 3, 3, 1, 174243, 0xa12cbb56 +0, 4, 4, 1, 174243, 0xa12cbb56 +0, 5, 5, 1, 174243, 0xa12cbb56 +0, 6, 6, 1, 174243, 0xa12cbb56 +0, 7, 7, 1, 174243, 0xa12cbb56 +0, 8, 8, 1, 174243, 0xa12cbb56 +0, 9, 9, 1, 174243, 0x4e7b7299 +0, 10, 10, 1, 174243, 0x31573b99 +0, 11, 11, 1, 174243, 0x013397b6 +0, 12, 12, 1, 174243, 0xdd988ab8 +0, 13, 13, 1, 174243, 0xd6d96b1e +0, 14, 14, 1, 174243, 0xd6d96b1e +0, 15, 15, 1, 174243, 0xd6d96b1e +0, 16, 16, 1, 174243, 0x111627d3 +0, 17, 17, 1, 174243, 0x284d9ab7 +0, 18, 18, 1, 174243, 0xa348c492 +0, 19, 19, 1, 174243, 0xa348c492 +0, 20, 20, 1, 174243, 0xa348c492 +0, 21, 21, 1, 174243, 0xa348c492 +0, 22, 22, 1, 174243, 0x2d22c3b8 +0, 23, 23, 1, 174243, 0x2d22c3b8 +0, 24, 24, 1, 174243, 0x2d22c3b8 +0, 25, 25, 1, 174243, 0x2d22c3b8 +0, 26, 26, 1, 174243, 0xa6d7c890 +0, 27, 27, 1, 174243, 0x8068bfbb +0, 28, 28, 1, 174243, 0x420ae647 +0, 29, 29, 1, 174243, 0xc5467756 +0, 30, 30, 1, 174243, 0x238a13dd +0, 31, 31, 1, 174243, 0x5bab75dc +0, 32, 32, 1, 174243, 0x14d7f61f +0, 33, 33, 1, 174243, 0x2e1d334f +0, 34, 34, 1, 174243, 0xeade7dc0 +0, 35, 35, 1, 174243, 0xeade7dc0 +0, 36, 36, 1, 174243, 0xeade7dc0 +0, 37, 37, 1, 174243, 0xeade7dc0 +0, 38, 38, 1, 174243, 0x088c7ef9 +0, 39, 39, 1, 174243, 0x70a3554e +0, 40, 40, 1, 174243, 0x0753d1d4 +0, 41, 41, 1, 174243, 0x8266bd6d +0, 42, 42, 1, 174243, 0x4ce3cda9 +0, 43, 43, 1, 174243, 0x4ce3cda9 +0, 44, 44, 1, 174243, 0x4ce3cda9 +0, 45, 45, 1, 174243, 0x4ce3cda9 +0, 46, 46, 1, 174243, 0xe5f7cd98 +0, 47, 47, 1, 174243, 0xe5f7cd98 +0, 48, 48, 1, 174243, 0xe5f7cd98 +0, 49, 49, 1, 174243, 0xe5f7cd98 +0, 50, 50, 1, 174243, 0x78c5cdb7 +0, 51, 51, 1, 174243, 0x78c5cdb7 +0, 52, 52, 1, 174243, 0x78c5cdb7 +0, 53, 53, 1, 174243, 0xce7ccd92 +0, 54, 54, 1, 174243, 0xce7ccd92 +0, 55, 55, 1, 174243, 0xce7ccd92 +0, 56, 56, 1, 174243, 0xce7ccd92 |