mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Take the clock-rate from the caps in rtpdtmfsrc

Browse source 
20080613233006-3e2dc-a7d4e918643f4f8c1bb2cc2678558c654025920e.gz
This commit is contained in:
Olivier Crete 2008-06-13 23:30:06 +00:00 committed by Edward Hervey
parent bcba873b29
commit dd8d949bd9
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/dtmf/gstrtpdtmfsrc.c
View file

@ -195,7 +195,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
"clock-rate = (int) [ 0, MAX ], " "clock-rate = (int) [ 0, MAX ], "
"ssrc = (int) [ 0, MAX ], " "ssrc = (int) [ 0, MAX ], "
"encoding-name = (string) \"TELEPHONE-EVENT\"") "encoding-name = (string) \"TELEPHONE-EVENT\"")
/* "events = (string) \"1-16\" */ /* "events = (string) \"0-15\" */
); );
@ -856,7 +856,6 @@ gst_rtp_dtmf_src_negotiate (GstBaseSrc * basesrc)
/* fill in the defaults, there properties cannot be negotiated. */ /* fill in the defaults, there properties cannot be negotiated. */
srccaps = gst_caps_new_simple ("application/x-rtp", srccaps = gst_caps_new_simple ("application/x-rtp",
"media", G_TYPE_STRING, "audio", "media", G_TYPE_STRING, "audio",
"clock-rate", G_TYPE_INT, dtmfsrc->clock_rate,
"encoding-name", G_TYPE_STRING, "TELEPHONE-EVENT", NULL); "encoding-name", G_TYPE_STRING, "TELEPHONE-EVENT", NULL);
/* the peer caps can override some of the defaults */ /* the peer caps can override some of the defaults */
@ -867,6 +866,7 @@ gst_rtp_dtmf_src_negotiate (GstBaseSrc * basesrc)
"payload", G_TYPE_INT, dtmfsrc->pt, "payload", G_TYPE_INT, dtmfsrc->pt,
"ssrc", G_TYPE_UINT, dtmfsrc->current_ssrc, "ssrc", G_TYPE_UINT, dtmfsrc->current_ssrc,
"clock-base", G_TYPE_UINT, dtmfsrc->ts_base, "clock-base", G_TYPE_UINT, dtmfsrc->ts_base,
"clock-rate", G_TYPE_INT, dtmfsrc->clock_rate,
"seqnum-base", G_TYPE_UINT, dtmfsrc->seqnum_base, NULL); "seqnum-base", G_TYPE_UINT, dtmfsrc->seqnum_base, NULL);
GST_DEBUG_OBJECT (dtmfsrc, "no peer caps: %" GST_PTR_FORMAT, srccaps); GST_DEBUG_OBJECT (dtmfsrc, "no peer caps: %" GST_PTR_FORMAT, srccaps);
@ -875,6 +875,7 @@ gst_rtp_dtmf_src_negotiate (GstBaseSrc * basesrc)
GstStructure *s; GstStructure *s;
const GValue *value; const GValue *value;
gint pt; gint pt;
gint clock_rate;
/* peer provides caps we can use to fixate, intersect. This always returns a /* peer provides caps we can use to fixate, intersect. This always returns a
* writable caps. */ * writable caps. */
@ -919,6 +920,19 @@ gst_rtp_dtmf_src_negotiate (GstBaseSrc * basesrc)
} }
} }
if (gst_structure_get_int (s, "clock-rate", &clock_rate))
{
dtmfsrc->clock_rate = clock_rate;
GST_LOG_OBJECT (dtmfsrc, "using clock-rate from caps %d",
dtmfsrc->clock_rate);
} else {
GST_LOG_OBJECT (dtmfsrc, "using existing clock-rate %d",
dtmfsrc->clock_rate);
}
gst_structure_set (s, "clock-rate", G_TYPE_INT, dtmfsrc->clock_rate,
NULL);
if (gst_structure_has_field_typed (s, "ssrc", G_TYPE_UINT)) { if (gst_structure_has_field_typed (s, "ssrc", G_TYPE_UINT)) {
value = gst_structure_get_value (s, "ssrc"); value = gst_structure_get_value (s, "ssrc");
dtmfsrc->current_ssrc = g_value_get_uint (value); dtmfsrc->current_ssrc = g_value_get_uint (value);