[svn-commits] oej: branch oej/videocaps r48207 - in
/team/oej/videocaps: agi/ channels/ con...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Dec 2 09:58:01 MST 2006
Author: oej
Date: Sat Dec 2 10:58:00 2006
New Revision: 48207
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48207
Log:
Updates from meeting with Omnitor and testing with their equipment.
Modified:
team/oej/videocaps/agi/Makefile
team/oej/videocaps/channels/chan_sip.c
team/oej/videocaps/configs/sip.conf.sample
team/oej/videocaps/main/capability.c
Modified: team/oej/videocaps/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/agi/Makefile?view=diff&rev=48207&r1=48206&r2=48207
==============================================================================
--- team/oej/videocaps/agi/Makefile (original)
+++ team/oej/videocaps/agi/Makefile Sat Dec 2 10:58:00 2006
@@ -21,7 +21,7 @@
include $(ASTTOPDIR)/Makefile.rules
-all: $(AGIS)
+all: ##$(AGIS)
strcompat.c: ../main/strcompat.c
@cp $< $@
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=48207&r1=48206&r2=48207
==============================================================================
--- team/oej/videocaps/channels/chan_sip.c (original)
+++ team/oej/videocaps/channels/chan_sip.c Sat Dec 2 10:58:00 2006
@@ -1131,7 +1131,7 @@
struct ast_flags flags[2]; /*!< SIP_ flags */
int expire; /*!< When to expire this peer registration */
int capability; /*!< Codec capability */
- struct ast_capabilities caps; /*!< Codec capability */
+ struct ast_capabilities caps; /*!< Codec capability */
int rtptimeout; /*!< RTP timeout */
int rtpholdtimeout; /*!< RTP Hold Timeout */
int rtpkeepalive; /*!< Send RTP packets for keepalive */
@@ -1139,7 +1139,7 @@
ast_group_t pickupgroup; /*!< Pickup group */
struct ast_dnsmgr_entry *dnsmgr;/*!< DNS refresh manager for peer */
struct sockaddr_in addr; /*!< IP address of peer */
- int videoupdate /*!< Defines use of XML or RTCP for video update */;
+ int videoupdate; /*!< Defines use of XML or RTCP for video update */
/* Qualification */
struct sip_pvt *call; /*!< Call pointer */
Modified: team/oej/videocaps/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/configs/sip.conf.sample?view=diff&rev=48207&r1=48206&r2=48207
==============================================================================
--- team/oej/videocaps/configs/sip.conf.sample (original)
+++ team/oej/videocaps/configs/sip.conf.sample Sat Dec 2 10:58:00 2006
@@ -119,6 +119,8 @@
;compactheaders = yes ; send compact sip headers.
;
+;textsupport=yes ; Enable T.140 text support. You can disable this on
+ ; a device basis
;videosupport=yes ; Turn on support for SIP video. You need to turn this on
; in the this section to get any video support at all.
; You can turn it off on a per peer basis if the general
Modified: team/oej/videocaps/main/capability.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/main/capability.c?view=diff&rev=48207&r1=48206&r2=48207
==============================================================================
--- team/oej/videocaps/main/capability.c (original)
+++ team/oej/videocaps/main/capability.c Sat Dec 2 10:58:00 2006
@@ -61,7 +61,6 @@
/*! Allocate a capability structure
\note Need to make sure these are de-allocated */
-*/
struct ast_capabilities *ast_alloc_capabilities()
{
struct ast_capabilities *cap = ast_calloc(1, sizeof(struct ast_capabilities));
@@ -278,7 +277,7 @@
int maxh264 = caps->h264.valid ? caps->h264.maxbr : 0;
int maxmedia = MAX(maxh261, MAX(maxh263, maxh264));
- f(debug) {
+ if(debug) {
ast_verbose ("CHECK SET BITRATES (IN): ct=%d, vbr=%d, h261=%d, h263=%d, h264=%d, maxmedia=%d\n",
maxctbr, maxvbr, maxh261, maxh263, maxh264, maxmedia);
}
More information about the svn-commits
mailing list