From a96b1a903a9f2f7dbec4079415daf5bb4fe2befa Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Mon, 9 Mar 2009 01:10:28 +0000 Subject: correctly interleave audio and video according to specs Originally committed as revision 17892 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/libav.regression.ref | 2 +- tests/seek.regression.ref | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index e4353d0422..43e6443fb9 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -27,7 +27,7 @@ af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov 913b6199765b1dcba196706574621c2f *./tests/data/b-libav.dv 3600000 ./tests/data/b-libav.dv ./tests/data/b-libav.dv CRC=0x7787e173 -d96ed125f8fe64cce77c605f94bf71c7 *./tests/data/b-libav.gxf +8a29994b83b6a00cfc0e0714fcf25705 *./tests/data/b-libav.gxf 806184 ./tests/data/b-libav.gxf ./tests/data/b-libav.gxf CRC=0x9c06676e 66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref index 6baf3d5ff9..07009dd9e1 100644 --- a/tests/seek.regression.ref +++ b/tests/seek.regression.ref @@ -2907,15 +2907,15 @@ ret:-22 st:-1 ts:0.460008 flags:0 ret:-22 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.gxf -ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:940 size:55076 flags:1 +ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:940 size:65536 flags:1 ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:56048 size:65536 flags:1 +ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:66508 size:55076 flags:1 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st: 0 ts:0.780000 flags:0 ret: 0 st: 0 dts:0.800000 pts:-184467440737095520.000000 pos:661548 size:22568 flags:0 ret: 0 st: 0 ts:-0.320000 flags:1 -ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:940 size:55076 flags:1 +ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:940 size:65536 flags:1 ret: 0 st: 1 ts:2.580000 flags:0 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st: 1 ts:1.480000 flags:1 @@ -2923,13 +2923,13 @@ ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 f ret: 0 st: 2 ts:0.360000 flags:0 ret: 0 st: 0 dts:0.360000 pts:-184467440737095520.000000 pos:304084 size:23176 flags:0 ret: 0 st: 2 ts:-0.740000 flags:1 -ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:940 size:55076 flags:1 +ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:940 size:65536 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st: 0 ts:-0.060000 flags:0 -ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:56048 size:65536 flags:1 +ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:66508 size:55076 flags:1 ret: 0 st: 0 ts:2.840000 flags:1 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st: 1 ts:1.740000 flags:0 @@ -2937,7 +2937,7 @@ ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 f ret: 0 st: 1 ts:0.620000 flags:1 ret: 0 st: 0 dts:0.600000 pts:-184467440737095520.000000 pos:476360 size:23728 flags:0 ret: 0 st: 2 ts:-0.480000 flags:0 -ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:56048 size:65536 flags:1 +ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:66508 size:55076 flags:1 ret: 0 st: 2 ts:2.420000 flags:1 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 @@ -2945,13 +2945,13 @@ ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 f ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200000 pts:-184467440737095520.000000 pos:211244 size:20944 flags:0 ret: 0 st: 0 ts:-0.900000 flags:0 -ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:56048 size:65536 flags:1 +ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:66508 size:55076 flags:1 ret: 0 st: 0 ts:1.980000 flags:1 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st: 1 ts:0.880000 flags:0 ret: 0 st: 0 dts:0.880000 pts:-184467440737095520.000000 pos:706964 size:22456 flags:0 ret: 0 st: 1 ts:-0.220000 flags:1 -ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:940 size:55076 flags:1 +ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:940 size:65536 flags:1 ret: 0 st: 2 ts:2.680000 flags:0 ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 flags:1 ret: 0 st: 2 ts:1.560000 flags:1 @@ -2959,7 +2959,7 @@ ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:751848 size:54320 f ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.480000 pts:-184467440737095520.000000 pos:371708 size:53804 flags:1 ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:0.000000 pts:-184467440737095520.000000 pos:940 size:55076 flags:1 +ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:940 size:65536 flags:1 ---------------- tests/data/b-libav.mkv ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:505 size:28088 flags:1 -- cgit v1.2.3