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
f55b78df
Commit
f55b78df
authored
Mar 28, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qasf/dmowrapper: Use the strmbase_passthrough object directly.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f27030f1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
16 deletions
+14
-16
Makefile.in
dlls/qasf/Makefile.in
+1
-1
dmowrapper.c
dlls/qasf/dmowrapper.c
+13
-15
No files found.
dlls/qasf/Makefile.in
View file @
f55b78df
MODULE
=
qasf.dll
IMPORTS
=
strmbase dmoguids strmiids uuid ole32
IMPORTS
=
strmbase dmoguids strmiids uuid ole32
oleaut32
EXTRADLLFLAGS
=
-mno-cygwin
...
...
dlls/qasf/dmowrapper.c
View file @
f55b78df
...
...
@@ -32,7 +32,7 @@ struct dmo_wrapper_source
{
struct
strmbase_source
pin
;
struct
buffer
buffer
;
IUnknown
*
seeking
;
struct
strmbase_passthrough
passthrough
;
};
struct
dmo_wrapper
...
...
@@ -405,10 +405,15 @@ static HRESULT dmo_wrapper_source_query_interface(struct strmbase_pin *iface, RE
{
struct
dmo_wrapper_source
*
pin
=
impl_source_from_strmbase_pin
(
iface
);
if
(
IsEqualGUID
(
iid
,
&
IID_IMediaSeeking
)
||
IsEqualGUID
(
iid
,
&
IID_IMediaPosition
))
return
IUnknown_QueryInterface
(
pin
->
seeking
,
iid
,
out
);
if
(
IsEqualGUID
(
iid
,
&
IID_IMediaPosition
))
*
out
=
&
pin
->
passthrough
.
IMediaPosition_iface
;
else
if
(
IsEqualGUID
(
iid
,
&
IID_IMediaSeeking
))
*
out
=
&
pin
->
passthrough
.
IMediaSeeking_iface
;
else
return
E_NOINTERFACE
;
return
E_NOINTERFACE
;
IUnknown_AddRef
((
IUnknown
*
)
*
out
);
return
S_OK
;
}
static
HRESULT
dmo_wrapper_source_query_accept
(
struct
strmbase_pin
*
iface
,
const
AM_MEDIA_TYPE
*
mt
)
...
...
@@ -568,20 +573,13 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID
for
(
i
=
0
;
i
<
output_count
;
++
i
)
{
ISeekingPassThru
*
passthrough
;
swprintf
(
id
,
ARRAY_SIZE
(
id
),
L"out%u"
,
i
);
strmbase_source_init
(
&
sources
[
i
].
pin
,
&
filter
->
filter
,
id
,
&
source_ops
);
sources
[
i
].
buffer
.
IMediaBuffer_iface
.
lpVtbl
=
&
buffer_vtbl
;
if
(
FAILED
(
hr
=
CoCreateInstance
(
&
CLSID_SeekingPassThru
,
(
IUnknown
*
)
&
sources
[
i
].
pin
.
pin
.
IPin_iface
,
CLSCTX_INPROC_SERVER
,
&
IID_IUnknown
,
(
void
**
)
&
sources
[
i
].
seeking
)))
ERR
(
"Failed to create SeekingPassThru object, hr %#x.
\n
"
,
hr
);
IUnknown_QueryInterface
(
sources
[
i
].
seeking
,
&
IID_ISeekingPassThru
,
(
void
**
)
&
passthrough
);
ISeekingPassThru_Init
(
passthrough
,
FALSE
,
&
sinks
[
0
].
pin
.
IPin_iface
);
ISeekingPassThru_Release
(
passthrough
);
strmbase_passthrough_init
(
&
sources
[
i
].
passthrough
,
(
IUnknown
*
)
&
sources
[
i
].
pin
.
pin
.
IPin_iface
);
ISeekingPassThru_Init
(
&
sources
[
i
].
passthrough
.
ISeekingPassThru_iface
,
FALSE
,
&
sinks
[
0
].
pin
.
IPin_iface
);
}
EnterCriticalSection
(
&
filter
->
filter
.
csFilter
);
...
...
@@ -630,7 +628,7 @@ static void dmo_wrapper_destroy(struct strmbase_filter *iface)
strmbase_sink_cleanup
(
&
filter
->
sinks
[
i
]);
for
(
i
=
0
;
i
<
filter
->
source_count
;
++
i
)
{
IUnknown_Release
(
filter
->
sources
[
i
].
seeking
);
strmbase_passthrough_cleanup
(
&
filter
->
sources
[
i
].
passthrough
);
strmbase_source_cleanup
(
&
filter
->
sources
[
i
].
pin
);
}
free
(
filter
->
sinks
);
...
...
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