[FFmpeg-cvslog] r21604 - in trunk: libavformat/mpeg.c tests/seek.regression.ref

michael subversion
Tue Feb 2 17:47:51 CET 2010


Author: michael
Date: Tue Feb  2 17:47:51 2010
New Revision: 21604

Log:
Set AVPacket.pos in MPEG-PS demuxer.

Modified:
   trunk/libavformat/mpeg.c
   trunk/tests/seek.regression.ref

Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c	Tue Feb  2 17:01:22 2010	(r21603)
+++ trunk/libavformat/mpeg.c	Tue Feb  2 17:47:51 2010	(r21604)
@@ -557,6 +557,7 @@ static int mpegps_read_packet(AVFormatCo
     get_buffer(s->pb, pkt->data, pkt->size);
     pkt->pts = pts;
     pkt->dts = dts;
+    pkt->pos = dummy_pos;
     pkt->stream_index = st->index;
 #if 0
     av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",

Modified: trunk/tests/seek.regression.ref
==============================================================================
--- trunk/tests/seek.regression.ref	Tue Feb  2 17:01:22 2010	(r21603)
+++ trunk/tests/seek.regression.ref	Tue Feb  2 17:47:51 2010	(r21604)
@@ -3157,59 +3157,59 @@ ret: 0         st:-1 flags:1  ts:-0.6458
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
 ----------------
 tests/data/b-lavf.mpg
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos:     -1 size:   681
+ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos: 339968 size:   681
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 1 flags:1 dts: 0.761222 pts: 0.761222 pos:     -1 size:   261
+ret: 0         st: 1 flags:1 dts: 0.761222 pts: 0.761222 pos: 145408 size:   261
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos:     -1 size:   235
+ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos: 370700 size:   235
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 1 flags:1 dts: 1.283678 pts: 1.283678 pos:     -1 size:   379
+ret: 0         st: 1 flags:1 dts: 1.283678 pts: 1.283678 pos: 368652 size:   379
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st: 0 flags:0  ts: 2.153333
-ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos:     -1 size:   681
+ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos: 339968 size:   681
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 0 flags:0 dts: 1.020000 pts: 1.060000 pos:     -1 size: 16484
+ret: 0         st: 0 flags:0 dts: 1.020000 pts: 1.060000 pos: 212992 size: 16484
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos:     -1 size:   235
+ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos: 370700 size:   235
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos:     -1 size:   681
+ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos: 339968 size:   681
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:0 dts: 0.620000 pts: 0.660000 pos:     -1 size: 15804
+ret: 0         st: 0 flags:0 dts: 0.620000 pts: 0.660000 pos:  67584 size: 15804
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos:     -1 size:   681
+ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos: 339968 size:   681
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos:     -1 size:   235
+ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos: 370700 size:   235
 ret: 0         st: 1 flags:1  ts: 0.200844
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos:     -1 size:   681
+ret: 0         st: 0 flags:1 dts: 1.420000 pts: 1.460000 pos: 339968 size:   681
 ret: 0         st: 0 flags:0  ts: 0.883344
-ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos:     -1 size: 12809
+ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 159744 size: 12809
 ret: 0         st: 0 flags:1  ts:-0.222489
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ret: 0         st: 1 flags:0  ts: 2.671678
-ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos:     -1 size:   235
+ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos: 370700 size:   235
 ret: 0         st: 1 flags:1  ts: 1.565844
-ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos:     -1 size:   235
+ret: 0         st: 1 flags:1 dts: 1.518778 pts: 1.518778 pos: 370700 size:   235
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:0 dts: 0.500000 pts: 0.540000 pos:     -1 size: 16303
+ret: 0         st: 0 flags:0 dts: 0.500000 pts: 0.540000 pos:  26624 size: 16303
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.500000 pts: 0.500000 pos:   2048 size:   208
 ----------------
 tests/data/b-lavf.mxf
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   6144 size: 24801



More information about the ffmpeg-cvslog mailing list