diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-15 01:21:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-15 01:27:10 +0100 |
| commit | 67235dfa1d2b4bab2c8015e5b8e43ea63a681892 (patch) | |
| tree | 6de0622de5bbdf40c5770899bcfb989b31bcd2a4 /tests | |
| parent | 9e2ee46206a5a4db91ee4d26737b515797e6b08e (diff) | |
| parent | e0febda22d0e0fab094a9c886b0e0f0f662df1ef (diff) | |
| download | ffmpeg-67235dfa1d2b4bab2c8015e5b8e43ea63a681892.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: stricter reference limit enforcement.
h264: increase reference poc list from 16 to 32.
xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
snow: check reference frame indices.
snow: reject unsupported chroma shifts.
Add ffvhuff encoding and decoding regression test
anm: convert to bytestream2 API
bytestream: add more unchecked variants for bytestream2 API
jvdec: unbreak video decoding
jv demux: set video stream duration
fate: add pam image regression test
Conflicts:
libavcodec/adpcm.c
libavcodec/anm.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/snowdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/codec-regression.sh | 5 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/pam | 3 | ||||
| -rw-r--r-- | tests/ref/vsynth1/ffvhuff | 4 | ||||
| -rw-r--r-- | tests/ref/vsynth2/ffvhuff | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index cd6512c725..714a94fb2f 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -227,6 +227,11 @@ do_video_encoding ffv1.avi "-strict -2 -an -vcodec ffv1" do_video_decoding fi +if [ -n "$do_ffvhuff" ] ; then +do_video_encoding ffvhuff.avi "-an -vcodec ffvhuff" +do_video_decoding "" +fi + if [ -n "$do_snow" ] ; then do_video_encoding snow.avi "-strict -2 -an -vcodec snow -qscale 2 -flags +qpel -me_method iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64" do_video_decoding "" "-s 352x288" diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index bfca359a58..f0fcac3511 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -211,6 +211,10 @@ if [ -n "$do_jpg" ] ; then do_image_formats jpg "-pix_fmt yuvj420p" "-f image2" fi +if [ -n "$do_pam" ] ; then +do_image_formats pam +fi + if [ -n "$do_pcx" ] ; then do_image_formats pcx fi diff --git a/tests/ref/lavf/pam b/tests/ref/lavf/pam new file mode 100644 index 0000000000..972d72825e --- /dev/null +++ b/tests/ref/lavf/pam @@ -0,0 +1,3 @@ +0dce5565222cf0f8b309467f279aecd2 *./tests/data/images/pam/02.pam +./tests/data/images/pam/%02d.pam CRC=0x6da01946 + 304191 ./tests/data/images/pam/02.pam diff --git a/tests/ref/vsynth1/ffvhuff b/tests/ref/vsynth1/ffvhuff new file mode 100644 index 0000000000..c6d7627b24 --- /dev/null +++ b/tests/ref/vsynth1/ffvhuff @@ -0,0 +1,4 @@ +0632ffae6f1e06dd299bf41a845b9099 *./tests/data/vsynth1/ffvhuff.avi + 5987208 ./tests/data/vsynth1/ffvhuff.avi +c5ccac874dbf808e9088bc3107860042 *./tests/data/ffvhuff.vsynth1.out.yuv +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/ffvhuff b/tests/ref/vsynth2/ffvhuff new file mode 100644 index 0000000000..6d77e2a027 --- /dev/null +++ b/tests/ref/vsynth2/ffvhuff @@ -0,0 +1,4 @@ +63926d8835dd5779dca0a4bc081ca8ae *./tests/data/vsynth2/ffvhuff.avi + 4988056 ./tests/data/vsynth2/ffvhuff.avi +dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ffvhuff.vsynth2.out.yuv +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 |