diff options
| -rw-r--r-- | main/rtp_engine.c | 10 | ||||
| -rw-r--r-- | res/res_pjsip.c | 9 |
2 files changed, 5 insertions, 14 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 50398a5c6..db733acf8 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -2200,11 +2200,6 @@ int ast_rtp_engine_init(void) /* Opus and VP8 */ set_next_mime_type(ast_format_opus, 0, "audio", "opus", 48000); set_next_mime_type(ast_format_vp8, 0, "video", "VP8", 90000); - /* DA SILK */ - set_next_mime_type(ast_format_silk8, 0, "audio", "silk", 8000); - set_next_mime_type(ast_format_silk12, 0, "audio", "silk", 12000); - set_next_mime_type(ast_format_silk16, 0, "audio", "silk", 16000); - set_next_mime_type(ast_format_silk24, 0, "audio", "silk", 24000); /* Define the static rtp payload mappings */ add_static_payload(0, ast_format_ulaw, 0); @@ -2250,11 +2245,6 @@ int ast_rtp_engine_init(void) add_static_payload(100, ast_format_vp8, 0); add_static_payload(107, ast_format_opus, 0); - add_static_payload(108, ast_format_silk8, 0); - add_static_payload(109, ast_format_silk12, 0); - add_static_payload(113, ast_format_silk16, 0); - add_static_payload(114, ast_format_silk24, 0); - return 0; } diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 3870e9f8d..46f05f991 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -2138,13 +2138,13 @@ static struct ast_threadpool *sip_threadpool; static pj_sockaddr host_ip_ipv4; /*! Local host address for IPv4 (string form) */ -static char host_ip_ipv4_string[PJ_INET6_ADDRSTRLEN + 2]; +static char host_ip_ipv4_string[PJ_INET6_ADDRSTRLEN]; /*! Local host address for IPv6 */ static pj_sockaddr host_ip_ipv6; /*! Local host address for IPv6 (string form) */ -static char host_ip_ipv6_string[PJ_INET6_ADDRSTRLEN + 2]; +static char host_ip_ipv6_string[PJ_INET6_ADDRSTRLEN]; static int register_service_noref(void *data) { @@ -4229,6 +4229,7 @@ static int unload_pjsip(void *data) static int load_pjsip(void) { + const unsigned int flags = 0; /* no port, no brackets */ pj_status_t status; /* The third parameter is just copied from @@ -4253,12 +4254,12 @@ static int load_pjsip(void) } if (!pj_gethostip(pj_AF_INET(), &host_ip_ipv4)) { - pj_sockaddr_print(&host_ip_ipv4, host_ip_ipv4_string, sizeof(host_ip_ipv4_string), 2); + pj_sockaddr_print(&host_ip_ipv4, host_ip_ipv4_string, sizeof(host_ip_ipv4_string), flags); ast_verb(3, "Local IPv4 address determined to be: %s\n", host_ip_ipv4_string); } if (!pj_gethostip(pj_AF_INET6(), &host_ip_ipv6)) { - pj_sockaddr_print(&host_ip_ipv6, host_ip_ipv6_string, sizeof(host_ip_ipv6_string), 2); + pj_sockaddr_print(&host_ip_ipv6, host_ip_ipv6_string, sizeof(host_ip_ipv6_string), flags); ast_verb(3, "Local IPv6 address determined to be: %s\n", host_ip_ipv6_string); } |