mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gststreamselector.*: Revert change that caused regression until a real fix is found.

Browse source 
Original commit message from CVS:
* gst/playback/gststreamselector.c: (gst_selector_pad_event),
(gst_selector_pad_chain):
* gst/playback/gststreamselector.h:
Revert change that caused regression until a real fix is found.
Fixes #522203.
This commit is contained in:
Wim Taymans 2008-03-14 09:54:44 +00:00
parent 15e209d20e
commit 4803dd99e5
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-03-14 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/playback/gststreamselector.c: (gst_selector_pad_event),
(gst_selector_pad_chain):
* gst/playback/gststreamselector.h:
Revert change that caused regression until a real fix is found.
Fixes #522203.
2008-03-12 Michael Smith <msmith@fluendo.com> 2008-03-12 Michael Smith <msmith@fluendo.com>
* gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_parse_caps): * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_parse_caps):

11
gst/playback/gststreamselector.c
View file

@ -282,10 +282,10 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
gst_segment_set_newsegment_full (&selpad->segment, update, gst_segment_set_newsegment_full (&selpad->segment, update,
rate, arate, format, start, stop, time); rate, arate, format, start, stop, time);
/* mark pending segment if we are not forwarding, we assume all pads share /* if we are not going to forward the segment, mark the segment as
* the same segment so we only forward once. */ * pending */
if (!forward) if (!forward)
sel->segment_pending = TRUE; selpad->segment_pending = TRUE;
break; break;
} }
case GST_EVENT_TAG: case GST_EVENT_TAG:
@ -407,12 +407,12 @@ gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
goto ignore; goto ignore;
/* if we have a pending segment, push it out now */ /* if we have a pending segment, push it out now */
if (sel->segment_pending) { if (selpad->segment_pending) {
gst_pad_push_event (sel->srcpad, gst_event_new_new_segment_full (FALSE, gst_pad_push_event (sel->srcpad, gst_event_new_new_segment_full (FALSE,
seg->rate, seg->applied_rate, seg->format, seg->start, seg->stop, seg->rate, seg->applied_rate, seg->format, seg->start, seg->stop,
seg->time)); seg->time));
sel->segment_pending = FALSE; selpad->segment_pending = FALSE;
} }
/* forward */ /* forward */
@ -431,7 +431,6 @@ ignore:
res = GST_FLOW_NOT_LINKED; res = GST_FLOW_NOT_LINKED;
goto done; goto done;
} }
} }
static void gst_stream_selector_dispose (GObject * object); static void gst_stream_selector_dispose (GObject * object);

1
gst/playback/gststreamselector.h
View file

@ -49,7 +49,6 @@ struct _GstStreamSelector {
guint padcount; guint padcount;
GstSegment segment; GstSegment segment;
gboolean segment_pending;
}; };
struct _GstStreamSelectorClass { struct _GstStreamSelectorClass {