diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-04 22:39:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-04 23:51:43 +0200 |
| commit | e776ee8f294984f7643a3c45db803c7266e1edfd (patch) | |
| tree | a1fd00ab7a0760ec0f2848aed9dc3f79d889e816 /tests | |
| parent | 88fc1438c693ffb7793aeb111d89775440491840 (diff) | |
| parent | 8821ae649e61097ec57ca58472c3e4239c82913c (diff) | |
| download | ffmpeg-e776ee8f294984f7643a3c45db803c7266e1edfd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: fix handling of custom mix matrices
fate: force pix_fmt in lagarith-rgb32 test
fate: add tests for lagarith lossless video codec.
ARMv6: vp8: fix stack allocation with Apple's assembler
ARM: vp56: allow inline asm to build with clang
fft: 3dnow: fix register name typo in DECL_IMDCT macro
x86: dct32: port to cpuflags
x86: build: replace mmx2 by mmxext
Revert "wmapro: prevent division by zero when sample rate is unspecified"
wmapro: prevent division by zero when sample rate is unspecified
lagarith: fix color plane inversion for YUY2 output.
lagarith: pad RGB buffer by 1 byte.
dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.
Conflicts:
doc/APIchanges
libavcodec/lagarith.c
libavfilter/x86/gradfun.c
libavutil/cpu.h
libavutil/version.h
libswscale/utils.c
libswscale/version.h
libswscale/x86/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/lossless-video.mak | 15 | ||||
| -rw-r--r-- | tests/ref/fate/lagarith-rgb24 | 5 | ||||
| -rw-r--r-- | tests/ref/fate/lagarith-rgb32 | 26 | ||||
| -rw-r--r-- | tests/ref/fate/lagarith-yuy2 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/lagarith-yv12 | 3 |
5 files changed, 51 insertions, 0 deletions
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index d7d192db9a..e7fe388454 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,3 +1,18 @@ +FATE_LAGARITH += fate-lagarith-rgb24 +fate-lagarith-rgb24: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb24.avi + +FATE_LAGARITH += fate-lagarith-rgb32 +fate-lagarith-rgb32: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra + +FATE_LAGARITH += fate-lagarith-yuy2 +fate-lagarith-yuy2: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yuy2.avi + +FATE_LAGARITH += fate-lagarith-yv12 +fate-lagarith-yv12: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yv12.avi + +FATE_SAMPLES_AVCONV += $(FATE_LAGARITH) +fate-lagarith: $(FATE_LAGARITH) + FATE_LOCO += fate-loco-rgb fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi diff --git a/tests/ref/fate/lagarith-rgb24 b/tests/ref/fate/lagarith-rgb24 new file mode 100644 index 0000000000..1eb2bc441c --- /dev/null +++ b/tests/ref/fate/lagarith-rgb24 @@ -0,0 +1,5 @@ +#tb 0: 100/2997 +0, 0, 0, 1, 368640, 0x26f74db2 +0, 1, 1, 1, 368640, 0x63b29ea4 +0, 2, 2, 1, 368640, 0x19467f03 +0, 3, 3, 1, 368640, 0x5fdc3575 diff --git a/tests/ref/fate/lagarith-rgb32 b/tests/ref/fate/lagarith-rgb32 new file mode 100644 index 0000000000..490e2e5c7d --- /dev/null +++ b/tests/ref/fate/lagarith-rgb32 @@ -0,0 +1,26 @@ +#tb 0: 1001/24000 +0, 0, 0, 1, 1382400, 0x00000000 +0, 1, 1, 1, 1382400, 0x00000000 +0, 2, 2, 1, 1382400, 0x00000000 +0, 3, 3, 1, 1382400, 0x00000000 +0, 4, 4, 1, 1382400, 0x00000000 +0, 5, 5, 1, 1382400, 0xf95bde46 +0, 6, 6, 1, 1382400, 0x4f4c0393 +0, 7, 7, 1, 1382400, 0xe5aa40db +0, 8, 8, 1, 1382400, 0xc25a8ba2 +0, 9, 9, 1, 1382400, 0x9db3150d +0, 10, 10, 1, 1382400, 0x730e64b3 +0, 11, 11, 1, 1382400, 0xf8fd7edf +0, 12, 12, 1, 1382400, 0x0114798a +0, 13, 13, 1, 1382400, 0x7571210f +0, 14, 14, 1, 1382400, 0x552ae59d +0, 15, 15, 1, 1382400, 0x7ae0c946 +0, 16, 16, 1, 1382400, 0x0818c3ef +0, 17, 17, 1, 1382400, 0x8257cac4 +0, 18, 18, 1, 1382400, 0x7762a979 +0, 19, 19, 1, 1382400, 0x282af57a +0, 20, 20, 1, 1382400, 0x3f42de50 +0, 21, 21, 1, 1382400, 0xc42d5f93 +0, 22, 22, 1, 1382400, 0x18775c90 +0, 23, 23, 1, 1382400, 0x34befa90 +0, 24, 24, 1, 1382400, 0xd33d5f53 diff --git a/tests/ref/fate/lagarith-yuy2 b/tests/ref/fate/lagarith-yuy2 new file mode 100644 index 0000000000..c5aed92d61 --- /dev/null +++ b/tests/ref/fate/lagarith-yuy2 @@ -0,0 +1,2 @@ +#tb 0: 1/10 +0, 0, 0, 1, 1572864, 0xeed76a7d diff --git a/tests/ref/fate/lagarith-yv12 b/tests/ref/fate/lagarith-yv12 new file mode 100644 index 0000000000..c9c9ff372f --- /dev/null +++ b/tests/ref/fate/lagarith-yv12 @@ -0,0 +1,3 @@ +#tb 0: 1/60 +0, 0, 0, 1, 92160, 0x1dfdf5c1 +0, 1, 1, 1, 92160, 0x6965884f |