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

qcap/avimux: Use strmbase filter state change methods. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-12-04 23:03:29 -06:00 committed by Alexandre Julliard
parent f815626640
commit 74df86d8ed
1 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dlls/qcap/avimux.c
View File

@ -167,19 +167,6 @@ static HRESULT avi_mux_query_interface(struct strmbase_filter *iface, REFIID iid
return S_OK;
}
static const struct strmbase_filter_ops filter_ops =
{
.filter_get_pin = avi_mux_get_pin,
.filter_destroy = avi_mux_destroy,
.filter_query_interface = avi_mux_query_interface,
};
static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface)
{
struct strmbase_filter *filter = CONTAINING_RECORD(iface, struct strmbase_filter, IBaseFilter_iface);
return impl_from_strmbase_filter(filter);
}
static HRESULT out_flush(AviMux *This)
{
ULONG written;
@ -420,17 +407,12 @@ static HRESULT queue_sample(AviMux *avimux, AviMuxIn *avimuxin, IMediaSample *sa
return flush_queue(avimux, avimuxin, FALSE);
}
static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface)
static HRESULT avi_mux_cleanup_stream(struct strmbase_filter *iface)
{
AviMux *This = impl_from_IBaseFilter(iface);
AviMux *This = impl_from_strmbase_filter(iface);
HRESULT hr;
int i;
TRACE("(%p)\n", This);
if(This->filter.state == State_Stopped)
return S_OK;
if (This->stream)
{
AVIEXTHEADER dmlh;
@ -559,36 +541,20 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface)
This->stream = NULL;
}
This->filter.state = State_Stopped;
return S_OK;
}
static HRESULT WINAPI AviMux_Pause(IBaseFilter *iface)
static HRESULT avi_mux_init_stream(struct strmbase_filter *iface)
{
AviMux *This = impl_from_IBaseFilter(iface);
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart)
{
AviMux *This = impl_from_IBaseFilter(iface);
AviMux *This = impl_from_strmbase_filter(iface);
HRESULT hr;
int i, stream_id;
TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart));
if(This->filter.state == State_Running)
return S_OK;
if(This->mode != INTERLEAVE_FULL) {
FIXME("mode not supported (%d)\n", This->mode);
return E_NOTIMPL;
}
if(tStart)
FIXME("tStart parameter ignored\n");
for(i=0; i<This->input_pin_no; i++) {
IMediaSeeking *ms;
LONGLONG cur, stop;
@ -694,18 +660,26 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart)
This->avih.dwWidth = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biWidth;
This->avih.dwHeight = ((BITMAPINFOHEADER*)This->in[0]->strf->data)->biHeight;
This->filter.state = State_Running;
return S_OK;
}
static const struct strmbase_filter_ops filter_ops =
{
.filter_get_pin = avi_mux_get_pin,
.filter_destroy = avi_mux_destroy,
.filter_query_interface = avi_mux_query_interface,
.filter_init_stream = avi_mux_init_stream,
.filter_cleanup_stream = avi_mux_cleanup_stream,
};
static const IBaseFilterVtbl AviMuxVtbl = {
BaseFilterImpl_QueryInterface,
BaseFilterImpl_AddRef,
BaseFilterImpl_Release,
BaseFilterImpl_GetClassID,
AviMux_Stop,
AviMux_Pause,
AviMux_Run,
BaseFilterImpl_Stop,
BaseFilterImpl_Pause,
BaseFilterImpl_Run,
BaseFilterImpl_GetState,
BaseFilterImpl_SetSyncSource,
BaseFilterImpl_GetSyncSource,