diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-01-14 23:55:54 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-01-14 23:55:54 +0000 |
| commit | 45ddd8b02131513a792ff78f6cbefd4f63934d57 (patch) | |
| tree | 20d7fff120195919e588211ca69310c72c3954b3 /tests | |
| parent | ac66834c759b7130fb5be51f63cb6dff9b294cba (diff) | |
merge fragmented mpeg4adv section in regression.sh
Originally committed as revision 7519 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ffmpeg.regression.ref | 8 | ||||
| -rwxr-xr-x | tests/regression.sh | 9 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 8 |
3 files changed, 11 insertions, 14 deletions
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index d68c1345e7..9fc02bf8b4 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -83,14 +83,14 @@ stddev: 12.12 PSNR:26.44 bytes:7602176 400650 ./data/a-mpeg4-adap.avi 0ce1d1fbebc9e9178e1a1d4a32a5804c *./data/out.yuv stddev: 14.66 PSNR:24.80 bytes:7602176 -5fff534f0b958547dfdb811d4f289931 *./data/a-mpeg4-thread.avi -761170 ./data/a-mpeg4-thread.avi -fe1d119938f8a26174b38eeaa18dff85 *./data/out.yuv -stddev: 12.31 PSNR:26.31 bytes:7602176 41b27141442f773eca9ef3d48d8d555a *./data/a-mpeg4-Q.avi 878264 ./data/a-mpeg4-Q.avi 8995abbcc97ed4767fcbc0bf46accd01 *./data/out.yuv stddev: 5.61 PSNR:33.13 bytes:7602176 +5fff534f0b958547dfdb811d4f289931 *./data/a-mpeg4-thread.avi +761170 ./data/a-mpeg4-thread.avi +fe1d119938f8a26174b38eeaa18dff85 *./data/out.yuv +stddev: 12.31 PSNR:26.31 bytes:7602176 c1dae02bddd79790266bc0a9f7d6eb0e *./data/a-mpeg4-PSP.mp4 406449 ./data/a-mpeg4-PSP.mp4 7315281e07830456208dff61337c982b *./data/a-error-mpeg4-adv.avi diff --git a/tests/regression.sh b/tests/regression.sh index c94bc05ca2..f032255375 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -352,19 +352,16 @@ do_video_decoding # mpeg4 do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+trell+mv0 -cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3" pgmyuv "-an -vcodec mpeg4" do_video_decoding -fi -################################### -if [ -n "$do_mpeg4thread" ] ; then # mpeg4 -do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2" pgmyuv "-an -vcodec mpeg4 -threads 2" +do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" pgmyuv "-an -vcodec mpeg4" do_video_decoding fi ################################### -if [ -n "$do_mpeg4adv" ] ; then +if [ -n "$do_mpeg4thread" ] ; then # mpeg4 -do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" pgmyuv "-an -vcodec mpeg4" +do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2" pgmyuv "-an -vcodec mpeg4 -threads 2" do_video_decoding fi diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index c65bdab944..3aea58c7a3 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -83,14 +83,14 @@ d581d6f4a331325905b8ffb05cd3bfd3 *./data/a-mpeg4-adap.avi 204284 ./data/a-mpeg4-adap.avi c2c7f1c7844ab92d34247ccb70198c61 *./data/out.yuv stddev: 4.04 PSNR:35.99 bytes:7602176 -8cd8940d7451925784536fe9b2f2a5e3 *./data/a-mpeg4-thread.avi -254260 ./data/a-mpeg4-thread.avi -d160a4224ea1af66c85178912f8d3a7c *./data/out.yuv -stddev: 4.03 PSNR:36.01 bytes:7602176 a5150067914ee1dee50f8fc8dcaee841 *./data/a-mpeg4-Q.avi 165802 ./data/a-mpeg4-Q.avi 4dcc71ad79bee90777cf5299044be362 *./data/out.yuv stddev: 4.00 PSNR:36.08 bytes:7602176 +8cd8940d7451925784536fe9b2f2a5e3 *./data/a-mpeg4-thread.avi +254260 ./data/a-mpeg4-thread.avi +d160a4224ea1af66c85178912f8d3a7c *./data/out.yuv +stddev: 4.03 PSNR:36.01 bytes:7602176 5b5b88ce610114e346a5df4f46995bb9 *./data/a-mpeg4-PSP.mp4 325006 ./data/a-mpeg4-PSP.mp4 90e65096aa9ebafa3fe3f44a5a47cdc4 *./data/a-error-mpeg4-adv.avi |