FS-3121 this is less of a bug and more of a feature request but here you go, that...

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 2f626f42a1f69a385b831957b21c864bb5f2778d..a76467f5d851c25b5ee17cd1b14207690396b91e 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -3490,6 +3490,59 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 
 }
 
+static void add_audio_codec(sdp_rtpmap_t *map, int ptime, char *buf, switch_size_t buflen)
+{
+       int codec_ms = ptime;
+       uint32_t map_bit_rate = 0;
+       char ptstr[20] = "";
+       char ratestr[20] = "";
+       char bitstr[20] = "";
+       switch_codec_fmtp_t codec_fmtp = { 0 };
+                                               
+       if (!codec_ms) {
+               codec_ms = switch_default_ptime(map->rm_encoding, map->rm_pt);
+       }
+
+       map_bit_rate = switch_known_bitrate(map->rm_pt);
+                               
+       if (!ptime && !strcasecmp(map->rm_encoding, "g723")) {
+               ptime = codec_ms = 30;
+       }
+                               
+       if (zstr(map->rm_fmtp)) {
+               if (!strcasecmp(map->rm_encoding, "ilbc")) {
+                       ptime = codec_ms = 30;
+                       map_bit_rate = 13330;
+               }
+       } else {
+               if ((switch_core_codec_parse_fmtp(map->rm_encoding, map->rm_fmtp, map->rm_rate, &codec_fmtp)) == SWITCH_STATUS_SUCCESS) {
+                       if (codec_fmtp.bits_per_second) {
+                               map_bit_rate = codec_fmtp.bits_per_second;
+                       }
+                       if (codec_fmtp.microseconds_per_packet) {
+                               codec_ms = (codec_fmtp.microseconds_per_packet / 1000);
+                       }
+               }
+       }
+
+       if (map->rm_rate) {
+               switch_snprintf(ratestr, sizeof(ratestr), "@%uh", (unsigned int) map->rm_rate);
+       }
+
+       if (codec_ms) {
+               switch_snprintf(ptstr, sizeof(ptstr), "@%di", codec_ms);
+       }
+
+       if (map_bit_rate) {
+               switch_snprintf(bitstr, sizeof(bitstr), "@%db", map_bit_rate);
+       }
+
+       switch_snprintf(buf + strlen(buf), buflen - strlen(buf), ",%s%s%s%s", map->rm_encoding, ratestr, ptstr, bitstr);
+
+}
+
+
+
 void sofia_glue_set_r_sdp_codec_string(switch_core_session_t *session, const char *codec_string, sdp_session_t *sdp)
 {
        char buf[1024] = { 0 };
@@ -3506,7 +3559,13 @@ void sofia_glue_set_r_sdp_codec_string(switch_core_session_t *session, const cha
        const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS] = { 0 };
        switch_channel_t *channel = switch_core_session_get_channel(session);
        private_object_t *tech_pvt = switch_core_session_get_private(session);
+       int prefer_sdp = 0;
+       const char *var;
 
+       if ((var = switch_channel_get_variable(channel, "ep_codec_prefer_sdp")) && switch_true(var)) {
+               prefer_sdp = 1;
+       }
+               
        if (!zstr(codec_string)) {
                char *tmp_codec_string;
                if ((tmp_codec_string = strdup(codec_string))) {
@@ -3557,78 +3616,62 @@ void sofia_glue_set_r_sdp_codec_string(switch_core_session_t *session, const cha
                                break;
                        }
 
-                       for (i = 0; i < num_codecs; i++) {
-                               const switch_codec_implementation_t *imp = codecs[i];
-                               if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO || imp->ianacode > 127 || already_did[imp->ianacode]) {
-                                       continue;
-                               }
+                       if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND || prefer_sdp) {
                                for (map = m->m_rtpmaps; map; map = map->rm_next) {
                                        if (map->rm_pt > 127 || already_did[map->rm_pt]) {
                                                continue;
                                        }
 
-                                       if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
-                                               match = (map->rm_pt == imp->ianacode) ? 1 : 0;
-                                       } else {
-                                               if (map->rm_encoding) {
-                                                       match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
-                                               } else {
-                                                       match = 0;
-                                               }
-                                       }
-
-                                       if (match) {
-                                               int codec_ms = ptime;
-                                               uint32_t map_bit_rate = 0;
-                                               char ptstr[20] = "";
-                                               char ratestr[20] = "";
-                                               char bitstr[20] = "";
-                                               switch_codec_fmtp_t codec_fmtp = { 0 };
-                                               
-                                               if (!codec_ms) {
-                                                       codec_ms = switch_default_ptime(map->rm_encoding, map->rm_pt);
-                                               }
+                                       for (i = 0; i < num_codecs; i++) {
+                                               const switch_codec_implementation_t *imp = codecs[i];
 
-                                               map_bit_rate = switch_known_bitrate(map->rm_pt);
-                               
-                                               if (!ptime && !strcasecmp(map->rm_encoding, "g723")) {
-                                                       ptime = codec_ms = 30;
-                                               }
-                               
-                                               if (zstr(map->rm_fmtp)) {
-                                                       if (!strcasecmp(map->rm_encoding, "ilbc")) {
-                                                               ptime = codec_ms = 30;
-                                                               map_bit_rate = 13330;
-                                                       }
+                                               if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
+                                                       match = (map->rm_pt == imp->ianacode) ? 1 : 0;
                                                } else {
-                                                       if ((switch_core_codec_parse_fmtp(map->rm_encoding, map->rm_fmtp, map->rm_rate, &codec_fmtp)) == SWITCH_STATUS_SUCCESS) {
-                                                               if (codec_fmtp.bits_per_second) {
-                                                                       map_bit_rate = codec_fmtp.bits_per_second;
-                                                               }
-                                                               if (codec_fmtp.microseconds_per_packet) {
-                                                                       codec_ms = (codec_fmtp.microseconds_per_packet / 1000);
-                                                               }
+                                                       if (map->rm_encoding) {
+                                                               match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
+                                                       } else {
+                                                               match = 0;
                                                        }
                                                }
 
-                                               if (map->rm_rate) {
-                                                       switch_snprintf(ratestr, sizeof(ratestr), "@%uh", (unsigned int) map->rm_rate);
+                                               if (match) {
+                                                       add_audio_codec(map, ptime, buf, sizeof(buf));
+                                                       break;
                                                }
+                                       
+                                       }
+                               }
 
-                                               if (codec_ms) {
-                                                       switch_snprintf(ptstr, sizeof(ptstr), "@%di", codec_ms);
+                       } else {
+                               for (i = 0; i < num_codecs; i++) {
+                                       const switch_codec_implementation_t *imp = codecs[i];
+                                       if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO || imp->ianacode > 127 || already_did[imp->ianacode]) {
+                                               continue;
+                                       }
+                                       for (map = m->m_rtpmaps; map; map = map->rm_next) {
+                                               if (map->rm_pt > 127 || already_did[map->rm_pt]) {
+                                                       continue;
                                                }
 
-                                               if (map_bit_rate) {
-                                                       switch_snprintf(bitstr, sizeof(bitstr), "@%db", map_bit_rate);
+                                               if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
+                                                       match = (map->rm_pt == imp->ianacode) ? 1 : 0;
+                                               } else {
+                                                       if (map->rm_encoding) {
+                                                               match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
+                                                       } else {
+                                                               match = 0;
+                                                       }
                                                }
 
-                                               switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s%s%s%s", map->rm_encoding, ratestr, ptstr, bitstr);
-                                               
-                                               break;
+                                               if (match) {
+                                                       add_audio_codec(map, ptime, buf, sizeof(buf));
+                                                       break;
+                                               }
                                        }
                                }
                        }
+
                } else if (m->m_type == sdp_media_video && m->m_port) {
                        connection = sdp->sdp_connection;
                        if (m->m_connections) {