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
3f2ff939
Commit
3f2ff939
authored
Mar 31, 2023
by
Paul Gofman
Committed by
Alexandre Julliard
Apr 10, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Process MFT_MESSAGE_SET_D3D_MANAGER in h264 decoder.
parent
31d11d80
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
transform.c
dlls/mf/tests/transform.c
+1
-1
h264_decoder.c
dlls/winegstreamer/h264_decoder.c
+15
-2
No files found.
dlls/mf/tests/transform.c
View file @
3f2ff939
...
...
@@ -6832,7 +6832,7 @@ static void test_h264_with_dxgi_manager(void)
IMFAttributes_Release
(
attribs
);
hr
=
IMFTransform_ProcessMessage
(
transform
,
MFT_MESSAGE_SET_D3D_MANAGER
,
(
ULONG_PTR
)
transform
);
todo_wine
ok
(
hr
==
E_NOINTERFACE
,
"got %#lx
\n
"
,
hr
);
ok
(
hr
==
E_NOINTERFACE
,
"got %#lx
\n
"
,
hr
);
hr
=
IMFTransform_ProcessMessage
(
transform
,
MFT_MESSAGE_SET_D3D_MANAGER
,
(
ULONG_PTR
)
manager
);
ok
(
hr
==
S_OK
||
broken
(
hr
==
E_NOINTERFACE
),
"got %#lx
\n
"
,
hr
);
...
...
dlls/winegstreamer/h264_decoder.c
View file @
3f2ff939
...
...
@@ -61,6 +61,8 @@ struct h264_decoder
struct
wg_format
wg_format
;
struct
wg_transform
*
wg_transform
;
struct
wg_sample_queue
*
wg_sample_queue
;
IMFVideoSampleAllocatorEx
*
allocator
;
};
static
struct
h264_decoder
*
impl_from_IMFTransform
(
IMFTransform
*
iface
)
...
...
@@ -241,6 +243,7 @@ static ULONG WINAPI transform_Release(IMFTransform *iface)
if
(
!
refcount
)
{
IMFVideoSampleAllocatorEx_Release
(
decoder
->
allocator
);
if
(
decoder
->
wg_transform
)
wg_transform_destroy
(
decoder
->
wg_transform
);
if
(
decoder
->
input_type
)
...
...
@@ -251,7 +254,6 @@ static ULONG WINAPI transform_Release(IMFTransform *iface)
IMFAttributes_Release
(
decoder
->
output_attributes
);
if
(
decoder
->
attributes
)
IMFAttributes_Release
(
decoder
->
attributes
);
wg_sample_queue_destroy
(
decoder
->
wg_sample_queue
);
free
(
decoder
);
}
...
...
@@ -580,7 +582,14 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
static
HRESULT
WINAPI
transform_ProcessMessage
(
IMFTransform
*
iface
,
MFT_MESSAGE_TYPE
message
,
ULONG_PTR
param
)
{
FIXME
(
"iface %p, message %#x, param %Ix stub!
\n
"
,
iface
,
message
,
param
);
struct
h264_decoder
*
decoder
=
impl_from_IMFTransform
(
iface
);
TRACE
(
"iface %p, message %#x, param %Ix.
\n
"
,
iface
,
message
,
param
);
if
(
message
==
MFT_MESSAGE_SET_D3D_MANAGER
)
return
IMFVideoSampleAllocatorEx_SetDirectXManager
(
decoder
->
allocator
,
(
IUnknown
*
)
param
);
FIXME
(
"Ignoring message %#x.
\n
"
,
message
);
return
S_OK
;
}
...
...
@@ -732,12 +741,16 @@ HRESULT h264_decoder_create(REFIID riid, void **ret)
goto
failed
;
if
(
FAILED
(
hr
=
wg_sample_queue_create
(
&
decoder
->
wg_sample_queue
)))
goto
failed
;
if
(
FAILED
(
hr
=
MFCreateVideoSampleAllocatorEx
(
&
IID_IMFVideoSampleAllocatorEx
,
(
void
**
)
&
decoder
->
allocator
)))
goto
failed
;
*
ret
=
&
decoder
->
IMFTransform_iface
;
TRACE
(
"Created decoder %p
\n
"
,
*
ret
);
return
S_OK
;
failed:
if
(
decoder
->
wg_sample_queue
)
wg_sample_queue_destroy
(
decoder
->
wg_sample_queue
);
if
(
decoder
->
output_attributes
)
IMFAttributes_Release
(
decoder
->
output_attributes
);
if
(
decoder
->
attributes
)
...
...
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