[asterisk-commits] oej: branch oej/videocaps r116178 - in /team/oej/videocaps: ./ channels/ conf...

[SVN commits to the Asterisk project]

Author: oej
Date: Wed May 14 03:09:53 2008
New Revision: 116178

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116178
Log:
Add mpeg4 setting

Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/channels/chan_sip.c
    team/oej/videocaps/configs/sip.conf.sample

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

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=116178&r1=116177&r2=116178
==============================================================================
--- team/oej/videocaps/channels/chan_sip.c (original)
+++ team/oej/videocaps/channels/chan_sip.c Wed May 14 03:09:53 2008
@@ -17920,7 +17920,7 @@
 					/* Activate a re-invite */
 					ast_queue_frame(p->owner, &ast_null_frame);
 					/* Queue Manager Unhold event */
-					append_history(p, "Unhold", "%s", req->data);
+					append_history(p, "Unhold", "%s", (char *) req->data); 
 					if (global_callevents)
 						manager_event(EVENT_FLAG_CALL, "Unhold",
 				      			"Channel: %s\r\n"
@@ -21254,6 +21254,8 @@
 			parse_h2613_conf_line(v->value, &user->caps.h261, 30);
 		} else if (!strcasecmp(v->name, "h264")) {
 			parse_h264_conf_line(v->value, &user->caps.h264, 30);
+		} else if (!strcasecmp(v->name, "mpeg4")) {
+			parse_h264_conf_line(v->value, &user->caps.mp4v, 30);
 		} else if (!strcasecmp(v->name, "session-timers")) {
 			int i = (int) str2stmode(v->value); 
 			if (i < 0) {

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=116178&r1=116177&r2=116178
==============================================================================
--- team/oej/videocaps/configs/sip.conf.sample (original)
+++ team/oej/videocaps/configs/sip.conf.sample Wed May 14 03:09:53 2008
@@ -565,6 +565,7 @@
 ;h261=cif=30 qcif=30 sqcif=30 cif4=7 cif16=3 maxbr=7680
 ;h261=cif=30 qcif=30 maxbr=1024
 h263=cif=30 qcif=30 maxbr=1024
+h263=qcif=1 cif=1 maxbr=1024
 h264=profile-level-id=42800C packetization-mode=0 max-br=1024 max-mbps=7128