summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2006-01-24 08:03:42 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2006-01-24 08:03:42 +0000
commitdcfdb046eec3e72457311721a09404c3fd724609 (patch)
treea30a296478dcdbb8bcdcf52851504289730f0d07 /tests
parent29f7ae79e739b70a70cf1931a8bdf9224859d539 (diff)
Fix for title field in PSP compatible mp4 files. Patch by
Olivier, oandrieu <at> gmail.com. Originally committed as revision 4889 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/ffmpeg.regression.ref2
-rwxr-xr-xtests/regression.sh8
-rw-r--r--tests/rotozoom.regression.ref2
3 files changed, 12 insertions, 0 deletions
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 0e91f54be7..a309659afe 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -75,6 +75,8 @@ stddev: 12.32 PSNR:26.31 bytes:7602176
899452 ./data/a-mpeg4-Q.avi
af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv
stddev: 5.69 PSNR:33.00 bytes:7602176
+cf8be7607ebef72bbe3c6c40467cb741 *./data/a-mpeg4-PSP.mp4
+407373 ./data/a-mpeg4-PSP.mov
dd193b592a02864d612c64cbbf5e1258 *./data/a-error-mpeg4-adv.avi
766682 ./data/a-error-mpeg4-adv.avi
e90b201e20563ec7817f5dc4276902ed *./data/out.yuv
diff --git a/tests/regression.sh b/tests/regression.sh
index 5f053cf644..76678127a9 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -56,6 +56,7 @@ else
do_h263=y
do_h263p=y
do_mpeg4=y
+ do_mp4psp=y
do_huffyuv=y
do_mjpeg=y
do_ljpeg=y
@@ -339,6 +340,13 @@ do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst
fi
###################################
+if [ -n "$do_mp4psp" ] ; then
+# mp4 PSP style
+file=${outfile}mpeg4-PSP.mp4
+do_ffmpeg $file -y -b 768 -s 320x240 -f psp -ar 24000 -ab 32 -i $raw_src $file
+fi
+
+###################################
if [ -n "$do_error" ] ; then
# damaged mpeg4
file=${outfile}error-mpeg4-adv.avi
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 58bcb7cbda..42f008facf 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -75,6 +75,8 @@ bb7f7889f0694a1c499041f3ee5e234d *./data/a-mpeg4-Q.avi
164998 ./data/a-mpeg4-Q.avi
b078f22c66083f0537bd3581509684d8 *./data/out.yuv
stddev: 4.01 PSNR:36.05 bytes:7602176
+5eb32583799d9ea27d364e381f19f022 *./data/a-mpeg4-PSP.mp4
+321946 ./data/a-mpeg4-PSP.mov
74b9ddde044f90c8ee25042e9faaef68 *./data/a-error-mpeg4-adv.avi
177212 ./data/a-error-mpeg4-adv.avi
9fa0943825f364d6fb700dc75cf5d8bb *./data/out.yuv