From: <bi...@ke...> - 2006-08-30 11:27:55
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: bilboed Date: Wed Aug 30 2006 11:27:52 UTC Log message: * gst/qtdemux/qtdemux.c: (gst_qtdemux_do_seek): Reset each streams last_flow to GST_FLOW_OK. (gst_qtdemux_activate_segment): Removing mystic modifications for good. Modified files: . : ChangeLog gst/qtdemux : qtdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2226&r2=1.2227 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtdemux/qtdemux.c.diff?r1=1.164&r2=1.165 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2226 retrieving revision 1.2227 diff -u -d -r1.2226 -r1.2227 --- ChangeLog 30 Aug 2006 11:07:37 -0000 1.2226 +++ ChangeLog 30 Aug 2006 11:27:40 -0000 1.2227 @@ -1,3 +1,11 @@ +2006-08-30 Edward Hervey <ed...@fl...> + + * gst/qtdemux/qtdemux.c: + (gst_qtdemux_do_seek): + Reset each streams last_flow to GST_FLOW_OK. + (gst_qtdemux_activate_segment): + Removing mystic modifications for good. 2006-08-30 Stefan Kost <en...@us...> * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), Index: qtdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtdemux/qtdemux.c,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- qtdemux.c 30 Aug 2006 11:07:37 -0000 1.164 +++ qtdemux.c 30 Aug 2006 11:27:40 -0000 1.165 @@ -753,6 +753,7 @@ gboolean res; gboolean update; GstSegment seeksegment; + int i; if (event) { GST_DEBUG_OBJECT (qtdemux, "doing seek with event"); @@ -843,6 +844,9 @@ /* restart streaming, NEWSEGMENT will be sent from the streaming * thread. */ qtdemux->segment_running = TRUE; + for (i = 0; i < qtdemux->n_streams; i++) { + qtdemux->streams[i]->last_ret = GST_FLOW_OK; + } gst_pad_start_task (qtdemux->sinkpad, (GstTaskFunction) gst_qtdemux_loop, qtdemux->sinkpad); @@ -1088,7 +1092,7 @@ stop = segment->media_stop; else stop = MIN (segment->media_stop, qtdemux->segment.stop); - start = segment->media_start + seg_time; + start = MIN (segment->media_start + seg_time, stop); GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx, |