Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
0070860e
Commit
0070860e
authored
Apr 07, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf: Return sink flags for SAR.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
509bef71
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
sar.c
dlls/mf/sar.c
+9
-2
mf.c
dlls/mf/tests/mf.c
+12
-1
No files found.
dlls/mf/sar.c
View file @
0070860e
...
...
@@ -99,9 +99,16 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface)
static
HRESULT
WINAPI
audio_renderer_sink_GetCharacteristics
(
IMFMediaSink
*
iface
,
DWORD
*
flags
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
flags
);
struct
audio_renderer
*
renderer
=
impl_from_IMFMediaSink
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
flags
);
if
(
renderer
->
is_shut_down
)
return
MF_E_SHUTDOWN
;
*
flags
=
MEDIASINK_FIXED_STREAMS
|
MEDIASINK_CAN_PREROLL
;
return
S_OK
;
}
static
HRESULT
WINAPI
audio_renderer_sink_AddStreamSink
(
IMFMediaSink
*
iface
,
DWORD
stream_sink_id
,
...
...
dlls/mf/tests/mf.c
View file @
0070860e
...
...
@@ -2639,6 +2639,7 @@ static void test_sar(void)
MFCLOCK_STATE
state
;
DWORD
flags
,
count
;
IMFClock
*
clock
;
IUnknown
*
unk
;
HRESULT
hr
;
hr
=
CoInitialize
(
NULL
);
...
...
@@ -2693,6 +2694,14 @@ if (SUCCEEDED(hr))
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
count
==
1
,
"Unexpected count %u.
\n
"
,
count
);
hr
=
IMFMediaSink_GetCharacteristics
(
sink
,
&
flags
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
flags
==
(
MEDIASINK_FIXED_STREAMS
|
MEDIASINK_CAN_PREROLL
),
"Unexpected flags %#x.
\n
"
,
flags
);
hr
=
IMFMediaSink_QueryInterface
(
sink
,
&
IID_IMFMediaSinkPreroll
,
(
void
**
)
&
unk
);
ok
(
hr
==
S_OK
,
"Failed to get interface, hr %#x.
\n
"
,
hr
);
IUnknown_Release
(
unk
);
/* Shutdown */
hr
=
IMFMediaSink_Shutdown
(
sink
);
ok
(
hr
==
S_OK
,
"Failed to shut down, hr %#x.
\n
"
,
hr
);
...
...
@@ -2712,6 +2721,9 @@ if (SUCCEEDED(hr))
hr
=
IMFMediaSink_GetStreamSinkCount
(
sink
,
&
count
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaSink_GetCharacteristics
(
sink
,
&
flags
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#x.
\n
"
,
hr
);
IMFMediaSink_Release
(
sink
);
/* Activation */
...
...
@@ -2727,7 +2739,6 @@ if (SUCCEEDED(hr))
IMFMediaSink_Release
(
sink2
);
hr
=
IMFMediaSink_GetCharacteristics
(
sink
,
&
flags
);
todo_wine
ok
(
hr
==
S_OK
,
"Failed to get sink flags, hr %#x.
\n
"
,
hr
);
hr
=
IMFActivate_ShutdownObject
(
activate
);
...
...
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