From a9d042db2cab75e9c21f4d1ca50ead2fd0fbd418 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Mon, 1 Mar 2004 16:14:41 +0000
Subject: [PATCH] Handle video codecs properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channel.c | 2 +-
channels/chan_sip.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/channel.c b/channel.c
index d00fc4dd97..f2f1fd535f 100755
--- a/channel.c
+++ b/channel.c
@@ -2280,7 +2280,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
*fo = f;
*rc = who;
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;
}
if ((f->frametype == AST_FRAME_VOICE) ||
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 518a6f3159..3a0b3d885d 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2692,7 +2692,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p, struct ast_rtp *
cur = cur->next;
}
/* 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 (sipdebug)
ast_verbose("Answering with capability %d\n", x);
--
GitLab