]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-5693 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 13 Aug 2013 21:00:31 +0000 (02:00 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 13 Aug 2013 21:00:36 +0000 (02:00 +0500)
src/switch_core_media.c
src/switch_rtp.c

index e3e42a60f74371b645336ce16749b1ac01cef0d1..d0acc3256422ab910d10887a82ea098c3d6cb613 100644 (file)
@@ -3416,6 +3416,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_proxy_remote_addr(switch_core_
        if (*rvp) {
                v_engine->codec_params.remote_sdp_ip = switch_core_session_strdup(session, rip);
                v_engine->codec_params.remote_sdp_port = (switch_port_t) atoi(rvp);
+               switch_channel_set_flag(session->channel, CF_VIDEO_POSSIBLE);
+               switch_channel_set_flag(session->channel, CF_VIDEO);
        }
 
        if (v_engine->codec_params.remote_sdp_ip && v_engine->codec_params.remote_sdp_port) {
@@ -6175,7 +6177,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
        }
 
        a_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO];
-       v_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO];
+       v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO];
 
        if (zstr(smh->mparams->local_sdp_str)) {
                return;
index cfca9f20ae13f99d1200abeab262fbea751c1ebc..106f9ec1aaff377313f45bdafcc3321eb7a3896d 100644 (file)
@@ -4604,7 +4604,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
                                pt = 0;
                        }
 
-                       if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
+                       if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && !rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA]) {
                                pt = 100000;
                        }