mxf and mxf d10 regression tests

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

diff --git a/Makefile b/Makefile
index c2ec16dbf69c9f421f64fc490e03d988416726d7..52401514d93f0ca1ec531d7f1fa937d0448d11eb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,6 +193,7 @@ LAVF_TESTS = $(addprefix regtest-,              \
         asf                                     \
         rm                                      \
         mpg                                     \
+        mxf                                     \
         ts                                      \
         swf                                     \
         ffm                                     \

diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 05a225c3f83ac6fd86e39feab4112c341892267f..27c2f38a101257d627f3701ace8010e43e097701 100644 (file)
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -9,6 +9,12 @@ c351132527ccb1e8cab06cc0822fde23 *./tests/data/b-libav.rm
 bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg
 378880 ./tests/data/b-libav.mpg
 ./tests/data/b-libav.mpg CRC=0x2b71a386
+ece97d012890ba7f2371246a5f245561 *./tests/data/b-libav.mxf
+535097 ./tests/data/b-libav.mxf
+./tests/data/b-libav.mxf CRC=0xd7ff387d
+89fe0716dee263dd0f52b2d49ad87d38 *./tests/data/b-libav.mxf_d10
+5330989 ./tests/data/b-libav.mxf_d10
+./tests/data/b-libav.mxf_d10 CRC=0xd241c8b6
 c0cc2ae4df6a8b3df84986929a393116 *./tests/data/b-libav.ts
 471316 ./tests/data/b-libav.ts
 ./tests/data/b-libav.ts CRC=0xcc4948e1

diff --git a/tests/regression.sh b/tests/regression.sh
index 529a7036fb7bf159d2890958735631766f64011b..f79df2d8422cb79315e10f79398ca8533a301b98 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -499,6 +499,11 @@ if [ -n "$do_mpg" ] ; then
 do_libav mpg
 fi
 
+if [ -n "$do_mxf" ] ; then
+do_libav mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
+do_libav mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -padtop 32 -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -sws_flags +full_chroma_inp+full_chroma_int+accurate_rnd -f mxf_d10"
+fi
+
 if [ -n "$do_ts" ] ; then
 do_libav ts
 fi

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 6a96cf83396a4536e55e34ee3517cda3296cd48d..06e539db5188b419317747f5489e8182afdc9373 100644 (file)
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -3150,6 +3150,116 @@ ret: 0 st: 0 dts:0.500000 pts:0.540000 pos:-1 size:16335 flags:0
 ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ----------------
+tests/data/b-libav.mxf
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st:-1 ts:-1.000000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st:-1 ts:1.894167 flags:1
+ret:-1
+ret: 0 st: 0 ts:0.800000 flags:0
+ret:-1
+ret: 0 st: 0 ts:-0.320000 flags:1
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st: 1 ts:2.560000 flags:0
+ret:-1
+ret: 0 st: 1 ts:1.480000 flags:1
+ret:-1
+ret: 0 st:-1 ts:0.365002 flags:0
+ret: 0 st: 0 dts:0.360000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st:-1 ts:-0.740831 flags:1
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st: 0 ts:2.160000 flags:0
+ret:-1
+ret: 0 st: 0 ts:1.040000 flags:1
+ret:-1
+ret: 0 st: 1 ts:-0.040000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st: 1 ts:2.840000 flags:1
+ret:-1
+ret: 0 st:-1 ts:1.730004 flags:0
+ret:-1
+ret: 0 st:-1 ts:0.624171 flags:1
+ret:-1
+ret: 0 st: 0 ts:-0.480000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st: 0 ts:2.400000 flags:1
+ret:-1
+ret: 0 st: 1 ts:1.320000 flags:0
+ret:-1
+ret: 0 st: 1 ts:0.200000 flags:1
+ret: 0 st: 0 dts:0.200000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st:-1 ts:-0.904994 flags:0
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st:-1 ts:1.989173 flags:1
+ret:-1
+ret: 0 st: 0 ts:0.880000 flags:0
+ret:-1
+ret: 0 st: 0 ts:-0.240000 flags:1
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st: 1 ts:2.680000 flags:0
+ret:-1
+ret: 0 st: 1 ts:1.560000 flags:1
+ret:-1
+ret: 0 st:-1 ts:0.460008 flags:0
+ret: 0 st: 0 dts:0.480000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+ret: 0 st:-1 ts:-0.645825 flags:1
+ret: 0 st: 0 dts:0.000000 pts:-368934881474191040.000000 pos:6144 size:24921 flags:1
+----------------
+tests/data/b-libav.mxf_d10
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st:-1 ts:-1.000000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st:-1 ts:1.894167 flags:1
+ret:-1
+ret: 0 st: 0 ts:0.800000 flags:0
+ret:-1
+ret: 0 st: 0 ts:-0.320000 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st: 1 ts:2.560000 flags:0
+ret:-1
+ret: 0 st: 1 ts:1.480000 flags:1
+ret:-1
+ret: 0 st:-1 ts:0.365002 flags:0
+ret: 0 st: 0 dts:0.360000 pts:0.360000 pos:6144 size:150000 flags:1
+ret: 0 st:-1 ts:-0.740831 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st: 0 ts:2.160000 flags:0
+ret:-1
+ret: 0 st: 0 ts:1.040000 flags:1
+ret:-1
+ret: 0 st: 1 ts:-0.040000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st: 1 ts:2.840000 flags:1
+ret:-1
+ret: 0 st:-1 ts:1.730004 flags:0
+ret:-1
+ret: 0 st:-1 ts:0.624171 flags:1
+ret:-1
+ret: 0 st: 0 ts:-0.480000 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st: 0 ts:2.400000 flags:1
+ret:-1
+ret: 0 st: 1 ts:1.320000 flags:0
+ret:-1
+ret: 0 st: 1 ts:0.200000 flags:1
+ret: 0 st: 0 dts:0.200000 pts:0.200000 pos:6144 size:150000 flags:1
+ret: 0 st:-1 ts:-0.904994 flags:0
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st:-1 ts:1.989173 flags:1
+ret:-1
+ret: 0 st: 0 ts:0.880000 flags:0
+ret:-1
+ret: 0 st: 0 ts:-0.240000 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+ret: 0 st: 1 ts:2.680000 flags:0
+ret:-1
+ret: 0 st: 1 ts:1.560000 flags:1
+ret:-1
+ret: 0 st:-1 ts:0.460008 flags:0
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:6144 size:150000 flags:1
+ret: 0 st:-1 ts:-0.645825 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:6144 size:150000 flags:1
+----------------
 tests/data/b-libav.nut
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0