Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

FS-5643 --resolve this is the kind of regressions we need to keep an eye on from the refactoring of the media code. I removed the codec_ms from the engine in addition to applying your patch

This commit is contained in:
Anthony Minessale 2013-07-26 10:24:19 -05:00
parent b79932550f
commit a4bc98a775
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_core_media.c
View File

@ -117,7 +117,6 @@ typedef struct switch_rtp_engine_s {
switch_codec_implementation_t read_impl;
switch_codec_implementation_t write_impl;
uint32_t codec_ms;
switch_size_t last_ts;
uint32_t check_frames;
uint32_t mismatch_count;
@ -1360,7 +1359,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
engine->last_codec_ms = codec_ms;
if (engine->mismatch_count > MAX_MISMATCH_FRAMES) {
if (switch_rtp_ready(engine->rtp_session) && codec_ms != engine->codec_ms) {
if (switch_rtp_ready(engine->rtp_session) && codec_ms != engine->codec_params.codec_ms) {
const char *val;
int rtp_timeout_sec = 0;
int rtp_hold_timeout_sec = 0;
@ -1376,17 +1375,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
engine->read_frame.datalen = 0;
if (codec_ms != engine->codec_ms) {
if (codec_ms != engine->codec_params.codec_ms) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
"Asynchronous PTIME not supported, changing our end from %d to %d\n",
(int) engine->codec_ms,
(int) engine->codec_params.codec_ms,
(int) codec_ms
);
switch_channel_set_variable_printf(session->channel, "rtp_h_X-Broken-PTIME", "Adv=%d;Sent=%d",
(int) engine->codec_ms, (int) codec_ms);
(int) engine->codec_params.codec_ms, (int) codec_ms);
engine->codec_ms = codec_ms;
engine->codec_params.codec_ms = codec_ms;
}