diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-14 22:07:20 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-14 22:07:20 +0000 |
| commit | bab9d7c18e1b63e385203f040b319f12d4df99f2 (patch) | |
| tree | 5e1870eeea1c5cf58bafa05cf1793acdb65e9340 /channels/chan_sip.c | |
| parent | c744624e6f44a54fff38d85bdd38fa215e0041c5 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@47629 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 74da5883a..b13868b54 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; } |