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
d63ff340
Commit
d63ff340
authored
Oct 22, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/mixer: Implement GetOutputStatus().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5496b889
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
3 deletions
+49
-3
mixer.c
dlls/evr/mixer.c
+29
-3
evr.c
dlls/evr/tests/evr.c
+20
-0
No files found.
dlls/evr/mixer.c
View file @
d63ff340
...
...
@@ -934,11 +934,37 @@ static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface,
return
hr
;
}
static
HRESULT
WINAPI
video_mixer_transform_GetOutputStatus
(
IMFTransform
*
iface
,
DWORD
*
flag
s
)
static
HRESULT
WINAPI
video_mixer_transform_GetOutputStatus
(
IMFTransform
*
iface
,
DWORD
*
statu
s
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
flags
);
struct
video_mixer
*
mixer
=
impl_from_IMFTransform
(
iface
);
HRESULT
hr
=
S_OK
;
unsigned
int
i
;
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
status
);
if
(
!
status
)
return
E_POINTER
;
EnterCriticalSection
(
&
mixer
->
cs
);
if
(
!
mixer
->
output
.
media_type
)
hr
=
MF_E_TRANSFORM_TYPE_NOT_SET
;
else
{
*
status
=
MFT_OUTPUT_STATUS_SAMPLE_READY
;
for
(
i
=
0
;
i
<
mixer
->
input_count
;
++
i
)
{
if
(
!
mixer
->
inputs
[
i
].
sample
)
{
*
status
=
0
;
break
;
}
}
}
LeaveCriticalSection
(
&
mixer
->
cs
);
return
hr
;
}
static
HRESULT
WINAPI
video_mixer_transform_SetOutputBounds
(
IMFTransform
*
iface
,
LONGLONG
lower
,
LONGLONG
upper
)
...
...
dlls/evr/tests/evr.c
View file @
d63ff340
...
...
@@ -2098,6 +2098,12 @@ static void test_mixer_samples(void)
hr
=
IMFTransform_GetInputStatus
(
mixer
,
1
,
&
status
);
ok
(
hr
==
MF_E_TRANSFORM_TYPE_NOT_SET
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_GetOutputStatus
(
mixer
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_GetOutputStatus
(
mixer
,
&
status
);
ok
(
hr
==
MF_E_TRANSFORM_TYPE_NOT_SET
,
"Unexpected hr %#x.
\n
"
,
hr
);
/* Configure device and media types. */
hr
=
DXVA2CreateDirect3DDeviceManager9
(
&
token
,
&
manager
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -2132,6 +2138,11 @@ static void test_mixer_samples(void)
hr
=
IMFTransform_GetInputStatus
(
mixer
,
1
,
&
status
);
ok
(
hr
==
MF_E_INVALIDSTREAMNUMBER
,
"Unexpected hr %#x.
\n
"
,
hr
);
status
=
~
0u
;
hr
=
IMFTransform_GetOutputStatus
(
mixer
,
&
status
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
status
,
"Unexpected status %#x.
\n
"
,
status
);
IMFMediaType_Release
(
video_type
);
memset
(
&
buffer
,
0
,
sizeof
(
buffer
));
...
...
@@ -2190,6 +2201,11 @@ todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
status
==
MFT_INPUT_STATUS_ACCEPT_DATA
,
"Unexpected status %#x.
\n
"
,
status
);
status
=
~
0u
;
hr
=
IMFTransform_GetOutputStatus
(
mixer
,
&
status
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
status
,
"Unexpected status %#x.
\n
"
,
status
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
0
,
sample
,
0
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
@@ -2198,6 +2214,10 @@ todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
status
,
"Unexpected status %#x.
\n
"
,
status
);
hr
=
IMFTransform_GetOutputStatus
(
mixer
,
&
status
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
status
==
MFT_OUTPUT_STATUS_SAMPLE_READY
,
"Unexpected status %#x.
\n
"
,
status
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
0
,
sample
,
0
);
ok
(
hr
==
MF_E_NOTACCEPTING
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
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