]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10622: [core] Auto-fixing audio codec from G722 to PCMU although PCMU was not...
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 16 Nov 2017 21:37:17 +0000 (15:37 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 16 Nov 2017 21:38:13 +0000 (15:38 -0600)
src/switch_core_media.c
src/switch_rtp.c

index 4e16fe3b038cccd8a9d0d0639e225e882d4e01d1..62d90e490f7f02dd2a32b8c74579ae53421db4ac 100644 (file)
@@ -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) {
 
index 3fb3a9a70f824a73a1926d68c6b9d7b6439e3fee..480a10662b9965971a3895004feadfce62b968c1 100644 (file)
@@ -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: