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
This commit is contained in:
parent
c744624e6f
commit
bab9d7c18e
1 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Reference in a new issue