diff --git a/gst/rtpmux/gstrtpdtmfmux.c b/gst/rtpmux/gstrtpdtmfmux.c index 396d6845d7..c199baa032 100644 --- a/gst/rtpmux/gstrtpdtmfmux.c +++ b/gst/rtpmux/gstrtpdtmfmux.c @@ -38,7 +38,7 @@ * of the lock, the peer element must send an event of type * GST_EVENT_CUSTOM_DOWNSTREAM_OOB, having a * structure of name "stream-lock" with only one boolean field: - * "lock". If this field is set to TRUE, the request is for the + * "lock". If this field is set to TRUE, the request is for the * acquisition of the lock, otherwise it is for release of the lock. * * For example, the following code in an upstream peer element @@ -54,7 +54,7 @@ * * structure = gst_structure_new ("stream-lock", * "lock", G_TYPE_BOOLEAN, TRUE, NULL); - * + * * event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure); * gst_pad_push_event (dtmfsrc->srcpad, event); * @@ -157,7 +157,7 @@ gst_rtp_dtmf_mux_chain (GstPad * pad, GstBuffer * buffer) { GstRTPDTMFMux *mux; GstFlowReturn ret; - + mux = GST_RTP_DTMF_MUX (gst_pad_get_parent (pad)); GST_OBJECT_LOCK (mux); @@ -175,7 +175,7 @@ gst_rtp_dtmf_mux_chain (GstPad * pad, GstBuffer * buffer) else ret = GST_FLOW_ERROR; } - + gst_object_unref (mux); return ret; } diff --git a/gst/rtpmux/gstrtpmux.c b/gst/rtpmux/gstrtpmux.c index 8213452ab9..8986e79f23 100644 --- a/gst/rtpmux/gstrtpmux.c +++ b/gst/rtpmux/gstrtpmux.c @@ -189,7 +189,7 @@ static gboolean gst_rtp_mux_src_event (GstPad * pad, GstPad *sinkpad; gboolean result = FALSE; gboolean done = FALSE; - + rtp_mux = gst_pad_get_parent_element (pad); g_return_val_if_fail (rtp_mux != NULL, FALSE); @@ -228,7 +228,7 @@ gst_rtp_mux_init (GstRTPMux * rtp_mux) "src"), "src"); gst_pad_set_event_function (rtp_mux->srcpad, gst_rtp_mux_src_event); gst_element_add_pad (GST_ELEMENT (rtp_mux), rtp_mux->srcpad); - + rtp_mux->ssrc = DEFAULT_SSRC; rtp_mux->ts_offset = DEFAULT_TIMESTAMP_OFFSET; rtp_mux->seqnum_offset = DEFAULT_SEQNUM_OFFSET; @@ -250,7 +250,7 @@ gst_rtp_mux_create_sinkpad (GstRTPMux * rtp_mux, GstPadTemplate * templ) { GstPad *newpad = NULL; GstPadTemplate * class_templ; - + class_templ = gst_element_class_get_pad_template ( GST_ELEMENT_GET_CLASS (rtp_mux), "sink_%d"); @@ -276,7 +276,7 @@ gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad) GstRTPMuxClass *klass; klass = GST_RTP_MUX_GET_CLASS (rtp_mux); - + /* setup some pad functions */ gst_pad_set_setcaps_function (sinkpad, gst_rtp_mux_setcaps); if (klass->chain_func) @@ -324,7 +324,7 @@ gst_rtp_mux_get_buffer_ts_base (GstRTPMux * rtp_mux, GstBuffer * buffer) GstStructure *structure; const GValue *value; guint32 ts_base; - + caps = gst_buffer_get_caps (buffer); g_return_val_if_fail (caps != NULL, 0); @@ -333,13 +333,13 @@ gst_rtp_mux_get_buffer_ts_base (GstRTPMux * rtp_mux, GstBuffer * buffer) value = gst_structure_get_value (structure, "clock-base"); - if (value) + if (value) ts_base = g_value_get_uint (value); else ts_base = 0; - + gst_caps_unref (caps); - + GST_DEBUG_OBJECT (rtp_mux, "sink's ts-base: %u", ts_base); return ts_base; } @@ -363,7 +363,7 @@ gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer) { GstRTPMux *rtp_mux; GstFlowReturn ret; - + rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad)); buffer = gst_buffer_make_writable(buffer); @@ -377,7 +377,7 @@ gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer) GST_BUFFER_SIZE (buffer), rtp_mux->seqnum - 1); ret = gst_pad_push (rtp_mux->srcpad, buffer); - + gst_object_unref (rtp_mux); return ret; } @@ -493,7 +493,7 @@ gst_rtp_mux_set_property (GObject * object, } } -static void +static void gst_rtp_mux_ready_to_paused (GstRTPMux * rtp_mux) { if (rtp_mux->ssrc == -1) @@ -506,7 +506,7 @@ gst_rtp_mux_ready_to_paused (GstRTPMux * rtp_mux) else rtp_mux->seqnum_base = rtp_mux->seqnum_offset; rtp_mux->seqnum = rtp_mux->seqnum_base; - + if (rtp_mux->ts_offset == -1) rtp_mux->ts_base = g_random_int (); else diff --git a/gst/rtpmux/gstrtpmux.h b/gst/rtpmux/gstrtpmux.h index fee4305523..3bc7ac3c25 100644 --- a/gst/rtpmux/gstrtpmux.h +++ b/gst/rtpmux/gstrtpmux.h @@ -54,7 +54,7 @@ struct _GstRTPMux /* sinkpads */ gint numpads; - + guint32 ts_base; guint32 sink_ts_base; guint16 seqnum_base;