[MOVED FROM GST-P-FARSIGHT] 80 column is enough for everyone

20070424200252-3e2dc-d1bc17266afff2599129a25d44338062372f7ea3.gz
This commit is contained in:
Olivier Crete 2007-04-24 20:02:52 +00:00 committed by Edward Hervey
parent 2a8042fa72
commit 9fe41ae280

View file

@ -386,7 +386,8 @@ failure:
} }
static gboolean static gboolean
gst_rtp_dtmf_src_handle_custom_upstream (GstRTPDTMFSrc *dtmfsrc, GstEvent * event) gst_rtp_dtmf_src_handle_custom_upstream (GstRTPDTMFSrc *dtmfsrc,
GstEvent * event)
{ {
gboolean result = FALSE; gboolean result = FALSE;
const GstStructure *structure; const GstStructure *structure;
@ -436,8 +437,8 @@ gst_rtp_dtmf_src_handle_event (GstPad * pad, GstEvent * event)
GstFormat fmt; GstFormat fmt;
gint64 start, stop, position; gint64 start, stop, position;
gst_event_parse_new_segment (event, &update, &rate, &fmt, &start, &stop, gst_event_parse_new_segment (event, &update, &rate, &fmt, &start,
&position); &stop, &position);
gst_segment_set_newsegment (&dtmfsrc->segment, update, rate, fmt, gst_segment_set_newsegment (&dtmfsrc->segment, update, rate, fmt,
start, stop, position); start, stop, position);
} }
@ -477,10 +478,10 @@ gst_rtp_dtmf_src_set_property (GObject * object, guint prop_id,
dtmfsrc->pt = g_value_get_uint (value); dtmfsrc->pt = g_value_get_uint (value);
gst_rtp_dtmf_src_set_caps (dtmfsrc); gst_rtp_dtmf_src_set_caps (dtmfsrc);
break; break;
case PROP_INTERVAL : case PROP_INTERVAL:
dtmfsrc->interval = g_value_get_int (value); dtmfsrc->interval = g_value_get_int (value);
break; break;
case PROP_REDUNDANCY : case PROP_REDUNDANCY:
dtmfsrc->packet_redundancy = g_value_get_int (value); dtmfsrc->packet_redundancy = g_value_get_int (value);
break; break;
default: default:
@ -554,14 +555,16 @@ gst_rtp_dtmf_prepare_timestamps (GstRTPDTMFSrc *dtmfsrc)
dtmfsrc->timestamp = gst_clock_get_time (GST_ELEMENT_CLOCK (dtmfsrc)); dtmfsrc->timestamp = gst_clock_get_time (GST_ELEMENT_CLOCK (dtmfsrc));
else { else {
GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", GST_ELEMENT_NAME (dtmfsrc)); GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s",
GST_ELEMENT_NAME (dtmfsrc));
dtmfsrc->timestamp = GST_CLOCK_TIME_NONE; dtmfsrc->timestamp = GST_CLOCK_TIME_NONE;
} }
dtmfsrc->rtp_timestamp = dtmfsrc->ts_base + dtmfsrc->rtp_timestamp = dtmfsrc->ts_base +
gst_util_uint64_scale_int ( gst_util_uint64_scale_int (
gst_segment_to_running_time (&dtmfsrc->segment, GST_FORMAT_TIME, gst_segment_to_running_time (&dtmfsrc->segment, GST_FORMAT_TIME,
dtmfsrc->timestamp - gst_element_get_base_time (GST_ELEMENT (dtmfsrc))), dtmfsrc->timestamp -
gst_element_get_base_time (GST_ELEMENT (dtmfsrc))),
dtmfsrc->clock_rate, GST_SECOND); dtmfsrc->clock_rate, GST_SECOND);
} }
@ -629,7 +632,8 @@ gst_rtp_dtmf_src_wait_for_buffer_ts (GstRTPDTMFSrc *dtmfsrc, GstBuffer * buf)
} }
else { else {
GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", GST_ELEMENT_NAME (dtmfsrc)); GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s",
GST_ELEMENT_NAME (dtmfsrc));
} }
} }