regression test for H263+

Originally committed as revision 1070 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 3e23af8..1bf2cb4 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -361,8 +361,7 @@ int MPV_common_init(MpegEncContext *s)
     /* 4mv b frame decoding table */
     //note this is needed for h263 without b frames too (segfault on damaged streams otherwise)
     CHECKED_ALLOCZ(s->co_located_type_table, s->mb_num * sizeof(UINT8))
-
-    if (s->h263_pred || s->h263_plus) {
+    if (s->out_format == FMT_H263) {
         /* ac values */
         CHECKED_ALLOCZ(s->ac_val[0], yc_size * sizeof(INT16) * 16);
         s->ac_val[1] = s->ac_val[0] + y_size;

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 8a2622e..cd9d8bb 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -9,6 +9,8 @@ ffmpeg regression test
 3ed8e11a8a8147c3e7d736593fccae79 *./data/out.yuv
 abe11239875a32f00fa2910828bba4fb *./data/a-h263.avi
 c1f6c8ee7a24d8345deddf1a24ca3756 *./data/out.yuv
+f022e9efcc88abcce80cc25232bc1cb1 *./data/a-h263p.avi
+d53012811b639e12a88476f2c82de0ca *./data/out.yuv
 8e41ac530894eaf3ecdb583d6d66c392 *./data/a-odivx.avi
 bf3be8fb78a9ca91dd6b252d48ce59bb *./data/out.yuv
 850ba6da4c9dad60b6719b0b06b204de *./data/a-mpeg4-rc.avi

diff --git a/tests/regression.sh b/tests/regression.sh
index 04020c7..b93f063 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -24,6 +24,7 @@ else
     do_msmpeg4=y
     do_wmv1=y
     do_h263=y
+    do_h263p=y
     do_mpeg4=y
     do_mjpeg=y
     do_rv10=y
@@ -121,6 +122,16 @@ if [ -n "$do_h263" ] ; then
 file=${outfile}h263.avi
 do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -s 352x288 -an -vcodec h263 $file
 
+# h263 decoding
+do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst 
+fi
+
+###################################
+if [ -n "$do_h263p" ] ; then
+# h263p encoding
+file=${outfile}h263p.avi
+do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -s 352x288 -an -vcodec h263p -ps 1000 $file
+
 # h263p decoding
 do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst 
 fi