Remove mp4psp regression test

The PSP MP4 format requires an AAC audio stream, so until
we have an AAC encoder we cannot test this format.

The existing test is broken and does not actually use the
PSP format.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12359 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/Makefile b/Makefile
index 3551543a6355156fbb9e614008145031d76a303f..f0d37222c84e0307fc6c107b7d71347fcecbff6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,6 @@ CODEC_TESTS = $(addprefix regtest-,             \
         rc                                      \
         mpeg4adv                                \
         mpeg4thread                             \
-        mp4psp                                  \
         error                                   \
         mpeg4nr                                 \
         mpeg1b                                  \

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index f175eb562dc90f8dfc84af74f8794fc986e74e57..790d44570f7de95ffc8c58560a09e33e64b43eb1 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -90,8 +90,6 @@ stddev:  5.61 PSNR:33.13 bytes:7602176
 778604 ./tests/data/a-mpeg4-thread.avi
 152d46da2a9d7fa3c22c56767c1760db *./tests/data/mpeg4thread.vsynth.out.yuv
 stddev: 10.26 PSNR:27.89 bytes:7602176
-743cf18c1e8941591f8ab41350247c42 *./tests/data/a-mpeg4-PSP.mp4
-406441 ./tests/data/a-mpeg4-PSP.mp4
 7315281e07830456208dff61337c982b *./tests/data/a-error-mpeg4-adv.avi
 731526 ./tests/data/a-error-mpeg4-adv.avi
 6ce2c82a0a9cf67a6991694473e9a306 *./tests/data/error.vsynth.out.yuv

diff --git a/tests/regression.sh b/tests/regression.sh
index cbbeda0a791ff51219850762b468936b24b9b79a..999152c0d16730ad95f474d89ae39ea1fc5d4abe 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -286,10 +286,6 @@ do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic+trell -mbd bits
 do_video_decoding
 fi
 
-if [ -n "$do_mp4psp" ] ; then
-do_video_encoding mpeg4-PSP.mp4 "-vb 768k -s 320x240" psp "-ar 24000 -ab 32k -i $raw_src"
-fi
-
 if [ -n "$do_error" ] ; then
 do_video_encoding error-mpeg4-adv.avi "-qscale 7 -flags +mv4+part+aic -mbd rd -ps 250 -error 10" pgmyuv "-an -vcodec mpeg4"
 do_video_decoding

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 2f1b2b74d1850d2982640575b350b2248fb965ac..bb0895bb26b8dfa28f97de8e5f3a7adca861f9f5 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -90,8 +90,6 @@ stddev:  4.00 PSNR:36.08 bytes:7602176
 250162 ./tests/data/a-mpeg4-thread.avi
 58165c879707aedeab460bab86dae4ef *./tests/data/mpeg4thread.rotozoom.out.yuv
 stddev:  3.73 PSNR:36.67 bytes:7602176
-6cd200bf844fd1c0e48c23d542a860e8 *./tests/data/a-mpeg4-PSP.mp4
-324998 ./tests/data/a-mpeg4-PSP.mp4
 90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/a-error-mpeg4-adv.avi
 176588 ./tests/data/a-error-mpeg4-adv.avi
 113defd3f8daf878e0b3fc03fafb4c09 *./tests/data/error.rotozoom.out.yuv

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 96c5cc7c5fac150fcddcfd53e735f66f98487ce3..f750a5c17917556eaca65cfc5fe8a21149a39f83 100644 (file)
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -1568,54 +1568,6 @@ ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79182 size:10791 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
-tests/data/a-mpeg4-PSP.mp4
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
-ret: 0 st:-1 ts:-1.000000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
-ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:242961 size:21719 flags:1
-ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:179481 size:19311 flags:1
-ret:-1 st: 0 ts:-0.320000 flags:1
-ret:-1 st:-1 ts:2.576668 flags:0
-ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:242961 size:21719 flags:1
-ret: 0 st: 0 ts:0.360000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:108454 size:21469 flags:1
-ret:-1 st: 0 ts:-0.760000 flags:1
-ret:-1 st:-1 ts:2.153336 flags:0
-ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:179481 size:19311 flags:1
-ret: 0 st: 0 ts:-0.040000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
-ret: 0 st: 0 ts:2.840000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:302824 size:18559 flags:1
-ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:302824 size:18559 flags:1
-ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:108454 size:21469 flags:1
-ret: 0 st: 0 ts:-0.480000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
-ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:302824 size:18559 flags:1
-ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:242961 size:21719 flags:1
-ret: 0 st:-1 ts:0.200839 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
-ret: 0 st: 0 ts:-0.920000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:17075 flags:1
-ret: 0 st: 0 ts:2.000000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:302824 size:18559 flags:1
-ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:179481 size:19311 flags:1
-ret:-1 st:-1 ts:-0.222493 flags:1
-ret:-1 st: 0 ts:2.680000 flags:0
-ret: 0 st: 0 ts:1.560000 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:242961 size:21719 flags:1
-ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:108454 size:21469 flags:1
-ret:-1 st:-1 ts:-0.645825 flags:1
-----------------
 tests/data/a-mpeg4-Q.avi
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:11942 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0