<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: add9d26ac54291074ce0f82b971eaf7531a6c658 (commit)
from: 0f7682a27c04dbc979cd5cba8aafd0c70caac8eb (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Anthony Minessale
comments:
fix regression in video from commit c565501f555a507fa2c56eccedccdbba7a366d6d
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c</span>
<span style="color: #000080; font-weight: bold">index 66f5e52..ac4196a 100644</span>
<span style="color: #A00000">--- a/src/mod/endpoints/mod_sofia/sofia_glue.c</span>
<span style="color: #00A000">+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c</span>
<span style="color: #800080; font-weight: bold">@@ -3242,7 +3242,9 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f</span>
}
if (tech_pvt->audio_recv_pt != tech_pvt->agreed_pt) {
<span style="color: #A00000">- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "Set audio receive payload to %u\n", tech_pvt->audio_recv_pt);</span>
<span style="color: #00A000">+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, </span>
<span style="color: #00A000">+ "%s Set audio receive payload to %u\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->audio_recv_pt);</span>
<span style="color: #00A000">+</span>
switch_rtp_set_recv_pt(tech_pvt->rtp_session, tech_pvt->audio_recv_pt);
}
<span style="color: #800080; font-weight: bold">@@ -3427,8 +3429,8 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f</span>
if (tech_pvt->video_recv_pt != tech_pvt->video_agreed_pt) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG,
<span style="color: #A00000">- "Set video receive payload to %u\n", tech_pvt->video_recv_pt);</span>
<span style="color: #A00000">- switch_rtp_set_recv_pt(tech_pvt->rtp_session, tech_pvt->video_recv_pt);</span>
<span style="color: #00A000">+ "%s Set video receive payload to %u\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->video_recv_pt);</span>
<span style="color: #00A000">+ switch_rtp_set_recv_pt(tech_pvt->video_rtp_session, tech_pvt->video_recv_pt);</span>
}
switch_channel_set_variable_printf(tech_pvt->channel, "sip_use_video_pt", "%d", tech_pvt->video_agreed_pt);
<span style="color: #000080; font-weight: bold">diff --git a/src/switch_rtp.c b/src/switch_rtp.c</span>
<span style="color: #000080; font-weight: bold">index b6b3832..76b2c91 100644</span>
<span style="color: #A00000">--- a/src/switch_rtp.c</span>
<span style="color: #00A000">+++ b/src/switch_rtp.c</span>
<span style="color: #800080; font-weight: bold">@@ -2304,7 +2304,8 @@ static void do_2833(switch_rtp_t *rtp_session, switch_core_session_t *session)</span>
SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session, switch_rtp_flush_t flush)
{
<span style="color: #A00000">- if (switch_rtp_ready(rtp_session) && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) {</span>
<span style="color: #00A000">+ if (switch_rtp_ready(rtp_session) && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA) && </span>
<span style="color: #00A000">+ !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {</span>
switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH);
switch (flush) {
case SWITCH_RTP_FLUSH_STICK:
<span style="color: #800080; font-weight: bold">@@ -2860,7 +2861,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_</span>
rtp_session->recv_msg.header.pt != 13 &&
rtp_session->recv_msg.header.pt != rtp_session->recv_te &&
(!rtp_session->cng_pt || rtp_session->recv_msg.header.pt != rtp_session->cng_pt) &&
<span style="color: #A00000">- rtp_session->recv_msg.header.pt != rtp_session->rpayload) {</span>
<span style="color: #00A000">+ rtp_session->recv_msg.header.pt != rtp_session->rpayload && 0) {</span>
/* drop frames of incorrect payload number and return CNG frame instead */
return_cng_frame();
}
<span style="color: #800080; font-weight: bold">@@ -2890,10 +2891,12 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_</span>
}
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_FLUSH)) {
<span style="color: #00A000">+ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {</span>
do_flush(rtp_session);
<span style="color: #A00000">- switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH);</span>
bytes = 0;
}
<span style="color: #00A000">+ switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH);</span>
<span style="color: #00A000">+ }</span>
if (bytes && bytes < 5) {
continue;
</pre></div>
========================================================================<pre>
Summary of changes:
src/mod/endpoints/mod_sofia/sofia_glue.c | 8 +++++---
src/switch_rtp.c | 9 ++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>