Fix for stream lock updates.

Original commit message from CVS:
* ext/faac/gstfaac.c: (gst_faac_sink_event):
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event):
* gst/tta/gstttaparse.c: (gst_tta_parse_src_event):
Fix for stream lock updates.
This commit is contained in:
Wim Taymans 2005-11-21 17:37:41 +00:00
parent 7bbc4c77bc
commit a1b51acf05
4 changed files with 11 additions and 11 deletions

View file

@ -1,3 +1,10 @@
2005-11-21 Wim Taymans <wim@fluendo.com>
* ext/faac/gstfaac.c: (gst_faac_sink_event):
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event):
* gst/tta/gstttaparse.c: (gst_tta_parse_src_event):
Fix for stream lock updates.
2005-11-21 Tim-Philipp Müller <tim at centricular dot net> 2005-11-21 Tim-Philipp Müller <tim at centricular dot net>
* gst/qtdemux/qtdemux.c: (qtdemux_video_caps): * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):

View file

@ -431,8 +431,6 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event)
{ {
GstBuffer *outbuf; GstBuffer *outbuf;
GST_STREAM_LOCK (pad);
/* flush first */ /* flush first */
ret = TRUE; ret = TRUE;
do { do {
@ -455,18 +453,13 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event)
} while (ret); } while (ret);
ret = gst_pad_event_default (pad, event); ret = gst_pad_event_default (pad, event);
GST_STREAM_UNLOCK (pad);
break; break;
} }
case GST_EVENT_NEWSEGMENT: case GST_EVENT_NEWSEGMENT:
GST_STREAM_LOCK (pad);
ret = gst_pad_push_event (faac->srcpad, event); ret = gst_pad_push_event (faac->srcpad, event);
GST_STREAM_UNLOCK (pad);
break; break;
case GST_EVENT_TAG: case GST_EVENT_TAG:
GST_STREAM_LOCK (pad);
ret = gst_pad_event_default (pad, event); ret = gst_pad_event_default (pad, event);
GST_STREAM_UNLOCK (pad);
break; break;
default: default:
ret = gst_pad_event_default (pad, event); ret = gst_pad_event_default (pad, event);

View file

@ -358,7 +358,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event)
} }
gst_pad_event_default (pad, gst_event_new_flush_start ()); gst_pad_event_default (pad, gst_event_new_flush_start ());
GST_STREAM_LOCK (pad); GST_PAD_STREAM_LOCK (pad);
/* resync to new time */ /* resync to new time */
for (n = 0; n < qtdemux->n_streams; n++) { for (n = 0; n < qtdemux->n_streams; n++) {
@ -378,7 +378,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event)
gst_pad_start_task (qtdemux->sinkpad, gst_pad_start_task (qtdemux->sinkpad,
(GstTaskFunction) gst_qtdemux_loop_header, qtdemux->sinkpad); (GstTaskFunction) gst_qtdemux_loop_header, qtdemux->sinkpad);
GST_STREAM_UNLOCK (pad); GST_PAD_STREAM_UNLOCK (pad);
break; break;
} }
default: default:

View file

@ -187,7 +187,7 @@ gst_tta_parse_src_event (GstPad * pad, GstEvent * event)
} else { } else {
gst_pad_pause_task (ttaparse->sinkpad); gst_pad_pause_task (ttaparse->sinkpad);
} }
GST_STREAM_LOCK (ttaparse->sinkpad); GST_PAD_STREAM_LOCK (ttaparse->sinkpad);
switch (start_type) { switch (start_type) {
case GST_SEEK_TYPE_CUR: case GST_SEEK_TYPE_CUR:
@ -216,7 +216,7 @@ gst_tta_parse_src_event (GstPad * pad, GstEvent * event)
gst_pad_start_task (ttaparse->sinkpad, gst_pad_start_task (ttaparse->sinkpad,
(GstTaskFunction) gst_tta_parse_loop, ttaparse); (GstTaskFunction) gst_tta_parse_loop, ttaparse);
GST_STREAM_UNLOCK (ttaparse->sinkpad); GST_PAD_STREAM_UNLOCK (ttaparse->sinkpad);
} else { } else {
res = FALSE; res = FALSE;