[asterisk-commits] rizzo: branch rizzo/video_v2 r82482 - /team/rizzo/video_v2/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Fri Sep 14 18:10:52 2007
New Revision: 82482

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82482
Log:
two bugfixes, probably trunk candidate:
- call ast_rtp_set_rtpmap_type() when found a video codec,
  so we don't have to depend on the static table in rtp.c
  This fixes exchanging h263+ video with x-lite.

  Probably this should be the default action, but i don't
  know enough of sdp parsing to try that.

- correctly print the audio capabilities and not the combined ones
  in one instance.

As a separate commit - there are a few places where capabilities are
still printed as decimal number, and these places should be reverted
to 0x%x format.

Once i am done with this cleanup i will commit to trunk, and
probably to 1.4 as well if we eventually want to integrate
the video support in the console driver.


Modified:
    team/rizzo/video_v2/channels/chan_sip.c

Modified: team/rizzo/video_v2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/chan_sip.c?view=diff&rev=82482&r1=82481&r2=82482
==============================================================================
--- team/rizzo/video_v2/channels/chan_sip.c (original)
+++ team/rizzo/video_v2/channels/chan_sip.c Fri Sep 14 18:10:52 2007
@@ -5854,6 +5854,7 @@
 			/* Note: This should all be done in the context of the m= above */
 			if (!strncasecmp(mimeSubtype, "H26",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"); */
@@ -5982,7 +5983,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));