summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/dv/gstdvdemux.c12
-rw-r--r--ext/flac/gstflacdec.c11
-rw-r--r--ext/flac/gstflacenc.c6
-rw-r--r--ext/ladspa/gstsignalprocessor.c22
4 files changed, 2 insertions, 49 deletions
diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c
index 1408df8f..3786f522 100644
--- a/ext/dv/gstdvdemux.c
+++ b/ext/dv/gstdvdemux.c
@@ -596,25 +596,16 @@ gst_dvdemux_handle_sink_event (GstPad * pad, GstEvent * event)
* to the peer which will be unblocked by forwarding the
* event.*/
res = gst_dvdemux_send_event (dvdemux, event);
-
- /* and wait till streaming stops, not strictly needed as
- * the peer calling us will do the same. */
- GST_STREAM_LOCK (pad);
- GST_STREAM_UNLOCK (pad);
break;
case GST_EVENT_FLUSH_STOP:
- GST_STREAM_LOCK (pad);
gst_adapter_clear (dvdemux->adapter);
GST_DEBUG ("cleared adapter");
res = gst_dvdemux_send_event (dvdemux, event);
- GST_STREAM_UNLOCK (pad);
break;
case GST_EVENT_NEWSEGMENT:
{
GstFormat format;
- GST_STREAM_LOCK (pad);
-
/* parse byte start and stop positions */
gst_event_parse_newsegment (event, NULL, NULL, &format,
&dvdemux->start_byte, &dvdemux->stop_byte, NULL);
@@ -622,19 +613,16 @@ gst_dvdemux_handle_sink_event (GstPad * pad, GstEvent * event)
/* and queue a DISCONT before sending the next set of buffers */
dvdemux->need_discont = TRUE;
gst_event_unref (event);
- GST_STREAM_UNLOCK (pad);
break;
}
case GST_EVENT_EOS:
default:
- GST_STREAM_LOCK (pad);
/* flush any pending data */
gst_dvdemux_flush (dvdemux);
/* forward event */
res = gst_dvdemux_send_event (dvdemux, event);
/* and clear the adapter */
gst_adapter_clear (dvdemux->adapter);
- GST_STREAM_UNLOCK (pad);
break;
}
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index c609e2e5..af2c8dc6 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -527,8 +527,6 @@ gst_flacdec_loop (GstPad * sinkpad)
flacdec = GST_FLACDEC (GST_OBJECT_PARENT (sinkpad));
- GST_STREAM_LOCK (sinkpad);
-
GST_DEBUG ("flacdec: entering loop");
if (flacdec->init) {
GST_DEBUG ("flacdec: initializing decoder");
@@ -563,7 +561,6 @@ analyze_state:
case FLAC__SEEKABLE_STREAM_DECODER_OK:
case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:
GST_DEBUG ("flacdec: everything ok");
- GST_STREAM_UNLOCK (sinkpad);
return;
case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:{
@@ -577,8 +574,6 @@ analyze_state:
GST_DEBUG ("pausing");
gst_pad_pause_task (sinkpad);
-
- GST_STREAM_UNLOCK (sinkpad);
return;
}
@@ -602,8 +597,6 @@ analyze_state:
GST_DEBUG ("pausing");
gst_pad_pause_task (sinkpad);
-
- GST_STREAM_UNLOCK (sinkpad);
return;
}
}
@@ -765,7 +758,7 @@ gst_flacdec_src_event (GstPad * pad, GstEvent * event)
GST_DEBUG ("Initializing seek");
g_print ("Grab seek lock\n");
gst_pad_push_event (flacdec->srcpad, gst_event_new_flush_start ());
- GST_STREAM_LOCK (flacdec->sinkpad);
+ GST_PAD_STREAM_LOCK (flacdec->sinkpad);
g_print ("Got seek lock\n");
gst_pad_push_event (flacdec->srcpad, gst_event_new_flush_stop ());
GST_DEBUG ("Ready");
@@ -773,7 +766,7 @@ gst_flacdec_src_event (GstPad * pad, GstEvent * event)
flacdec->seek_value = pos;
gst_pad_start_task (flacdec->sinkpad,
(GstTaskFunction) gst_flacdec_loop, flacdec->sinkpad);
- GST_STREAM_UNLOCK (flacdec->sinkpad);
+ GST_PAD_STREAM_UNLOCK (flacdec->sinkpad);
} else
res = FALSE;
break;
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 79f3de0b..360ff67b 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -600,7 +600,6 @@ gst_flacenc_sink_event (GstPad * pad, GstEvent * event)
GstFormat format;
gint64 start, stream_time;
- GST_STREAM_LOCK (pad);
if (flacenc->offset == 0) {
gst_event_parse_newsegment (event, NULL, NULL, &format, &start, NULL,
&stream_time);
@@ -623,14 +622,11 @@ gst_flacenc_sink_event (GstPad * pad, GstEvent * event)
}
gst_event_unref (event);
/* don't push it downstream, we'll generate our own via seek to 0 */
- GST_STREAM_UNLOCK (pad);
break;
}
case GST_EVENT_EOS:
- GST_STREAM_LOCK (pad);
FLAC__seekable_stream_encoder_finish (flacenc->encoder);
ret = gst_pad_event_default (pad, event);
- GST_STREAM_UNLOCK (pad);
break;
case GST_EVENT_TAG:
if (flacenc->tags) {
@@ -639,9 +635,7 @@ gst_flacenc_sink_event (GstPad * pad, GstEvent * event)
} else {
g_assert_not_reached ();
}
- GST_STREAM_LOCK (pad);
ret = gst_pad_event_default (pad, event);
- GST_STREAM_UNLOCK (pad);
break;
default:
ret = gst_pad_event_default (pad, event);
diff --git a/ext/ladspa/gstsignalprocessor.c b/ext/ladspa/gstsignalprocessor.c
index 25200d4f..9caf7b7b 100644
--- a/ext/ladspa/gstsignalprocessor.c
+++ b/ext/ladspa/gstsignalprocessor.c
@@ -287,7 +287,6 @@ gst_signal_processor_event (GstPad * pad, GstEvent * event)
{
GstSignalProcessor *self;
GstSignalProcessorClass *bclass;
- gboolean ret = FALSE;
gboolean unlock;
self = GST_SIGNAL_PROCESSOR (GST_PAD_PARENT (pad));
@@ -296,20 +295,7 @@ gst_signal_processor_event (GstPad * pad, GstEvent * event)
if (bclass->event)
bclass->event (self, event);
- unlock = FALSE;
-
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_FLUSH_STOP:
- case GST_EVENT_EOS:
- GST_STREAM_LOCK (pad);
- unlock = TRUE;
- break;
- default:
- break;
- }
ret = gst_pad_event_default (pad, event);
- if (unlock)
- GST_STREAM_UNLOCK (pad);
return ret;
}
@@ -476,8 +462,6 @@ gst_signal_processor_getrange (GstPad * pad, guint64 offset,
self = GST_SIGNAL_PROCESSOR (GST_PAD_PARENT (pad));
- GST_STREAM_LOCK (pad);
-
if (spad->pen) {
*buffer = spad->pen;
spad->pen = NULL;
@@ -497,8 +481,6 @@ gst_signal_processor_getrange (GstPad * pad, guint64 offset,
}
}
- GST_STREAM_UNLOCK (pad);
-
return ret;
}
@@ -547,8 +529,6 @@ gst_signal_processor_chain (GstPad * pad, GstBuffer * buffer)
self = GST_SIGNAL_PROCESSOR (GST_PAD_PARENT (pad));
- GST_STREAM_LOCK (pad);
-
gst_signal_processor_pen_buffer (self, pad, buffer);
if (self->pending_in == 0) {
@@ -557,8 +537,6 @@ gst_signal_processor_chain (GstPad * pad, GstBuffer * buffer)
gst_signal_processor_do_pushes (self);
}
- GST_STREAM_UNLOCK (pad);
-
return self->state;
}
generated by cgit (git 2.34.1) at 2025-06-14 20:06:15 +0000