Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
97cf9ab4
Commit
97cf9ab4
authored
May 28, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
May 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Use strmbase filter methods directly.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e707bb49
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
71 deletions
+23
-71
avisplit.c
dlls/quartz/avisplit.c
+8
-8
mpegsplit.c
dlls/quartz/mpegsplit.c
+7
-7
parser.c
dlls/quartz/parser.c
+0
-40
parser.h
dlls/quartz/parser.h
+0
-8
waveparser.c
dlls/quartz/waveparser.c
+8
-8
No files found.
dlls/quartz/avisplit.c
View file @
97cf9ab4
...
@@ -1394,21 +1394,21 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface)
...
@@ -1394,21 +1394,21 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface)
static
const
IBaseFilterVtbl
AVISplitterImpl_Vtbl
=
static
const
IBaseFilterVtbl
AVISplitterImpl_Vtbl
=
{
{
Parser
_QueryInterface
,
BaseFilterImpl
_QueryInterface
,
Parser
_AddRef
,
BaseFilterImpl
_AddRef
,
BaseFilterImpl_Release
,
BaseFilterImpl_Release
,
Parser
_GetClassID
,
BaseFilterImpl
_GetClassID
,
Parser_Stop
,
Parser_Stop
,
Parser_Pause
,
Parser_Pause
,
Parser_Run
,
Parser_Run
,
Parser_GetState
,
Parser_GetState
,
Parser_SetSyncSource
,
Parser_SetSyncSource
,
Parser
_GetSyncSource
,
BaseFilterImpl
_GetSyncSource
,
Parser
_EnumPins
,
BaseFilterImpl
_EnumPins
,
BaseFilterImpl_FindPin
,
BaseFilterImpl_FindPin
,
Parser
_QueryFilterInfo
,
BaseFilterImpl
_QueryFilterInfo
,
Parser
_JoinFilterGraph
,
BaseFilterImpl
_JoinFilterGraph
,
Parser_QueryVendorInfo
BaseFilterImpl_QueryVendorInfo
,
};
};
static
void
avi_splitter_destroy
(
BaseFilter
*
iface
)
static
void
avi_splitter_destroy
(
BaseFilter
*
iface
)
...
...
dlls/quartz/mpegsplit.c
View file @
97cf9ab4
...
@@ -794,20 +794,20 @@ static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID rii
...
@@ -794,20 +794,20 @@ static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID rii
static
const
IBaseFilterVtbl
MPEGSplitter_Vtbl
=
static
const
IBaseFilterVtbl
MPEGSplitter_Vtbl
=
{
{
MPEGSplitter_QueryInterface
,
MPEGSplitter_QueryInterface
,
Parser
_AddRef
,
BaseFilterImpl
_AddRef
,
BaseFilterImpl_Release
,
BaseFilterImpl_Release
,
Parser
_GetClassID
,
BaseFilterImpl
_GetClassID
,
Parser_Stop
,
Parser_Stop
,
Parser_Pause
,
Parser_Pause
,
Parser_Run
,
Parser_Run
,
Parser_GetState
,
Parser_GetState
,
Parser_SetSyncSource
,
Parser_SetSyncSource
,
Parser
_GetSyncSource
,
BaseFilterImpl
_GetSyncSource
,
Parser
_EnumPins
,
BaseFilterImpl
_EnumPins
,
BaseFilterImpl_FindPin
,
BaseFilterImpl_FindPin
,
Parser
_QueryFilterInfo
,
BaseFilterImpl
_QueryFilterInfo
,
Parser
_JoinFilterGraph
,
BaseFilterImpl
_JoinFilterGraph
,
Parser_QueryVendorInfo
BaseFilterImpl_QueryVendorInfo
,
};
};
static
HRESULT
WINAPI
AMStreamSelect_QueryInterface
(
IAMStreamSelect
*
iface
,
REFIID
riid
,
void
**
ppv
)
static
HRESULT
WINAPI
AMStreamSelect_QueryInterface
(
IAMStreamSelect
*
iface
,
REFIID
riid
,
void
**
ppv
)
...
...
dlls/quartz/parser.c
View file @
97cf9ab4
...
@@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This)
...
@@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This)
CoTaskMemFree
(
This
);
CoTaskMemFree
(
This
);
}
}
/** IPersist methods **/
HRESULT
WINAPI
Parser_GetClassID
(
IBaseFilter
*
iface
,
CLSID
*
pClsid
)
{
ParserImpl
*
This
=
impl_from_IBaseFilter
(
iface
);
TRACE
(
"%p->(%p)
\n
"
,
This
,
pClsid
);
*
pClsid
=
This
->
filter
.
clsid
;
return
S_OK
;
}
/** IMediaFilter methods **/
/** IMediaFilter methods **/
HRESULT
WINAPI
Parser_Stop
(
IBaseFilter
*
iface
)
HRESULT
WINAPI
Parser_Stop
(
IBaseFilter
*
iface
)
...
@@ -362,33 +349,6 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock
...
@@ -362,33 +349,6 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock
return
S_OK
;
return
S_OK
;
}
}
HRESULT
WINAPI
Parser_GetSyncSource
(
IBaseFilter
*
iface
,
IReferenceClock
**
ppClock
)
{
return
BaseFilterImpl_GetSyncSource
(
iface
,
ppClock
);
}
/** IBaseFilter implementation **/
HRESULT
WINAPI
Parser_EnumPins
(
IBaseFilter
*
iface
,
IEnumPins
**
ppEnum
)
{
return
BaseFilterImpl_EnumPins
(
iface
,
ppEnum
);
}
HRESULT
WINAPI
Parser_QueryFilterInfo
(
IBaseFilter
*
iface
,
FILTER_INFO
*
pInfo
)
{
return
BaseFilterImpl_QueryFilterInfo
(
iface
,
pInfo
);
}
HRESULT
WINAPI
Parser_JoinFilterGraph
(
IBaseFilter
*
iface
,
IFilterGraph
*
pGraph
,
LPCWSTR
pName
)
{
return
BaseFilterImpl_JoinFilterGraph
(
iface
,
pGraph
,
pName
);
}
HRESULT
WINAPI
Parser_QueryVendorInfo
(
IBaseFilter
*
iface
,
LPWSTR
*
pVendorInfo
)
{
return
BaseFilterImpl_QueryVendorInfo
(
iface
,
pVendorInfo
);
}
static
const
BaseOutputPinFuncTable
output_BaseOutputFuncTable
=
{
static
const
BaseOutputPinFuncTable
output_BaseOutputFuncTable
=
{
{
{
Parser_OutputPin_CheckMediaType
,
Parser_OutputPin_CheckMediaType
,
...
...
dlls/quartz/parser.h
View file @
97cf9ab4
...
@@ -61,19 +61,11 @@ HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl,
...
@@ -61,19 +61,11 @@ HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl,
/* Override the _Release function and call this when releasing */
/* Override the _Release function and call this when releasing */
extern
void
Parser_Destroy
(
ParserImpl
*
This
);
extern
void
Parser_Destroy
(
ParserImpl
*
This
);
extern
HRESULT
WINAPI
Parser_QueryInterface
(
IBaseFilter
*
iface
,
REFIID
riid
,
LPVOID
*
ppv
);
extern
ULONG
WINAPI
Parser_AddRef
(
IBaseFilter
*
iface
);
extern
HRESULT
WINAPI
Parser_GetClassID
(
IBaseFilter
*
iface
,
CLSID
*
pClsid
);
extern
HRESULT
WINAPI
Parser_Stop
(
IBaseFilter
*
iface
);
extern
HRESULT
WINAPI
Parser_Stop
(
IBaseFilter
*
iface
);
extern
HRESULT
WINAPI
Parser_Pause
(
IBaseFilter
*
iface
);
extern
HRESULT
WINAPI
Parser_Pause
(
IBaseFilter
*
iface
);
extern
HRESULT
WINAPI
Parser_Run
(
IBaseFilter
*
iface
,
REFERENCE_TIME
tStart
);
extern
HRESULT
WINAPI
Parser_Run
(
IBaseFilter
*
iface
,
REFERENCE_TIME
tStart
);
extern
HRESULT
WINAPI
Parser_GetState
(
IBaseFilter
*
iface
,
DWORD
dwMilliSecsTimeout
,
FILTER_STATE
*
pState
);
extern
HRESULT
WINAPI
Parser_GetState
(
IBaseFilter
*
iface
,
DWORD
dwMilliSecsTimeout
,
FILTER_STATE
*
pState
);
extern
HRESULT
WINAPI
Parser_SetSyncSource
(
IBaseFilter
*
iface
,
IReferenceClock
*
pClock
);
extern
HRESULT
WINAPI
Parser_SetSyncSource
(
IBaseFilter
*
iface
,
IReferenceClock
*
pClock
);
extern
HRESULT
WINAPI
Parser_GetSyncSource
(
IBaseFilter
*
iface
,
IReferenceClock
**
ppClock
);
extern
HRESULT
WINAPI
Parser_EnumPins
(
IBaseFilter
*
iface
,
IEnumPins
**
ppEnum
);
extern
HRESULT
WINAPI
Parser_QueryFilterInfo
(
IBaseFilter
*
iface
,
FILTER_INFO
*
pInfo
);
extern
HRESULT
WINAPI
Parser_JoinFilterGraph
(
IBaseFilter
*
iface
,
IFilterGraph
*
pGraph
,
LPCWSTR
pName
);
extern
HRESULT
WINAPI
Parser_QueryVendorInfo
(
IBaseFilter
*
iface
,
LPWSTR
*
pVendorInfo
);
IPin
*
parser_get_pin
(
BaseFilter
*
iface
,
unsigned
int
index
)
DECLSPEC_HIDDEN
;
IPin
*
parser_get_pin
(
BaseFilter
*
iface
,
unsigned
int
index
)
DECLSPEC_HIDDEN
;
...
...
dlls/quartz/waveparser.c
View file @
97cf9ab4
...
@@ -396,21 +396,21 @@ static HRESULT WAVEParser_disconnect(LPVOID iface)
...
@@ -396,21 +396,21 @@ static HRESULT WAVEParser_disconnect(LPVOID iface)
static
const
IBaseFilterVtbl
WAVEParser_Vtbl
=
static
const
IBaseFilterVtbl
WAVEParser_Vtbl
=
{
{
Parser
_QueryInterface
,
BaseFilterImpl
_QueryInterface
,
Parser
_AddRef
,
BaseFilterImpl
_AddRef
,
BaseFilterImpl_Release
,
BaseFilterImpl_Release
,
Parser
_GetClassID
,
BaseFilterImpl
_GetClassID
,
Parser_Stop
,
Parser_Stop
,
Parser_Pause
,
Parser_Pause
,
Parser_Run
,
Parser_Run
,
Parser_GetState
,
Parser_GetState
,
Parser_SetSyncSource
,
Parser_SetSyncSource
,
Parser
_GetSyncSource
,
BaseFilterImpl
_GetSyncSource
,
Parser
_EnumPins
,
BaseFilterImpl
_EnumPins
,
BaseFilterImpl_FindPin
,
BaseFilterImpl_FindPin
,
Parser
_QueryFilterInfo
,
BaseFilterImpl
_QueryFilterInfo
,
Parser
_JoinFilterGraph
,
BaseFilterImpl
_JoinFilterGraph
,
Parser_QueryVendorInfo
BaseFilterImpl_QueryVendorInfo
,
};
};
static
void
wave_parser_destroy
(
BaseFilter
*
iface
)
static
void
wave_parser_destroy
(
BaseFilter
*
iface
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment