[svn-commits] twilson: branch 1.8 r318337 - in /branches/1.8: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon May  9 15:23:15 2011
New Revision: 318337

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318337
Log:
Merged revisions 318331 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r318331 | twilson | 2011-05-09 15:04:41 -0500 (Mon, 09 May 2011) | 12 lines
  
  Don't offer video to directmedia callee unless caller offered it as well
  
  Make sure that when directmedia is enabled, that video is not offered to the
  callee even if it supports it. p->vrtp will not exist since the caller didn't
  offer video.
  
  (closes issue #19195)
  Reported by: one47
  Patches: 
        sip_cant_add_video_rtp uploaded by one47 (license 23)
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/channels/chan_sip.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=318337&r1=318336&r2=318337
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon May  9 15:23:15 2011
@@ -10829,11 +10829,14 @@
 		doing_directmedia = (!ast_sockaddr_isnull(&p->redirip) && p->redircodecs) ? TRUE : FALSE;
 		/* Check if we need video in this call */
 		if ((p->jointcapability & AST_FORMAT_VIDEO_MASK) && !p->novideo) {
-			if (p->vrtp) {
+			if (doing_directmedia && !(p->jointcapability & AST_FORMAT_VIDEO_MASK & p->redircodecs)) {
+				ast_debug(2, "This call needs video offers, but caller probably did not offer it!\n");
+			} else if (p->vrtp) {
 				needvideo = TRUE;
 				ast_debug(2, "This call needs video offers!\n");
-			} else
+			} else {
 				ast_debug(2, "This call needs video offers, but there's no video support enabled!\n");
+			}
 		}
 		/* Check if we need text in this call */
 		if ((p->jointcapability & AST_FORMAT_TEXT_MASK) && !p->notext) {