Commit c77ab037 authored by smorlat's avatar smorlat
Browse files

work in progress for improving windows webcam support fastness.



git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@105 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 933a8982
......@@ -41,6 +41,7 @@ extern MSFilterDesc ms_resample_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_static_image_desc;
extern MSFilterDesc ms_mire_desc;
extern MSFilterDesc ms_vfw_desc;
MSFilterDesc * ms_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
......@@ -85,6 +86,7 @@ MSFilterDesc * ms_filter_descs[]={
&ms_volume_desc,
&ms_static_image_desc,
&ms_mire_desc,
&ms_vfw_desc,
NULL
};
[Project]
FileName=mediastreamer2.dev
Name=mediastreamer2
UnitCount=54
UnitCount=55
Type=2
Ver=3
IsCpp=1
......@@ -601,3 +601,13 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit55]
FileName=..\..\src\winvideo2.c
CompileCpp=0
Folder=
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c winvideo2.c -o "Default Profile/winvideo2.o" $(CFLAGS)
......@@ -73,15 +73,14 @@ typedef enum MSFilterId{
MS_SNOW_ENC_ID,
MS_CA_READ_ID,
MS_CA_WRITE_ID,
#ifdef __DIRECTSOUND_ENABLED__
MS_WINSNDDS_READ_ID,
MS_WINSNDDS_WRITE_ID,
#endif
MS_STATIC_IMAGE_ID,
MS_V4L2_CAPTURE_ID,
MS_H263_OLD_DEC_ID,
MS_H263_OLD_ENC_ID,
MS_MIRE_ID
MS_MIRE_ID,
MS_VFW_ID
} MSFilterId;
......
......@@ -77,6 +77,7 @@ typedef enum{
MS_YUV420P,
MS_YUYV,
MS_RGB24,
MS_RGB24_REV, /*->microsoft down-top bitmaps */
MS_MJPEG,
MS_UYVY,
MS_YUY2, /* -> same as MS_YUYV */
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([msx264],[1.1.4])
AC_INIT([msx264],[1.1.5])
AM_INIT_AUTOMAKE([tar-ustar])
......
......@@ -3,7 +3,7 @@
[Setup]
AppName=msx264
AppVerName=msx264 version 1.1.4., an H.264 plugin for linphone.
AppVerName=msx264 version 1.1.5., an H.264 plugin for linphone.
AppPublisher=linphone.org
AppPublisherURL=http://www.linphone.org
AppSupportURL=http://www.linphone.org
......
......@@ -472,7 +472,7 @@ extern MSWebCamDesc v4l2_desc;
#endif
#ifdef WIN32
extern MSWebCamDesc ms_v4w_cam_desc;
extern MSWebCamDesc ms_vfw_cam_desc;
#endif
extern MSWebCamDesc static_image_desc;
......@@ -486,7 +486,7 @@ static MSWebCamDesc * ms_web_cam_descs[]={
&v4l_desc,
#endif
#ifdef WIN32
&ms_v4w_cam_desc,
&ms_vfw_cam_desc,
#endif
&mire_desc,
&static_image_desc,
......
......@@ -38,6 +38,28 @@ typedef struct tagCaptureParms {
UINT AVStreamMaster; // Which stream controls length?
} CAPTUREPARMS, *PCAPTUREPARMS, FAR *LPCAPTUREPARMS;
typedef struct {
UINT uiImageWidth;
UINT uiImageHeight;
BOOL fLiveWindow;
BOOL fOverlayWindow;
BOOL fScale;
POINT ptScroll;
BOOL fUsingDefaultPalette;
BOOL fAudioHardware;
BOOL fCapFileExists;
DWORD dwCurrentVideoFrame;
DWORD dwCurrentVideoFramesDropped;
DWORD dwCurrentWaveSamples;
DWORD dwCurrentTimeElapsedMS;
HPALETTE hPalCurrent;
BOOL fCapturingNow;
DWORD dwReturn;
UINT wNumVideoAllocated;
UINT wNumAudioAllocated;
} CAPSTATUS, *PCAPSTATUS, FAR *LPCAPSTATUS;
#ifdef __cplusplus
/* SendMessage in C++*/
#define AVICapSM(hwnd,m,w,l) ( (::IsWindow(hwnd)) ? ::SendMessage(hwnd,m,w,l) : 0)
......
......@@ -257,7 +257,6 @@ int video_stream_start (VideoStream *stream, RtpProfile *profile, const char *re
ms_filter_call_method(stream->source,MS_FILTER_GET_VIDEO_SIZE,&vsize);
ms_filter_call_method(stream->pixconv,MS_FILTER_SET_VIDEO_SIZE,&vsize);
}
ms_filter_call_method(stream->encoder,MS_FILTER_GET_VIDEO_SIZE,&vsize);
......
......@@ -627,6 +627,7 @@ MSFilterDesc ms_v4w_desc={
MS_FILTER_DESC_EXPORT(ms_v4w_desc)
#if 0
static void ms_v4w_detect(MSWebCamManager *obj);
static void ms_v4w_cam_init(MSWebCam *cam){
......@@ -678,3 +679,4 @@ static void ms_v4w_detect(MSWebCamManager *obj){
}
}
#endif
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