mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-21 09:10:36 +00:00
Handle video codecs properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2280,7 +2280,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
|
|||||||
*fo = f;
|
*fo = f;
|
||||||
*rc = who;
|
*rc = who;
|
||||||
res = 0;
|
res = 0;
|
||||||
ast_log(LOG_DEBUG, "Got a FRAME_CONTROL frame on channel %s\n",who->name);
|
ast_log(LOG_DEBUG, "Got a FRAME_CONTROL (%d) frame on channel %s\n", f->subclass, who->name);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if ((f->frametype == AST_FRAME_VOICE) ||
|
if ((f->frametype == AST_FRAME_VOICE) ||
|
||||||
|
|||||||
@@ -2692,7 +2692,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p, struct ast_rtp *
|
|||||||
cur = cur->next;
|
cur = cur->next;
|
||||||
}
|
}
|
||||||
/* Now send any other common codecs, and non-codec formats: */
|
/* Now send any other common codecs, and non-codec formats: */
|
||||||
for (x = 1; x <= AST_FORMAT_MAX_AUDIO; x <<= 1) {
|
for (x = 1; x <= (videosupport ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
|
||||||
if ((p->jointcapability & x) && !(alreadysent & x)) {
|
if ((p->jointcapability & x) && !(alreadysent & x)) {
|
||||||
if (sipdebug)
|
if (sipdebug)
|
||||||
ast_verbose("Answering with capability %d\n", x);
|
ast_verbose("Answering with capability %d\n", x);
|
||||||
|
|||||||
Reference in New Issue
Block a user