diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 02:22:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 02:22:09 +0100 |
| commit | e986a5d10d95b62cd85aaefc7d4da34699fbedeb (patch) | |
| tree | 38dddca2b4582111bcf1bcb6be2d1c6193300f2d /tests | |
| parent | 36397ea1c7e27ab850149cc61394c2baa26dd532 (diff) | |
| parent | 68d6012c723bb520daac5336dcb046c0a5dd3826 (diff) | |
| download | ffmpeg-e986a5d10d95b62cd85aaefc7d4da34699fbedeb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for targa
ARM: fix Thumb-mode simple_idct_arm
ARM: 4-byte align start of all asm functions
rgb2rgb: rgb12to15()
swscale-test: fix stack overread.
swscale: fix invalid conversions and memory problems.
cabac: split cabac.h into declarations and function definitions
cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
cabac: Remove ff_h264_lps_state array.
Conflicts:
libswscale/rgb2rgb.h
libswscale/swscale_unscaled.c
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/image.mak | 29 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-CBW8 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-CTC16 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-CTC24 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-CTC32 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-UBW8 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-UTC16 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-UTC24 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-UTC32 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-top-to-bottom | 1 |
10 files changed, 37 insertions, 1 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 703299c27b..b7ebd9843a 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -30,6 +30,33 @@ fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw. FATE_IMAGE += fate-sunraster-24bit-rle fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun - FATE_TESTS += $(FATE_IMAGE) fate-image: $(FATE_IMAGE) + +FATE_TARGA = CBW8 \ + CTC16 \ + CTC24 \ + CTC32 \ + UBW8 \ + UTC16 \ + UTC24 \ + UTC32 + +FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ + fate-targa-top-to-bottom + +FATE_TESTS += $(FATE_TARGA) +fate-targa: $(FATE_TARGA) + +fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA +# fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA +fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA +fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA +fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA +fate-targa-conformance-UBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA +# fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA +fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA +fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA +fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA + +fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga diff --git a/tests/ref/fate/targa-conformance-CBW8 b/tests/ref/fate/targa-conformance-CBW8 new file mode 100644 index 0000000000..4ff3a9d42a --- /dev/null +++ b/tests/ref/fate/targa-conformance-CBW8 @@ -0,0 +1 @@ +0, 0, 16384, 0x267e21ef diff --git a/tests/ref/fate/targa-conformance-CTC16 b/tests/ref/fate/targa-conformance-CTC16 new file mode 100644 index 0000000000..d2c75f684d --- /dev/null +++ b/tests/ref/fate/targa-conformance-CTC16 @@ -0,0 +1 @@ +0, 0, 32768, 0xa6b3d20d diff --git a/tests/ref/fate/targa-conformance-CTC24 b/tests/ref/fate/targa-conformance-CTC24 new file mode 100644 index 0000000000..42e12715ac --- /dev/null +++ b/tests/ref/fate/targa-conformance-CTC24 @@ -0,0 +1 @@ +0, 0, 49152, 0xaca4bc29 diff --git a/tests/ref/fate/targa-conformance-CTC32 b/tests/ref/fate/targa-conformance-CTC32 new file mode 100644 index 0000000000..acc3068e26 --- /dev/null +++ b/tests/ref/fate/targa-conformance-CTC32 @@ -0,0 +1 @@ +0, 0, 65536, 0xcf98bc29 diff --git a/tests/ref/fate/targa-conformance-UBW8 b/tests/ref/fate/targa-conformance-UBW8 new file mode 100644 index 0000000000..4ff3a9d42a --- /dev/null +++ b/tests/ref/fate/targa-conformance-UBW8 @@ -0,0 +1 @@ +0, 0, 16384, 0x267e21ef diff --git a/tests/ref/fate/targa-conformance-UTC16 b/tests/ref/fate/targa-conformance-UTC16 new file mode 100644 index 0000000000..d2c75f684d --- /dev/null +++ b/tests/ref/fate/targa-conformance-UTC16 @@ -0,0 +1 @@ +0, 0, 32768, 0xa6b3d20d diff --git a/tests/ref/fate/targa-conformance-UTC24 b/tests/ref/fate/targa-conformance-UTC24 new file mode 100644 index 0000000000..42e12715ac --- /dev/null +++ b/tests/ref/fate/targa-conformance-UTC24 @@ -0,0 +1 @@ +0, 0, 49152, 0xaca4bc29 diff --git a/tests/ref/fate/targa-conformance-UTC32 b/tests/ref/fate/targa-conformance-UTC32 new file mode 100644 index 0000000000..acc3068e26 --- /dev/null +++ b/tests/ref/fate/targa-conformance-UTC32 @@ -0,0 +1 @@ +0, 0, 65536, 0xcf98bc29 diff --git a/tests/ref/fate/targa-top-to-bottom b/tests/ref/fate/targa-top-to-bottom new file mode 100644 index 0000000000..e9d53bb455 --- /dev/null +++ b/tests/ref/fate/targa-top-to-bottom @@ -0,0 +1 @@ +0, 0, 196608, 0xb29ec51a |