Commit 7d116dec authored by smorlat's avatar smorlat
Browse files

- 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
parent a579563e
......@@ -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)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment