[asterisk-commits] dvossel: trunk r325151 - /trunk/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jun 28 10:34:59 2011
New Revision: 325151

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325151
Log:
Fixes issue with video and text not being reinvited correctly with directmedia

If a SDP does not modify the session, we ignore it.  However, we were defaulting
no text and video support to true before checking to see if the sdp modified
anything or not.  This would result in process_sdp ignoring an sdp but removing
video and text from the call during direct media reinvites.

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=325151&r1=325150&r2=325151
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jun 28 10:34:59 2011
@@ -8719,11 +8719,6 @@
 
 	memset(p->offered_media, 0, sizeof(p->offered_media));
 
-
-	/* default: novideo and notext set */
-	p->novideo = TRUE;
-	p->notext = TRUE;
-
 	if (p->vrtp) {
 		ast_rtp_codecs_payloads_clear(&newvideortp, NULL);
 	}
@@ -8781,7 +8776,9 @@
 		ast_debug(3, "Processing session-level SDP %c=%s... %s\n", type, value, (processed == TRUE)? "OK." : "UNSUPPORTED.");
 	}
 
-
+	/* default: novideo and notext set */
+	p->novideo = TRUE;
+	p->notext = TRUE;
 
 	/* Scan media stream (m=) specific parameters loop */
 	while (!ast_strlen_zero(nextm)) {