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

playsinkconvertbin: Remove obsolete segment tracking

Browse source 
This is now all handled automatically with sticky events.
This commit is contained in:
Sebastian Dröge 2013-07-23 13:36:09 +02:00
parent f92da706fd
commit 436ea03362
2 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gst/playback/gstplaysinkconvertbin.c
View file

@ -76,25 +76,6 @@ gst_play_sink_convert_bin_post_missing_element_message (GstPlaySinkConvertBin *
gst_element_post_message (GST_ELEMENT_CAST (self), msg); gst_element_post_message (GST_ELEMENT_CAST (self), msg);
} }
static void
distribute_running_time (GstElement * element, const GstSegment * segment)
{
GstEvent *event;
GstPad *pad;
pad = gst_element_get_static_pad (element, "sink");
gst_pad_send_event (pad, gst_event_new_flush_start ());
gst_pad_send_event (pad, gst_event_new_flush_stop (FALSE));
if (segment->format != GST_FORMAT_UNDEFINED) {
event = gst_event_new_segment (segment);
gst_pad_send_event (pad, event);
}
gst_object_unref (pad);
}
void void
gst_play_sink_convert_bin_add_conversion_element (GstPlaySinkConvertBin * self, gst_play_sink_convert_bin_add_conversion_element (GstPlaySinkConvertBin * self,
GstElement * el) GstElement * el)
@ -197,7 +178,6 @@ gst_play_sink_convert_bin_on_element_added (GstElement * element,
GstPlaySinkConvertBin * self) GstPlaySinkConvertBin * self)
{ {
gst_element_sync_state_with_parent (element); gst_element_sync_state_with_parent (element);
distribute_running_time (element, &self->segment);
} }
static GstPadProbeReturn static GstPadProbeReturn
@ -273,25 +253,6 @@ gst_play_sink_convert_bin_sink_event (GstPad * pad, GstObject * parent,
ret = gst_pad_event_default (pad, parent, gst_event_ref (event)); ret = gst_pad_event_default (pad, parent, gst_event_ref (event));
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
GstSegment seg;
GST_PLAY_SINK_CONVERT_BIN_LOCK (self);
gst_event_copy_segment (event, &seg);
GST_DEBUG_OBJECT (self, "Segment before %" GST_SEGMENT_FORMAT,
&self->segment);
self->segment = seg;
GST_DEBUG_OBJECT (self, "Segment after %" GST_SEGMENT_FORMAT,
&self->segment);
GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self);
} else if (GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
GST_PLAY_SINK_CONVERT_BIN_LOCK (self);
GST_DEBUG_OBJECT (self, "Resetting segment");
gst_segment_init (&self->segment, GST_FORMAT_UNDEFINED);
GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self);
}
gst_event_unref (event); gst_event_unref (event);
return ret; return ret;
@ -572,7 +533,6 @@ gst_play_sink_convert_bin_change_state (GstElement * element,
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_PLAY_SINK_CONVERT_BIN_LOCK (self); GST_PLAY_SINK_CONVERT_BIN_LOCK (self);
gst_segment_init (&self->segment, GST_FORMAT_UNDEFINED);
gst_play_sink_convert_bin_set_targets (self, TRUE); gst_play_sink_convert_bin_set_targets (self, TRUE);
self->raw = FALSE; self->raw = FALSE;
GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self); GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self);
@ -588,7 +548,6 @@ gst_play_sink_convert_bin_change_state (GstElement * element,
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_PLAY_SINK_CONVERT_BIN_LOCK (self); GST_PLAY_SINK_CONVERT_BIN_LOCK (self);
gst_segment_init (&self->segment, GST_FORMAT_UNDEFINED);
gst_play_sink_convert_bin_set_targets (self, TRUE); gst_play_sink_convert_bin_set_targets (self, TRUE);
self->raw = FALSE; self->raw = FALSE;
GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self); GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self);
@ -639,7 +598,6 @@ gst_play_sink_convert_bin_init (GstPlaySinkConvertBin * self)
GstPadTemplate *templ; GstPadTemplate *templ;
g_mutex_init (&self->lock); g_mutex_init (&self->lock);
gst_segment_init (&self->segment, GST_FORMAT_UNDEFINED);
templ = gst_static_pad_template_get (&sinktemplate); templ = gst_static_pad_template_get (&sinktemplate);
self->sinkpad = gst_ghost_pad_new_no_target_from_template ("sink", templ); self->sinkpad = gst_ghost_pad_new_no_target_from_template ("sink", templ);

1
gst/playback/gstplaysinkconvertbin.h
View file

@ -66,7 +66,6 @@ struct _GstPlaySinkConvertBin
GstPad *sinkpad, *sink_proxypad; GstPad *sinkpad, *sink_proxypad;
guint sink_proxypad_block_id; guint sink_proxypad_block_id;
GstSegment segment;
GstPad *srcpad; GstPad *srcpad;