ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qcap: Use the proper types.

This commit is contained in:
Michael Stefaniuc 2010-05-19 12:55:49 +02:00 committed by Alexandre Julliard
parent 2c2e3f8665
commit 91c7d4f909
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/qcap/capture.h
View File

@ -30,9 +30,9 @@ Capture *qcap_driver_init(IPin*,USHORT);
HRESULT qcap_driver_destroy(Capture*); HRESULT qcap_driver_destroy(Capture*);
HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*); HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*);
HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**); HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**);
HRESULT qcap_driver_get_prop_range(Capture*,LONG,LONG*,LONG*,LONG*,LONG*,LONG*); HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*);
HRESULT qcap_driver_get_prop(Capture*,LONG,LONG*,LONG*); HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*);
HRESULT qcap_driver_set_prop(Capture*,long,long,long); HRESULT qcap_driver_set_prop(Capture*,VideoProcAmpProperty,LONG,LONG);
HRESULT qcap_driver_run(Capture*,FILTER_STATE*); HRESULT qcap_driver_run(Capture*,FILTER_STATE*);
HRESULT qcap_driver_pause(Capture*,FILTER_STATE*); HRESULT qcap_driver_pause(Capture*,FILTER_STATE*);
HRESULT qcap_driver_stop(Capture*,FILTER_STATE*); HRESULT qcap_driver_stop(Capture*,FILTER_STATE*);

30
dlls/qcap/v4l.c
View File

@ -351,8 +351,9 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT)
return S_OK; return S_OK;
} }
HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, HRESULT qcap_driver_get_prop_range( Capture *capBox,
LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) VideoProcAmpProperty Property, LONG *pMin, LONG *pMax,
LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags )
{ {
TRACE("%p -> %d %p %p %p %p %p\n", capBox, Property, TRACE("%p -> %d %p %p %p %p %p\n", capBox, Property,
pMin, pMax, pSteppingDelta, pDefault, pCapsFlags); pMin, pMax, pSteppingDelta, pDefault, pCapsFlags);
@ -382,7 +383,8 @@ HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin,
return S_OK; return S_OK;
} }
HRESULT qcap_driver_get_prop( Capture *capBox, LONG Property, LONG *lValue, LONG *Flags ) HRESULT qcap_driver_get_prop( Capture *capBox,
VideoProcAmpProperty Property, LONG *lValue, LONG *Flags )
{ {
TRACE("%p -> %d %p %p\n", capBox, Property, lValue, Flags); TRACE("%p -> %d %p %p\n", capBox, Property, lValue, Flags);
@ -408,9 +410,10 @@ HRESULT qcap_driver_get_prop( Capture *capBox, LONG Property, LONG *lValue, LONG
return S_OK; return S_OK;
} }
HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long Flags) HRESULT qcap_driver_set_prop(Capture *capBox, VideoProcAmpProperty Property,
LONG lValue, LONG Flags)
{ {
TRACE("%p -> %ld %ld %ld\n", capBox, Property, lValue, Flags); TRACE("%p -> %d %d %d\n", capBox, Property, lValue, Flags);
switch (Property) switch (Property)
{ {
@ -427,7 +430,7 @@ HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long F
capBox->pict.colour = lValue; capBox->pict.colour = lValue;
break; break;
default: default:
FIXME("Not implemented %ld\n", Property); FIXME("Not implemented %d\n", Property);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -598,7 +601,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
Capture * capBox = lParam; Capture * capBox = lParam;
HRESULT hr; HRESULT hr;
IMediaSample *pSample = NULL; IMediaSample *pSample = NULL;
unsigned long framecount = 0; ULONG framecount = 0;
unsigned char *pTarget, *pInput, *pOutput; unsigned char *pTarget, *pInput, *pOutput;
hr = V4l_Prepare(capBox); hr = V4l_Prepare(capBox);
@ -636,7 +639,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
capBox->renderer(capBox, pOutput, pInput); capBox->renderer(capBox, pOutput, pInput);
Resize(capBox, pTarget, pOutput); Resize(capBox, pTarget, pOutput);
hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample);
TRACE("%p -> Frame %lu: %x\n", capBox, ++framecount, hr); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr);
IMediaSample_Release(pSample); IMediaSample_Release(pSample);
V4l_FreeFrame(capBox); V4l_FreeFrame(capBox);
} }
@ -960,18 +963,21 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT)
FAIL_WITH_ERR; FAIL_WITH_ERR;
} }
HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, HRESULT qcap_driver_get_prop_range( Capture *capBox,
LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) VideoProcAmpProperty Property, LONG *pMin, LONG *pMax,
LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags )
{ {
FAIL_WITH_ERR; FAIL_WITH_ERR;
} }
HRESULT qcap_driver_get_prop(Capture *capBox, LONG Property, LONG *lValue, LONG *Flags) HRESULT qcap_driver_get_prop(Capture *capBox,
VideoProcAmpProperty Property, LONG *lValue, LONG *Flags)
{ {
FAIL_WITH_ERR; FAIL_WITH_ERR;
} }
HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long Flags) HRESULT qcap_driver_set_prop(Capture *capBox, VideoProcAmpProperty Property,
LONG lValue, LONG Flags)
{ {
FAIL_WITH_ERR; FAIL_WITH_ERR;
} }