4 months of hard development and finally it's done. Closes issue 58. Adpcm_swf regres...

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

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index b648609e4894a73c796cea27a636767915fc55ef..73b0beb3558820010403beeda476cab31de1ef6c 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -188,6 +188,10 @@ ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
 264248 ./tests/data/a-adpcm_yam.wav
 e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/out.wav
 stddev:18312.68 PSNR:11.06 bytes:1056768
+de1122d20d56c44cf49f028e25a67788 *./tests/data/a-adpcm_swf.flv
+267073 ./tests/data/a-adpcm_swf.flv
+e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/out.wav
+stddev:934.30 PSNR:36.91 bytes:1056768
 c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
 353368 ./tests/data/a-flac.flac
 c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav

diff --git a/tests/regression.sh b/tests/regression.sh
index 98b88b93729ae27340e4da35fd520c6c47a2666a..3064b908f850b35977031cf090b1cc8d15152cfc 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -88,6 +88,7 @@ else
     do_dv=y
     do_dv50=y
     do_flashsv=y
+    do_adpcm_swf=y
 fi
 
 
@@ -563,6 +564,13 @@ do_audio_encoding adpcm_yam.wav "-ar 44100" "-acodec adpcm_yamaha"
 do_audio_decoding
 fi
 
+###################################
+if [ -n "$do_adpcm_swf" ] ; then
+# adpcm adpcm_swf
+do_audio_encoding adpcm_swf.flv "-ar 44100" "-acodec adpcm_swf"
+do_audio_decoding
+fi
+
 ###################################
 if [ -n "$do_flac" ] ; then
 # flac

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index d6396f38b3b6b11c767b1663693063262e6a1842..7cfed6462f7fe3e97388288ebefe3f9a2eca8394 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -188,6 +188,10 @@ ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
 264248 ./tests/data/a-adpcm_yam.wav
 e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/out.wav
 stddev:18312.68 PSNR:11.06 bytes:1056768
+de1122d20d56c44cf49f028e25a67788 *./tests/data/a-adpcm_swf.flv
+267073 ./tests/data/a-adpcm_swf.flv
+e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/out.wav
+stddev:934.30 PSNR:36.91 bytes:1056768
 c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
 353368 ./tests/data/a-flac.flac
 c4228df189aad9567a037727d0e763e4 *./tests/data/out.wav

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 617e68e67356b6fd7ee58afe03bb4ec12180dbba..9c94d20e435748d7b12490c286392a30ff5760fa 100644 (file)
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -150,6 +150,57 @@ ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8248 size:4096 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41016 size:4096 flags:1
 ----------------
+tests/data/a-adpcm_swf.flv
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
+ret: 0 st:-1 ts:-1.000000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
+ret: 0 st:-1 ts:1.894167 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
+ret: 0 st: 0 ts:0.788000 flags:0
+ret: 0 st: 0 dts:0.789000 pts:0.789000 pos:35357 size:2053 flags:1
+ret:-1 st: 0 ts:-0.317000 flags:1
+ret: 0 st:-1 ts:2.576668 flags:0
+ret: 0 st: 0 dts:2.601000 pts:2.601000 pos:116048 size:2053 flags:1
+ret: 0 st:-1 ts:1.470835 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:64323 size:2053 flags:1
+ret: 0 st: 0 ts:0.365000 flags:0
+ret: 0 st: 0 dts:0.372000 pts:0.372000 pos:16736 size:2053 flags:1
+ret:-1 st: 0 ts:-0.741000 flags:1
+ret: 0 st:-1 ts:2.153336 flags:0
+ret: 0 st: 0 dts:2.183000 pts:2.183000 pos:97427 size:2053 flags:1
+ret: 0 st:-1 ts:1.047503 flags:1
+ret: 0 st: 0 dts:1.022000 pts:1.022000 pos:45702 size:2053 flags:1
+ret: 0 st: 0 ts:-0.058000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
+ret: 0 st: 0 ts:2.836000 flags:1
+ret: 0 st: 0 dts:2.601000 pts:2.601000 pos:116048 size:2053 flags:1
+ret: 0 st:-1 ts:1.730004 flags:0
+ret: 0 st: 0 dts:1.765000 pts:1.765000 pos:78806 size:2053 flags:1
+ret: 0 st:-1 ts:0.624171 flags:1
+ret: 0 st: 0 dts:0.604000 pts:0.604000 pos:27081 size:2053 flags:1
+ret: 0 st: 0 ts:-0.482000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
+ret: 0 st: 0 ts:2.413000 flags:1
+ret: 0 st: 0 dts:2.368000 pts:2.368000 pos:105703 size:2053 flags:1
+ret: 0 st:-1 ts:1.306672 flags:0
+ret: 0 st: 0 dts:1.347000 pts:1.347000 pos:60185 size:2053 flags:1
+ret: 0 st:-1 ts:0.200839 flags:1
+ret: 0 st: 0 dts:0.186000 pts:0.186000 pos:8460 size:2053 flags:1
+ret: 0 st: 0 ts:-0.905000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
+ret: 0 st: 0 ts:1.989000 flags:1
+ret: 0 st: 0 dts:1.950000 pts:1.950000 pos:87082 size:2053 flags:1
+ret: 0 st:-1 ts:0.883340 flags:0
+ret: 0 st: 0 dts:0.929000 pts:0.929000 pos:41564 size:2053 flags:1
+ret:-1 st:-1 ts:-0.222493 flags:1
+ret: 0 st: 0 ts:2.672000 flags:0
+ret: 0 st: 0 dts:2.694000 pts:2.694000 pos:120186 size:2053 flags:1
+ret: 0 st: 0 ts:1.566000 flags:1
+ret: 0 st: 0 dts:1.533000 pts:1.533000 pos:68461 size:2053 flags:1
+ret: 0 st:-1 ts:0.460008 flags:0
+ret: 0 st: 0 dts:0.464000 pts:0.464000 pos:20874 size:2053 flags:1
+ret:-1 st:-1 ts:-0.645825 flags:1
+----------------
 tests/data/a-adpcm_yam.wav
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0