r3436 - trunk/libminisip/source/subsystem_signaling/sip

[erik at minisip.org]

Author: erik
Date: 2007-10-18 16:14:32 +0200 (Thu, 18 Oct 2007)
New Revision: 3436

Modified:
   trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx
Log:

 * Video display frame size bug fix:
    There are two kinds of video support. You might be able
    to send video, and you might be able to display video.
    
    We only have one define, VIDEO_SUPPORT, and that is
    not enough when supporting only one of the two kinds.

    This fix does not solve the real problem
    (VIDEO_SEND_SUPPORT/VIDEO_RECEIVE_SUPPORT), but instead
    makes sure that the frame size setting in the configuration
    file is set to reasonable values in all cases.



Modified: trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx	2007-10-18 13:24:56 UTC (rev 3435)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx	2007-10-18 14:14:32 UTC (rev 3436)
@@ -370,9 +370,9 @@
 
 #ifdef VIDEO_SUPPORT
 	backend->save( "video_device", videoDevice );
+#endif
 	backend->save( "frame_width", frameWidth );
 	backend->save( "frame_height", frameHeight );
-#endif
 
 	list<string>::iterator iCodec;
 	uint8_t iC = 0;
@@ -811,9 +811,11 @@
 #ifdef VIDEO_SUPPORT
 	videoDevice = backend->loadString( "video_device", "" );
 	cerr << "Loaded video_device" << videoDevice << endl;
+#endif
+	//Even if we can't send video, we might be able to display it.
+	//Therefore this is not within the VIDEO_SUPPORT ifdef
 	frameWidth = backend->loadInt( "frame_width", 176 );
 	frameHeight = backend->loadInt( "frame_height", 144 );
-#endif
 
 	sipStackConfig->use100Rel = backend->loadBool("use_100rel");
 	useAnat = backend->loadBool("use_anat");