From efcc6c4e93e5907e337a3aedb70154a8ff0bbb4f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 16 Nov 2017 15:37:17 -0600 Subject: [PATCH] FS-10622: [core] Auto-fixing audio codec from G722 to PCMU although PCMU was not negotiated #resolve --- src/switch_core_media.c | 1 + src/switch_rtp.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 4e16fe3b03..62d90e490f 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -2889,6 +2889,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session (!smh->mparams->recv_te || engine->read_frame.payload != smh->mparams->recv_te) && (!smh->mparams->te || engine->read_frame.payload != smh->mparams->te) && !switch_test_flag((&engine->read_frame), SFF_CNG) && + !switch_test_flag((&engine->read_frame), SFF_PLC) && engine->read_frame.payload != engine->cur_payload_map->recv_pt && engine->read_frame.payload != engine->cur_payload_map->pt) { diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 3fb3a9a70f..480a10662b 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -6187,9 +6187,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t status = SWITCH_STATUS_SUCCESS; *bytes = switch_jb_get_last_read_len(rtp_session->jb); rtp_session->last_rtp_hdr = rtp_session->recv_msg.header; - if (pt > -1) { - rtp_session->last_rtp_hdr.pt = pt; - } + rtp_session->last_rtp_hdr.pt = pt; } break; case SWITCH_STATUS_BREAK: