Commit c280f2d7 authored by Michael Niedermayer's avatar Michael Niedermayer

nut regression test

mpeg4 ac prediction cleanup

Originally committed as revision 2326 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8d8c0294
...@@ -23,18 +23,18 @@ stddev: 8.18 bytes:7602176 ...@@ -23,18 +23,18 @@ stddev: 8.18 bytes:7602176
496df9fe47c457144aac4178c960ad66 *./data/a-h263p.avi 496df9fe47c457144aac4178c960ad66 *./data/a-h263p.avi
79649b61321beaaaa6413af8c18e4696 *./data/out.yuv 79649b61321beaaaa6413af8c18e4696 *./data/out.yuv
stddev: 2.05 bytes:7602176 stddev: 2.05 bytes:7602176
170cc33e7a786288d0e190aba76ce255 *./data/a-odivx.avi 74ab22f444b7f68f81624cabd69847be *./data/a-odivx.avi
c753223d02441b59704c9859dbd7ff30 *./data/out.yuv e48114a50ef4cfb4fe2016fa5b34ae4c *./data/out.yuv
stddev: 8.01 bytes:7602176 stddev: 8.02 bytes:7602176
5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi 5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 bytes:7602176 stddev: 0.00 bytes:7602176
6a359baea7b8b22d4a77ea1415c08d9b *./data/a-mpeg4-rc.avi 2fce40764b56ac4eade4bf29ee962ba0 *./data/a-mpeg4-rc.avi
580000bfe2d4359d9aa9a9415f953b3b *./data/out.yuv 580000bfe2d4359d9aa9a9415f953b3b *./data/out.yuv
stddev: 10.53 bytes:7145472 stddev: 10.53 bytes:7145472
2cbab98ebef5fbd229c66fb6435bf9a2 *./data/a-mpeg4-adv.avi dfe8fcd409a0605ef0cb37fc5e76ecf7 *./data/a-mpeg4-adv.avi
b54262af56f6681186fa2c44e4ef6ec7 *./data/out.yuv c8877a6b8ed290a637c2119860b468b0 *./data/out.yuv
stddev: 7.32 bytes:7602176 stddev: 7.31 bytes:7602176
843225ac495abfcc480296143c26bde3 *./data/a-mpeg1b.mpg 843225ac495abfcc480296143c26bde3 *./data/a-mpeg1b.mpg
da8e21c7b78b7a25558dc319524b91d8 *./data/out.yuv da8e21c7b78b7a25558dc319524b91d8 *./data/out.yuv
stddev: 6.32 bytes:6842368 stddev: 6.32 bytes:6842368
......
ffmpeg regression test ffmpeg regression test
55e7e5626717ced8d8709c43bd669fc1 *./data/b-libav.avi 3dc28f3e65addfcf907624805e92c34e *./data/b-libav.avi
./data/b-libav.avi CRC=a08a5739 ./data/b-libav.avi CRC=a08a5739
f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf
./data/b-libav.asf CRC=07970214 ./data/b-libav.asf CRC=07970214
...@@ -12,6 +12,8 @@ f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf ...@@ -12,6 +12,8 @@ f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf
./data/b-libav.ffm CRC=eb51d2a4 ./data/b-libav.ffm CRC=eb51d2a4
964bf9fc730fa66e449b6670b705a56f *./data/b-libav.flv 964bf9fc730fa66e449b6670b705a56f *./data/b-libav.flv
./data/b-libav.flv CRC=e2e5bc81 ./data/b-libav.flv CRC=e2e5bc81
090ad4fe8f00144a2b782703d1e587d2 *./data/b-libav.nut
./data/b-libav.nut CRC=a08a5739
9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
./data/b-libav.pbm CRC=a1057fd1 ./data/b-libav.pbm CRC=a1057fd1
6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm 6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm
......
...@@ -229,7 +229,7 @@ fi ...@@ -229,7 +229,7 @@ fi
if [ -n "$do_mpeg4adv" ] ; then if [ -n "$do_mpeg4adv" ] ; then
# mpeg4 # mpeg4
file=${outfile}mpeg4-adv.avi file=${outfile}mpeg4-adv.avi
do_ffmpeg $file -y -qscale 9 -4mv -hq -part -ps 200 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file do_ffmpeg $file -y -qscale 9 -4mv -hq -part -ps 200 -aic -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
# mpeg4 decoding # mpeg4 decoding
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
...@@ -367,7 +367,17 @@ file=${outfile}libav.flv ...@@ -367,7 +367,17 @@ file=${outfile}libav.flv
do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
do_ffmpeg_crc $file -i $file do_ffmpeg_crc $file -i $file
# XXX: need mov and mpegts tests (add bitstreams or add output capability in ffmpeg) # mov
#file=${outfile}libav.mov
#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
#do_ffmpeg_crc $file -i $file
# nut
file=${outfile}libav.nut
do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
do_ffmpeg_crc $file -i $file
# XXX: need mpegts tests (add bitstreams or add output capability in ffmpeg)
#################### ####################
# streamed images # streamed images
......
...@@ -23,16 +23,16 @@ stddev: 5.41 bytes:7602176 ...@@ -23,16 +23,16 @@ stddev: 5.41 bytes:7602176
c7683a914f7377dd0d3c2d0be6892fe9 *./data/a-h263p.avi c7683a914f7377dd0d3c2d0be6892fe9 *./data/a-h263p.avi
a63dcff871fd46481a4a7260aebbcdb5 *./data/out.yuv a63dcff871fd46481a4a7260aebbcdb5 *./data/out.yuv
stddev: 1.89 bytes:7602176 stddev: 1.89 bytes:7602176
ea8c6216f605c3e581de70a39463aa48 *./data/a-odivx.avi 108cb3071067f24571b2e5f0f5d4b234 *./data/a-odivx.avi
675ae0065619a2a73682f6a51ebf72d4 *./data/out.yuv ff7ddb57d9038b94f08c43bae7e1329f *./data/out.yuv
stddev: 5.28 bytes:7602176 stddev: 5.28 bytes:7602176
242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi 242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 bytes:7602176 stddev: 0.00 bytes:7602176
794463e80f8de682591e13b82510f967 *./data/a-mpeg4-rc.avi 24de1707e32f6a651df9d8c72216aa68 *./data/a-mpeg4-rc.avi
25f3d554edf174034b5e484a7cfb04d3 *./data/out.yuv 25f3d554edf174034b5e484a7cfb04d3 *./data/out.yuv
stddev: 4.32 bytes:7145472 stddev: 4.32 bytes:7145472
aeb300900461bdf9e0321934aa6dcc93 *./data/a-mpeg4-adv.avi bb11d9808375911ea63d4f0889306037 *./data/a-mpeg4-adv.avi
e465df12f2c8a6492a6ec0b1bddc1d0d *./data/out.yuv e465df12f2c8a6492a6ec0b1bddc1d0d *./data/out.yuv
stddev: 4.97 bytes:7602176 stddev: 4.97 bytes:7602176
fd09e45413a6b6e3a19bf9dd77503b17 *./data/a-mpeg1b.mpg fd09e45413a6b6e3a19bf9dd77503b17 *./data/a-mpeg1b.mpg
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment