[svn-commits] branch oej/sdpcleanup r31662 - in /team/oej/sdpcleanup: ./ channels/ include/...

[svn-commits at lists.digium.com]

Author: oej
Date: Fri Jun  2 03:37:09 2006
New Revision: 31662

URL: http://svn.digium.com/view/asterisk?rev=31662&view=rev
Log:
Updates during testing with John Martin, Aupix (some patches from him, disclaimed)

Modified:
    team/oej/sdpcleanup/channel.c
    team/oej/sdpcleanup/channels/chan_sip.c
    team/oej/sdpcleanup/frame.c
    team/oej/sdpcleanup/include/asterisk/translate.h

Modified: team/oej/sdpcleanup/channel.c
URL: http://svn.digium.com/view/asterisk/team/oej/sdpcleanup/channel.c?rev=31662&r1=31661&r2=31662&view=diff
==============================================================================
--- team/oej/sdpcleanup/channel.c (original)
+++ team/oej/sdpcleanup/channel.c Fri Jun  2 03:37:09 2006
@@ -2628,7 +2628,7 @@
 		if (strcasecmp(type, chan->tech->type))
 			continue;
 
-		capabilities = chan->tech->capabilities;
+		capabilities = chan->tech->capabilities | (format & AST_FORMAT_VIDEO_MASK);
 		fmt = format;
 		res = ast_translator_best_choice(&fmt, &capabilities);
 		if (res < 0) {

Modified: team/oej/sdpcleanup/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/sdpcleanup/channels/chan_sip.c?rev=31662&r1=31661&r2=31662&view=diff
==============================================================================
--- team/oej/sdpcleanup/channels/chan_sip.c (original)
+++ team/oej/sdpcleanup/channels/chan_sip.c Fri Jun  2 03:37:09 2006
@@ -3288,6 +3288,7 @@
 		ast_log(LOG_DEBUG, "*** Our native formats are %s \n", ast_getformatname_multiple(buf, BUFSIZ, tmp->nativeformats));
 		ast_log(LOG_DEBUG, "*** Joint capabilities are %s \n", ast_getformatname_multiple(buf, BUFSIZ, i->jointcapability));
 		ast_log(LOG_DEBUG, "*** Our capabilities are %s \n", ast_getformatname_multiple(buf, BUFSIZ, i->capability));
+		ast_log(LOG_DEBUG, "*** AST_CODEC_CHOOSE formats are %s \n", ast_getformatname_multiple(buf, BUFSIZ, ast_codec_choose(&i->prefs, what, 1)));
 		if (i->prefcodec)
 			ast_log(LOG_DEBUG, "*** Our preferred formats from the incoming channel are %s \n", ast_getformatname_multiple(buf, BUFSIZ, i->prefcodec));
 	}

Modified: team/oej/sdpcleanup/frame.c
URL: http://svn.digium.com/view/asterisk/team/oej/sdpcleanup/frame.c?rev=31662&r1=31661&r2=31662&view=diff
==============================================================================
--- team/oej/sdpcleanup/frame.c (original)
+++ team/oej/sdpcleanup/frame.c Fri Jun  2 03:37:09 2006
@@ -1011,6 +1011,9 @@
 	if(ret)
 		return ret;
 
+	if (option_debug > 3)
+		ast_log(LOG_DEBUG, "Could not find preferred codec - %s\n", find_best ? "Going for the best codec" : "Returning zero codec");
+
    	return find_best ? ast_best_codec(formats) : 0;
 }
 

Modified: team/oej/sdpcleanup/include/asterisk/translate.h
URL: http://svn.digium.com/view/asterisk/team/oej/sdpcleanup/include/asterisk/translate.h?rev=31662&r1=31661&r2=31662&view=diff
==============================================================================
--- team/oej/sdpcleanup/include/asterisk/translate.h (original)
+++ team/oej/sdpcleanup/include/asterisk/translate.h Fri Jun  2 03:37:09 2006
@@ -23,7 +23,7 @@
 #ifndef _ASTERISK_TRANSLATE_H
 #define _ASTERISK_TRANSLATE_H
 
-#define MAX_FORMAT 32
+#define MAX_FORMAT 15	/* Do not include video here */
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {