[asterisk-commits] rizzo: trunk r89532 - /trunk/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Fri Nov 23 09:49:40 2007
New Revision: 89532

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89532
Log:
set rtpmap video info according to what is read from SDP;

make the format explicit in a debug message;

print the audio instead of aggregated peer capability in a debugging msg.



Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=89532&r1=89531&r2=89532
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Nov 23 09:49:40 2007
@@ -4877,7 +4877,8 @@
 				ast_getformatname(f->subclass), p->owner->name);
 			return &ast_null_frame;
 		}
-		ast_debug(1, "Oooh, format changed to %d\n", f->subclass);
+		ast_debug(1, "Oooh, format changed to %d %s\n",
+			f->subclass, ast_getformatname(f->subclass));
 		p->owner->nativeformats = (p->owner->nativeformats & (AST_FORMAT_VIDEO_MASK | AST_FORMAT_TEXT_MASK)) | f->subclass;
 		ast_set_read_format(p->owner, p->owner->readformat);
 		ast_set_write_format(p->owner, p->owner->writeformat);
@@ -5867,6 +5868,7 @@
 			/* Note: This should all be done in the context of the m= above */
 			if (!strncasecmp(mimeSubtype, "H26", 3) || !strncasecmp(mimeSubtype, "MP4", 3)) {         /* Video */
 				/* Not going to do anything here for the moment, but we will soon */
+				ast_rtp_set_rtpmap_type(newtextrtp, codec, "video", mimeSubtype, 1);
 			} else if (!strncasecmp(mimeSubtype, "T140",4)) { /* Text */
 				if (p->trtp) {
 					/* ast_verbose("Adding t140 mimeSubtype to textrtp struct\n"); */
@@ -5995,7 +5997,7 @@
 
 		ast_verbose("Capabilities: us - %s, peer - audio=%s/video=%s/text=%s, combined - %s\n",
 			    ast_getformatname_multiple(s1, BUFSIZ, p->capability),
-			    ast_getformatname_multiple(s2, BUFSIZ, newpeercapability),
+			    ast_getformatname_multiple(s2, BUFSIZ, peercapability),
 			    ast_getformatname_multiple(s3, BUFSIZ, vpeercapability),
 			    ast_getformatname_multiple(s4, BUFSIZ, tpeercapability),
 			    ast_getformatname_multiple(s5, BUFSIZ, newjointcapability));