From: Michael Niedermayer Date: Sun, 11 Dec 2011 16:44:13 +0000 (+0100) Subject: regressiontest: try mp2 for wtv X-Git-Tag: android-x86-4.4-r1~14505 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a7aa628e9c55f49fce9fd182bb5730153e842410;p=android-x86%2Fexternal-ffmpeg.git regressiontest: try mp2 for wtv our ac3 decoder outputs different things on different platforms. Idea-by: Reimar Signed-off-by: Michael Niedermayer --- diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index ebfc51e59d..f2b2624fea 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -107,7 +107,7 @@ do_lavf mkv "-acodec mp2 -ab 64k -vcodec mpeg4" fi if [ -n "$do_wtv" ] ; then -do_lavf wtv "-acodec ac3_fixed" +do_lavf wtv "-acodec mp2" fi diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv index 593faf92b3..b6de0bbe09 100644 --- a/tests/ref/lavf/wtv +++ b/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -fdcff1719b66a53d65dda5657509df4e *./tests/data/lavf/lavf.wtv +67465437648a122e2d7428c6eb6be718 *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv -./tests/data/lavf/lavf.wtv CRC=0x1d1b8249 +./tests/data/lavf/lavf.wtv CRC=0xebced481 diff --git a/tests/ref/seek/lavf_wtv b/tests/ref/seek/lavf_wtv index d83ec37599..b532e59f4c 100644 --- a/tests/ref/seek/lavf_wtv +++ b/tests/ref/seek/lavf_wtv @@ -1,41 +1,41 @@ -ret: 0 st: 0 flags:1 dts:-0.040000 pts:-0.040000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts:-0.040000 pts:-0.040000 pos: 2144 size: 24801 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st:-1 flags:1 ts: 1.894167 ret: 0 st: 0 flags:0 ts: 0.788334 -ret: 0 st: 1 flags:1 dts: 0.766258 pts: 0.766258 pos: 319832 size: 280 +ret: 0 st: 1 flags:1 dts: 0.783673 pts: 0.783673 pos: 321176 size: 209 ret: 0 st: 0 flags:1 ts:-0.317499 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st: 1 flags:0 ts: 2.576668 ret:-1 st: 1 flags:1 ts: 1.470835 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 1 flags:1 dts: 0.383129 pts: 0.383129 pos: 166792 size: 278 +ret: 0 st: 1 flags:1 dts: 0.365714 pts: 0.365714 pos: 167160 size: 209 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st: 0 flags:0 ts: 2.153336 ret:-1 st: 0 flags:1 ts: 1.047503 ret: 0 st: 1 flags:0 ts:-0.058330 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st: 1 flags:1 ts: 2.835837 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts: 0.626939 pts: 0.626939 pos: 265648 size: 278 +ret: 0 st: 1 flags:1 dts: 0.600816 pts: 0.600816 pos: 266240 size: 209 ret: 0 st: 0 flags:0 ts:-0.481662 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st: 0 flags:1 ts: 2.412505 ret:-1 st: 1 flags:0 ts: 1.306672 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 1 flags:1 dts: 0.208980 pts: 0.208980 pos: 112952 size: 278 +ret: 0 st: 1 flags:1 dts: 0.208980 pts: 0.208980 pos: 113304 size: 209 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st:-1 flags:1 ts: 1.989173 ret: 0 st: 0 flags:0 ts: 0.883340 -ret: 0 st: 1 flags:1 dts: 0.905578 pts: 0.905578 pos: 356520 size: 280 +ret: 0 st: 1 flags:1 dts: 0.888163 pts: 0.888163 pos: 357608 size: 209 ret: 0 st: 0 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801 ret:-1 st: 1 flags:0 ts: 2.671674 ret:-1 st: 1 flags:1 ts: 1.565841 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 1 flags:1 dts: 0.452789 pts: 0.452789 pos: 204864 size: 280 +ret: 0 st: 1 flags:1 dts: 0.444082 pts: 0.444082 pos: 205440 size: 209 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2072 size: 24801 +ret: 0 st: 0 flags:1 dts: NOPTS pts: 0.000000 pos: 2144 size: 24801