mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpdtmfsrc: Start at the last_stop from the start event if there was one

Browse source 
The goal is to try to not have a GAP between the audio and the DTMF
This commit is contained in:
Olivier Crête 2011-04-14 17:08:57 -04:00 committed by Olivier Crête
parent e7038fd520
commit 340a65b484
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/dtmf/gstrtpdtmfsrc.c
View file

@ -334,6 +334,7 @@ gst_rtp_dtmf_src_handle_dtmf_event (GstRTPDTMFSrc * dtmfsrc,
gint event_type; gint event_type;
gboolean start; gboolean start;
gint method; gint method;
GstClockTime last_stop;
if (!gst_structure_get_int (event_structure, "type", &event_type) || if (!gst_structure_get_int (event_structure, "type", &event_type) ||
!gst_structure_get_boolean (event_structure, "start", &start) || !gst_structure_get_boolean (event_structure, "start", &start) ||
@ -346,6 +347,13 @@ gst_rtp_dtmf_src_handle_dtmf_event (GstRTPDTMFSrc * dtmfsrc,
} }
} }
GST_OBJECT_LOCK (dtmfsrc);
if (gst_structure_get_clock_time (event_structure, "last-stop", &last_stop))
dtmfsrc->last_stop = last_stop;
else
dtmfsrc->last_stop = GST_CLOCK_TIME_NONE;
GST_OBJECT_UNLOCK (dtmfsrc);
if (start) { if (start) {
gint event_number; gint event_number;
gint event_volume; gint event_volume;
@ -491,17 +499,27 @@ gst_rtp_dtmf_src_get_property (GObject * object, guint prop_id, GValue * value,
static gboolean static gboolean
gst_rtp_dtmf_prepare_timestamps (GstRTPDTMFSrc * dtmfsrc) gst_rtp_dtmf_prepare_timestamps (GstRTPDTMFSrc * dtmfsrc)
{ {
GstClock *clock; GstClockTime last_stop;
clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc)); GST_OBJECT_LOCK (dtmfsrc);
if (clock == NULL) last_stop = dtmfsrc->last_stop;
return FALSE; GST_OBJECT_UNLOCK (dtmfsrc);
dtmfsrc->timestamp = gst_clock_get_time (clock) if (GST_CLOCK_TIME_IS_VALID (last_stop)) {
+ (MIN_INTER_DIGIT_INTERVAL * GST_MSECOND) dtmfsrc->timestamp = last_stop;
- gst_element_get_base_time (GST_ELEMENT (dtmfsrc)); dtmfsrc->start_timestamp = last_stop;
dtmfsrc->start_timestamp = dtmfsrc->timestamp; } else {
gst_object_unref (clock); GstClock *clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc));
if (clock == NULL)
return FALSE;
dtmfsrc->timestamp = gst_clock_get_time (clock)
+ (MIN_INTER_DIGIT_INTERVAL * GST_MSECOND)
- gst_element_get_base_time (GST_ELEMENT (dtmfsrc));
dtmfsrc->start_timestamp = dtmfsrc->timestamp;
gst_object_unref (clock);
}
dtmfsrc->rtp_timestamp = dtmfsrc->ts_base + dtmfsrc->rtp_timestamp = dtmfsrc->ts_base +
gst_util_uint64_scale_int (gst_segment_to_running_time (&GST_BASE_SRC gst_util_uint64_scale_int (gst_segment_to_running_time (&GST_BASE_SRC

2
gst/dtmf/gstrtpdtmfsrc.h
View file

@ -94,6 +94,8 @@ struct _GstRTPDTMFSrc
guint16 packet_redundancy; guint16 packet_redundancy;
guint32 clock_rate; guint32 clock_rate;
GstClockTime last_stop;
gboolean dirty; gboolean dirty;
guint16 redundancy_count; guint16 redundancy_count;
}; };