mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Some more code-cleanups

Browse source 
20070322161552-65035-bda96165e146b4f1d5fea1cc9576a7ab3abebc9e.gz
This commit is contained in:
zeeshan.ali@nokia.com 2007-03-22 16:15:52 +00:00 committed by Edward Hervey
parent 7b99c695aa
commit a7afa08394
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/rtpmux/gstrtpdtmfmux.c
View file

@ -156,18 +156,13 @@ static GstFlowReturn
gst_rtp_dtmf_mux_chain (GstPad * pad, GstBuffer * buffer) gst_rtp_dtmf_mux_chain (GstPad * pad, GstBuffer * buffer)
{ {
GstRTPDTMFMux *mux; GstRTPDTMFMux *mux;
gboolean drop = FALSE;
GstFlowReturn ret; GstFlowReturn ret;
mux = GST_RTP_DTMF_MUX (gst_pad_get_parent (pad)); mux = GST_RTP_DTMF_MUX (gst_pad_get_parent (pad));
GST_OBJECT_LOCK (mux); GST_OBJECT_LOCK (mux);
if (mux->special_pad != NULL && if (mux->special_pad != NULL && mux->special_pad != pad) {
mux->special_pad != pad) { /* Drop the buffer */
drop = TRUE;
}
if (drop) {
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
GST_OBJECT_UNLOCK (mux); GST_OBJECT_UNLOCK (mux);
@ -188,11 +183,10 @@ gst_rtp_dtmf_mux_chain (GstPad * pad, GstBuffer * buffer)
static void static void
gst_rtp_dtmf_mux_lock_stream (GstRTPDTMFMux *mux, GstPad * pad) gst_rtp_dtmf_mux_lock_stream (GstRTPDTMFMux *mux, GstPad * pad)
{ {
if (mux->special_pad != NULL) { if (mux->special_pad != NULL)
GST_WARNING_OBJECT (mux, GST_WARNING_OBJECT (mux,
"Stream lock already acquired by pad %s", "Stream lock already acquired by pad %s",
GST_ELEMENT_NAME (mux->special_pad)); GST_ELEMENT_NAME (mux->special_pad));
}
else else
mux->special_pad = gst_object_ref (pad); mux->special_pad = gst_object_ref (pad);
@ -201,18 +195,15 @@ gst_rtp_dtmf_mux_lock_stream (GstRTPDTMFMux *mux, GstPad * pad)
static void static void
gst_rtp_dtmf_mux_unlock_stream (GstRTPDTMFMux *mux, GstPad * pad) gst_rtp_dtmf_mux_unlock_stream (GstRTPDTMFMux *mux, GstPad * pad)
{ {
if (mux->special_pad == NULL) { if (mux->special_pad == NULL)
GST_WARNING_OBJECT (mux, GST_WARNING_OBJECT (mux,
"Stream lock not acquired, can't release it"); "Stream lock not acquired, can't release it");
}
else if (pad != mux->special_pad) { else if (pad != mux->special_pad)
GST_WARNING_OBJECT (mux, GST_WARNING_OBJECT (mux,
"pad %s attempted to release Stream lock" "pad %s attempted to release Stream lock"
" which was acquired by pad %s", GST_ELEMENT_NAME (pad), " which was acquired by pad %s", GST_ELEMENT_NAME (pad),
GST_ELEMENT_NAME (mux->special_pad)); GST_ELEMENT_NAME (mux->special_pad));
}
else { else {
gst_object_unref (mux->special_pad); gst_object_unref (mux->special_pad);
mux->special_pad = NULL; mux->special_pad = NULL;
@ -239,16 +230,16 @@ gst_rtp_dtmf_mux_handle_stream_lock_event (GstRTPDTMFMux *mux, GstPad * pad,
} }
static gboolean static gboolean
gst_rtp_dtmf_mux_handle_downstream_event (GstRTPDTMFMux *mux, GstPad * pad, GstEvent * event) gst_rtp_dtmf_mux_handle_downstream_event (GstRTPDTMFMux *mux,
GstPad * pad, GstEvent * event)
{ {
const GstStructure *structure; const GstStructure *structure;
gboolean ret = FALSE; gboolean ret = FALSE;
structure = gst_event_get_structure (event); structure = gst_event_get_structure (event);
/* FIXME: is this event generic enough to be given a generic name? */ /* FIXME: is this event generic enough to be given a generic name? */
if (structure && gst_structure_has_name (structure, "stream-lock")) { if (structure && gst_structure_has_name (structure, "stream-lock"))
ret = gst_rtp_dtmf_mux_handle_stream_lock_event (mux, pad, structure); ret = gst_rtp_dtmf_mux_handle_stream_lock_event (mux, pad, structure);
}
return ret; return ret;
} }
@ -258,10 +249,9 @@ gst_rtp_dtmf_mux_ignore_event (GstPad * pad, GstEvent * event)
{ {
gboolean ret; gboolean ret;
if (parent_class->sink_event_func) { if (parent_class->sink_event_func)
/* Give the parent a chance to handle the event first */ /* Give the parent a chance to handle the event first */
ret = parent_class->sink_event_func (pad, event); ret = parent_class->sink_event_func (pad, event);
}
else else
ret = gst_pad_event_default (pad, event); ret = gst_pad_event_default (pad, event);