[asterisk-commits] oej: branch oej/videocaps r103756 - in /team/oej/videocaps: channels/ main/

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Feb 18 06:22:45 2008
New Revision: 103756

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103756
Log:
Fix setting of global videocallbitrate - this was copied in peers and user configuration, but not in the global, so Asterisk refused any more bandwidth than the default 256k.


Modified:
    team/oej/videocaps/channels/chan_sip.c
    team/oej/videocaps/main/capability.c

Modified: team/oej/videocaps/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/channels/chan_sip.c?view=diff&rev=103756&r1=103755&r2=103756
==============================================================================
--- team/oej/videocaps/channels/chan_sip.c (original)
+++ team/oej/videocaps/channels/chan_sip.c Mon Feb 18 06:22:45 2008
@@ -83,8 +83,7 @@
  */
 
 /*!
-\todo Videocaps	TIAS support seems half done...
-\todo Videocaps	MPEG4 support is missing. Needs to be added to capabilities.h and capabilities.c
+	\todo Videocaps	TIAS support seems half done...
 */
 
 /*** MODULEINFO
@@ -21048,6 +21047,7 @@
 			if (global_caps.maxcallbitrate < 0)
 				global_caps.maxcallbitrate = DEFAULT_MAX_CALL_BITRATE;
 			ast_log(LOG_NOTICE,"Default Video Bitrate set to %dkbps\n", global_caps.maxcallbitrate/1000);		
+			global_caps.maxvideobitrate = global_caps.maxcallbitrate;
 		} else if (!strcasecmp(v->name, "videofastupdate")) {
 			if (!strcasecmp(v->value, "xml")) {
 				global_videoupdate |= VIDEO_UPDATE_XML;

Modified: team/oej/videocaps/main/capability.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/main/capability.c?view=diff&rev=103756&r1=103755&r2=103756
==============================================================================
--- team/oej/videocaps/main/capability.c (original)
+++ team/oej/videocaps/main/capability.c Mon Feb 18 06:22:45 2008
@@ -151,7 +151,7 @@
 
 void ast_dump_caps(struct ast_capabilities *caps)
 {
-	ast_verbose("  Bitrates:\n    MaxCall %dkbps\n    MaxVideo %dkbps\n", caps->maxcallbitrate/1000,caps->maxvideobitrate/1000);
+	ast_verbose("  Bitrates:\n    MaxCall %dkbps\n    MaxVideo %dkbps\n", caps->maxcallbitrate/1000, caps->maxvideobitrate/1000);
 	if (caps->h261.valid) {
 		ast_verbose("  H261:\n");
 		ast_dump_h2613_video_cap(&caps->h261);