mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: Send close newsegment event from the streaming thread

Browse source
This commit is contained in:
Sebastian Dröge 2010-08-12 11:49:47 +02:00
parent 62dd7c4efd
commit 44a5cb4313
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/avi/gstavidemux.c
View file

@ -289,6 +289,10 @@ gst_avi_demux_reset (GstAviDemux * avi)
gst_object_unref (avi->element_index); gst_object_unref (avi->element_index);
avi->element_index = NULL; avi->element_index = NULL;
if (avi->close_seg_event) {
gst_event_unref (avi->close_seg_event);
avi->close_seg_event = NULL;
}
if (avi->seg_event) { if (avi->seg_event) {
gst_event_unref (avi->seg_event); gst_event_unref (avi->seg_event);
avi->seg_event = NULL; avi->seg_event = NULL;
@ -3932,7 +3936,7 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
GstAviStream *stream; GstAviStream *stream;
seek_time = segment->last_stop; seek_time = segment->last_stop;
keyframe = !!(segment->flags & GST_SEEK_FLAG_KEY_UNIT); keyframe = ! !(segment->flags & GST_SEEK_FLAG_KEY_UNIT);
GST_DEBUG_OBJECT (avi, "seek to: %" GST_TIME_FORMAT GST_DEBUG_OBJECT (avi, "seek to: %" GST_TIME_FORMAT
" keyframe seeking:%d", GST_TIME_ARGS (seek_time), keyframe); " keyframe seeking:%d", GST_TIME_ARGS (seek_time), keyframe);
@ -4077,6 +4081,7 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event)
* actually never fails. */ * actually never fails. */
gst_avi_demux_do_seek (avi, &seeksegment); gst_avi_demux_do_seek (avi, &seeksegment);
gst_event_replace (&avi->close_seg_event, NULL);
if (flush) { if (flush) {
GstEvent *fevent = gst_event_new_flush_stop (); GstEvent *fevent = gst_event_new_flush_stop ();
@ -4084,16 +4089,13 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event)
gst_avi_demux_push_event (avi, gst_event_ref (fevent)); gst_avi_demux_push_event (avi, gst_event_ref (fevent));
gst_pad_push_event (avi->sinkpad, fevent); gst_pad_push_event (avi->sinkpad, fevent);
} else if (avi->segment_running) { } else if (avi->segment_running) {
GstEvent *seg;
/* we are running the current segment and doing a non-flushing seek, /* we are running the current segment and doing a non-flushing seek,
* close the segment first based on the last_stop. */ * close the segment first based on the last_stop. */
GST_DEBUG_OBJECT (avi, "closing running segment %" G_GINT64_FORMAT GST_DEBUG_OBJECT (avi, "closing running segment %" G_GINT64_FORMAT
" to %" G_GINT64_FORMAT, avi->segment.start, avi->segment.last_stop); " to %" G_GINT64_FORMAT, avi->segment.start, avi->segment.last_stop);
seg = gst_event_new_new_segment_full (TRUE, avi->close_seg_event = gst_event_new_new_segment_full (TRUE,
avi->segment.rate, avi->segment.applied_rate, avi->segment.format, avi->segment.rate, avi->segment.applied_rate, avi->segment.format,
avi->segment.start, avi->segment.last_stop, avi->segment.time); avi->segment.start, avi->segment.last_stop, avi->segment.time);
gst_avi_demux_push_event (avi, seg);
} }
/* now update the real segment info */ /* now update the real segment info */
@ -4200,7 +4202,7 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
gst_segment_set_seek (&seeksegment, rate, format, flags, gst_segment_set_seek (&seeksegment, rate, format, flags,
cur_type, cur, stop_type, stop, &update); cur_type, cur, stop_type, stop, &update);
keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT); keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
cur = seeksegment.last_stop; cur = seeksegment.last_stop;
GST_DEBUG_OBJECT (avi, GST_DEBUG_OBJECT (avi,
@ -5078,6 +5080,10 @@ gst_avi_demux_loop (GstPad * pad)
avi->state = GST_AVI_DEMUX_MOVI; avi->state = GST_AVI_DEMUX_MOVI;
break; break;
case GST_AVI_DEMUX_MOVI: case GST_AVI_DEMUX_MOVI:
if (G_UNLIKELY (avi->close_seg_event)) {
gst_avi_demux_push_event (avi, avi->close_seg_event);
avi->close_seg_event = NULL;
}
if (G_UNLIKELY (avi->seg_event)) { if (G_UNLIKELY (avi->seg_event)) {
gst_avi_demux_push_event (avi, avi->seg_event); gst_avi_demux_push_event (avi, avi->seg_event);
avi->seg_event = NULL; avi->seg_event = NULL;
@ -5177,6 +5183,10 @@ gst_avi_demux_chain (GstPad * pad, GstBuffer * buf)
} }
break; break;
case GST_AVI_DEMUX_MOVI: case GST_AVI_DEMUX_MOVI:
if (G_UNLIKELY (avi->close_seg_event)) {
gst_avi_demux_push_event (avi, avi->close_seg_event);
avi->close_seg_event = NULL;
}
if (G_UNLIKELY (avi->seg_event)) { if (G_UNLIKELY (avi->seg_event)) {
gst_avi_demux_push_event (avi, avi->seg_event); gst_avi_demux_push_event (avi, avi->seg_event);
avi->seg_event = NULL; avi->seg_event = NULL;

1
gst/avi/gstavidemux.h
View file

@ -178,6 +178,7 @@ typedef struct _GstAviDemux {
/* pending tags/events */ /* pending tags/events */
GstEvent *seg_event; GstEvent *seg_event;
GstEvent *close_seg_event;
GstTagList *globaltags; GstTagList *globaltags;
gboolean got_tags; gboolean got_tags;