From 676a0f271957b0c370b561e4a6be139ae910ba0a Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 14 Nov 2006 22:07:20 +0000 Subject: [PATCH] Merged revisions 47628 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47628 | file | 2006-11-14 17:05:03 -0500 (Tue, 14 Nov 2006) | 2 lines Only keep the video RTP structure around if 1. Video support is enabled and 2. A video codec is enabled on the dialog ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47629 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 74da588..b13868b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2678,7 +2678,7 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer) ast_copy_flags(&dialog->flags[0], &peer->flags[0], SIP_FLAGS_TO_COPY); ast_copy_flags(&dialog->flags[1], &peer->flags[1], SIP_PAGE2_FLAGS_TO_COPY); dialog->capability = peer->capability; - if (!ast_test_flag(&dialog->flags[1], SIP_PAGE2_VIDEOSUPPORT) && dialog->vrtp) { + if ((!ast_test_flag(&dialog->flags[1], SIP_PAGE2_VIDEOSUPPORT) || !(dialog->capability & AST_FORMAT_VIDEO_MASK)) && dialog->vrtp) { ast_rtp_destroy(dialog->vrtp); dialog->vrtp = NULL; } @@ -9068,7 +9068,7 @@ static enum check_auth_result check_user_ok(struct sip_pvt *p, char *of, p->t38.jointcapability &= p->t38.peercapability; p->maxcallbitrate = user->maxcallbitrate; /* If we do not support video, remove video from call structure */ - if (!ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT) && p->vrtp) { + if ((!ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT) || !(p->capability & AST_FORMAT_VIDEO_MASK)) && p->vrtp) { ast_rtp_destroy(p->vrtp); p->vrtp = NULL; } @@ -9182,7 +9182,7 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of, if (p->peercapability) p->jointcapability &= p->peercapability; p->maxcallbitrate = peer->maxcallbitrate; - if (!ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT) && p->vrtp) { + if ((!ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT) || !(p->capability & AST_FORMAT_VIDEO_MASK)) && p->vrtp) { ast_rtp_destroy(p->vrtp); p->vrtp = NULL; } -- 1.7.9.5