From 7d116deca0437d5b63ca0b6cf5cab9b0085496aa Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Sat, 8 Nov 2008 17:17:07 +0000
Subject: [PATCH] - increase framerate on windows - fix compilation problem
 (cleanly this time)

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@165 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 .../include/mediastreamer2/msvideoout.h              |  2 +-
 linphone/mediastreamer2/src/videoout.c               |  3 +++
 linphone/mediastreamer2/src/videostream.c            | 12 +-----------
 linphone/mediastreamer2/src/winvideo2.c              |  2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/linphone/mediastreamer2/include/mediastreamer2/msvideoout.h b/linphone/mediastreamer2/include/mediastreamer2/msvideoout.h
index 6d8eea7de..6081b7845 100644
--- a/linphone/mediastreamer2/include/mediastreamer2/msvideoout.h
+++ b/linphone/mediastreamer2/include/mediastreamer2/msvideoout.h
@@ -64,7 +64,7 @@ bool_t ms_display_poll_event(MSDisplay *d, MSDisplayEvent *ev);
 extern MSDisplayDesc ms_sdl_display_desc;
 
 #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(MEDIASTREAMER_STATIC)
-#ifdef MEDIASTREAMER2_EXPORTS
+#if defined(MEDIASTREAMER2_EXPORTS) && defined(INVIDEOUT_C)
    #define MSVAR_DECLSPEC    __declspec(dllexport)
 #else
    #define MSVAR_DECLSPEC    __declspec(dllimport)
diff --git a/linphone/mediastreamer2/src/videoout.c b/linphone/mediastreamer2/src/videoout.c
index 0afcc30a3..436895f1d 100644
--- a/linphone/mediastreamer2/src/videoout.c
+++ b/linphone/mediastreamer2/src/videoout.c
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "mediastreamer2/msfilter.h"
 #include "mediastreamer2/msvideo.h"
+
+/*required for dllexport of win_display_desc */
+#define INVIDEOUT_C 1
 #include "mediastreamer2/msvideoout.h"
 
 #include "ffmpeg-priv.h"
diff --git a/linphone/mediastreamer2/src/videostream.c b/linphone/mediastreamer2/src/videostream.c
index 789a83ab9..838b63db0 100644
--- a/linphone/mediastreamer2/src/videostream.c
+++ b/linphone/mediastreamer2/src/videostream.c
@@ -21,18 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/msfilter.h"
 #include "mediastreamer2/msvideo.h"
 #include "mediastreamer2/msrtp.h"
-
-
-#if defined(WIN32) || defined(_WIN32_WCE)
-/* avoid double declaration of ms_win_display_desc
-   -> Including twice msvideoout.h inside mediastreamer2
-   is NOT support with MSVC compiler.
-*/
-#define MS_VIDEO_OUT_HANDLE_RESIZING MS_FILTER_METHOD_NO_ARG(MS_VIDEO_OUT_ID,1)
-#define MS_VIDEO_OUT_AUTO_FIT	MS_FILTER_METHOD(MS_VIDEO_OUT_ID,3,int)
-#else
 #include "mediastreamer2/msvideoout.h"
-#endif
+
 
 #ifdef HAVE_CONFIG_H
 #include "mediastreamer-config.h"
diff --git a/linphone/mediastreamer2/src/winvideo2.c b/linphone/mediastreamer2/src/winvideo2.c
index 16b00ecbb..e770a4991 100755
--- a/linphone/mediastreamer2/src/winvideo2.c
+++ b/linphone/mediastreamer2/src/winvideo2.c
@@ -190,7 +190,7 @@ static void vfw_engine_destroy(VfwEngine *obj){
 static int _vfw_engine_setup(VfwEngine *obj){
 	CAPTUREPARMS capparam ;
 	capCaptureGetSetup(obj->capvideo,&capparam,sizeof(capparam)) ;
-	capparam.dwRequestMicroSecPerFrame = 100000 ;
+	capparam.dwRequestMicroSecPerFrame = 33000 ; /*makes around 30fps*/
 	// detach capture from application
 	capparam.fYield                    = TRUE ;
 	capparam.fMakeUserHitOKToCapture   = FALSE;