Force the clock rate of G.722 to be 16000 when using the Google transports as it...

(closes issue ASTERISK-20105)
Reported by: Malcolm Davenport

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369838 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 60d201e06fd164edea169cae34e6e8ab19500659..d7238cec5ecb228080868d545cadb9e5f4d7d421 100644 (file)
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -1142,8 +1142,13 @@ static int jingle_add_payloads_to_description(struct jingle_session *session, st
                iks_insert_attrib(payload, "id", tmp);
                iks_insert_attrib(payload, "name", ast_rtp_lookup_mime_subtype2(1, &format, 0, 0));
                iks_insert_attrib(payload, "channels", "1");
-               snprintf(tmp, sizeof(tmp), "%d", ast_rtp_lookup_sample_rate2(1, &format, 0));
-               iks_insert_attrib(payload, "clockrate", tmp);
+
+               if ((format.id == AST_FORMAT_G722) && ((session->transport == JINGLE_TRANSPORT_GOOGLE_V1) || (session->transport == JINGLE_TRANSPORT_GOOGLE_V2))) {
+                       iks_insert_attrib(payload, "clockrate", "16000");
+               } else {
+                       snprintf(tmp, sizeof(tmp), "%d", ast_rtp_lookup_sample_rate2(1, &format, 0));
+                       iks_insert_attrib(payload, "clockrate", tmp);
+               }
 
                iks_insert_node(description, payload);
                payloads[i++] = payload;