Handle video codecs properly

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2281 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index d00fc4dd97a9583652c7bc1984015181dae635d0..f2f1fd535f1b189129669be6381a4e9cd552abbc 100755 (executable)
--- 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 518a6f3159adbfb8f44b6eab287cb577512e5019..3a0b3d885dc4a983b4299da86e9a4fbc3fa25aab 100755 (executable)
--- 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);