Skip to content

W
wine-cw
Commit 8ad37074 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

qcap: Use a function table for video capture driver operations.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9e035293
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 178 deletions
dlls/qcap/qcap_private.h
View file @ 8ad37074
......@@ -40,23 +40,29 @@ HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
typedef struct _Capture Capture;
struct video_capture_device
{
const struct video_capture_device_ops *ops;
};
Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) DECLSPEC_HIDDEN;
HRESULT qcap_driver_destroy(Capture *device) DECLSPEC_HIDDEN;
HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN;
HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN;
HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **mt,
VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN;
LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN;
HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) DECLSPEC_HIDDEN;
HRESULT qcap_driver_get_prop_range(Capture *device, VideoProcAmpProperty property,
LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) DECLSPEC_HIDDEN;
HRESULT qcap_driver_get_prop(Capture *device, VideoProcAmpProperty property, LONG *value, LONG *flags) DECLSPEC_HIDDEN;
HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, LONG value, LONG flags) DECLSPEC_HIDDEN;
void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN;
void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN;
void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN;
void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN;
struct video_capture_device_ops
{
void (*destroy)(struct video_capture_device *device);
HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt);
HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt);
HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE **mt);
HRESULT (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE **mt, VIDEO_STREAM_CONFIG_CAPS *caps);
LONG (*get_caps_count)(struct video_capture_device *device);
HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property,
LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags);
HRESULT (*get_prop)(struct video_capture_device *device, VideoProcAmpProperty property, LONG *value, LONG *flags);
HRESULT (*set_prop)(struct video_capture_device *device, VideoProcAmpProperty property, LONG value, LONG flags);
void (*init_stream)(struct video_capture_device *device);
void (*start_stream)(struct video_capture_device *device);
void (*stop_stream)(struct video_capture_device *device);
void (*cleanup_stream)(struct video_capture_device *device);
};
struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHORT card);
#endif
dlls/qcap/vfwcapture.c
View file @ 8ad37074
......@@ -31,7 +31,8 @@ typedef struct VfwCapture
IAMFilterMiscFlags IAMFilterMiscFlags_iface;
IPersistPropertyBag IPersistPropertyBag_iface;
BOOL init;
Capture *driver_info;
struct video_capture_device *device;
struct strmbase_source source;
IKsPropertySet IKsPropertySet_iface;
......@@ -84,8 +85,8 @@ static void vfw_capture_destroy(struct strmbase_filter *iface)
if (filter->init)
{
if (filter->filter.state != State_Stopped)
qcap_driver_stop_stream(filter->driver_info);
qcap_driver_destroy(filter->driver_info);
filter->device->ops->stop_stream(filter->device);
filter->device->ops->destroy(filter->device);
}
if (filter->source.pin.peer)
......@@ -122,7 +123,7 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface)
{
VfwCapture *filter = impl_from_strmbase_filter(iface);
qcap_driver_init_stream(filter->driver_info);
filter->device->ops->init_stream(filter->device);
return VFW_S_CANT_CUE;
}
......@@ -130,7 +131,7 @@ static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE
{
VfwCapture *filter = impl_from_strmbase_filter(iface);
qcap_driver_start_stream(filter->driver_info);
filter->device->ops->start_stream(filter->device);
return S_OK;
}
......@@ -138,7 +139,7 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface)
{
VfwCapture *filter = impl_from_strmbase_filter(iface);
qcap_driver_stop_stream(filter->driver_info);
filter->device->ops->stop_stream(filter->device);
return VFW_S_CANT_CUE;
}
......@@ -146,7 +147,7 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface)
{
VfwCapture *filter = impl_from_strmbase_filter(iface);
qcap_driver_cleanup_stream(filter->driver_info);
filter->device->ops->cleanup_stream(filter->device);
return S_OK;
}
......@@ -211,7 +212,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
return VFW_E_INVALIDMEDIATYPE;
}
hr = qcap_driver_set_format(This->driver_info, pmt);
hr = This->device->ops->set_format(This->device, pmt);
if (SUCCEEDED(hr) && This->filter.graph && This->source.pin.peer)
{
hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface);
......@@ -222,14 +223,14 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
return hr;
}
static HRESULT WINAPI
AMStreamConfig_GetFormat( IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt )
static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt)
{
VfwCapture *This = impl_from_IAMStreamConfig(iface);
VfwCapture *filter = impl_from_IAMStreamConfig(iface);
HRESULT hr;
TRACE("%p -> (%p)\n", iface, pmt);
hr = qcap_driver_get_format(This->driver_info, pmt);
TRACE("filter %p, mt %p.\n", filter, pmt);
hr = filter->device->ops->get_format(filter->device, pmt);
if (SUCCEEDED(hr))
strmbase_dump_media_type(*pmt);
return hr;
......@@ -245,7 +246,7 @@ static HRESULT WINAPI AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *if
if (!count || !size)
return E_POINTER;
*count = qcap_driver_get_caps_count(filter->driver_info);
*count = filter->device->ops->get_caps_count(filter->device);
*size = sizeof(VIDEO_STREAM_CONFIG_CAPS);
return S_OK;
......@@ -258,7 +259,7 @@ static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface,
TRACE("filter %p, index %d, pmt %p, vscc %p.\n", filter, index, pmt, vscc);
return qcap_driver_get_caps(filter->driver_info, index, pmt, (VIDEO_STREAM_CONFIG_CAPS *)vscc);
return filter->device->ops->get_caps(filter->device, index, pmt, (VIDEO_STREAM_CONFIG_CAPS *)vscc);
}
static const IAMStreamConfigVtbl IAMStreamConfig_VTable =
......@@ -294,32 +295,36 @@ static ULONG WINAPI AMVideoProcAmp_Release(IAMVideoProcAmp * iface)
return IUnknown_Release(This->filter.outer_unk);
}
static HRESULT WINAPI
AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, LONG Property, LONG *pMin,
LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags )
static HRESULT WINAPI AMVideoProcAmp_GetRange(IAMVideoProcAmp *iface, LONG property,
LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags)
{
VfwCapture *This = impl_from_IAMVideoProcAmp(iface);
VfwCapture *filter = impl_from_IAMVideoProcAmp(iface);
TRACE("filter %p, property %#x, min %p, max %p, step %p, default_value %p, flags %p.\n",
filter, property, min, max, step, default_value, flags);
return qcap_driver_get_prop_range( This->driver_info, Property, pMin, pMax,
pSteppingDelta, pDefault, pCapsFlags );
return filter->device->ops->get_prop_range(filter->device, property, min,
max, step, default_value, flags);
}
static HRESULT WINAPI
AMVideoProcAmp_Set( IAMVideoProcAmp * iface, LONG Property, LONG lValue,
LONG Flags )
static HRESULT WINAPI AMVideoProcAmp_Set(IAMVideoProcAmp *iface, LONG property,
LONG value, LONG flags)
{
VfwCapture *This = impl_from_IAMVideoProcAmp(iface);
VfwCapture *filter = impl_from_IAMVideoProcAmp(iface);
return qcap_driver_set_prop(This->driver_info, Property, lValue, Flags);
TRACE("filter %p, property %#x, value %d, flags %#x.\n", filter, property, value, flags);
return filter->device->ops->set_prop(filter->device, property, value, flags);
}
static HRESULT WINAPI
AMVideoProcAmp_Get( IAMVideoProcAmp * iface, LONG Property, LONG *lValue,
LONG *Flags )
static HRESULT WINAPI AMVideoProcAmp_Get(IAMVideoProcAmp *iface, LONG property,
LONG *value, LONG *flags)
{
VfwCapture *This = impl_from_IAMVideoProcAmp(iface);
VfwCapture *filter = impl_from_IAMVideoProcAmp(iface);
TRACE("filter %p, property %#x, value %p, flags %p.\n", filter, property, value, flags);
return qcap_driver_get_prop(This->driver_info, Property, lValue, Flags);
return filter->device->ops->get_prop(filter->device, property, value, flags);
}
static const IAMVideoProcAmpVtbl IAMVideoProcAmp_VTable =
......@@ -388,8 +393,7 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag,
if (SUCCEEDED(hr))
{
This->driver_info = qcap_driver_init(&This->source, V_I4(&var));
if (This->driver_info)
if ((This->device = v4l_device_create(&This->source, V_I4(&var))))
{
This->init = TRUE;
hr = S_OK;
......@@ -505,7 +509,7 @@ static inline VfwCapture *impl_from_strmbase_pin(struct strmbase_pin *pin)
static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt)
{
VfwCapture *filter = impl_from_strmbase_pin(pin);
return qcap_driver_check_format(filter->driver_info, mt);
return filter->device->ops->check_format(filter->device, mt);
}
static HRESULT source_get_media_type(struct strmbase_pin *pin,
......@@ -515,11 +519,11 @@ static HRESULT source_get_media_type(struct strmbase_pin *pin,
AM_MEDIA_TYPE *vfw_pmt;
HRESULT hr;
if (index >= qcap_driver_get_caps_count(filter->driver_info))
if (index >= filter->device->ops->get_caps_count(filter->device))
return VFW_S_NO_MORE_ITEMS;
hr = qcap_driver_get_caps(filter->driver_info, index, &vfw_pmt, NULL);
if (SUCCEEDED(hr)) {
if (SUCCEEDED(hr = filter->device->ops->get_caps(filter->device, index, &vfw_pmt, NULL)))
{
CopyMediaType(pmt, vfw_pmt);
DeleteMediaType(vfw_pmt);
}
......
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