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
502341aa
Commit
502341aa
authored
Jul 07, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jul 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf/evr: Create mixer object on activation.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3a973ca8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
1 deletion
+40
-1
Makefile.in
dlls/mf/Makefile.in
+1
-1
evr.c
dlls/mf/evr.c
+39
-0
No files found.
dlls/mf/Makefile.in
View file @
502341aa
MODULE
=
mf.dll
IMPORTLIB
=
mf
IMPORTS
=
advapi32 mfplat ole32 uuid mfuuid
IMPORTS
=
advapi32 mfplat ole32 uuid mfuuid
strmiids
EXTRADLLFLAGS
=
-mno-cygwin
...
...
dlls/mf/evr.c
View file @
502341aa
...
...
@@ -19,6 +19,7 @@
#define COBJMACROS
#include "mf_private.h"
#include "uuids.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
mfplat
);
...
...
@@ -32,6 +33,8 @@ struct video_renderer
IMFMediaSink
IMFMediaSink_iface
;
IMFMediaSinkPreroll
IMFMediaSinkPreroll_iface
;
LONG
refcount
;
IMFTransform
*
mixer
;
unsigned
int
flags
;
CRITICAL_SECTION
cs
;
};
...
...
@@ -90,6 +93,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface)
if
(
!
refcount
)
{
if
(
renderer
->
mixer
)
IMFTransform_Release
(
renderer
->
mixer
);
DeleteCriticalSection
(
&
renderer
->
cs
);
heap_free
(
renderer
);
}
...
...
@@ -228,9 +233,33 @@ static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl =
video_renderer_preroll_NotifyPreroll
,
};
static
HRESULT
video_renderer_create_mixer
(
IMFAttributes
*
attributes
,
IMFTransform
**
out
)
{
unsigned
int
flags
=
0
;
IMFActivate
*
activate
;
CLSID
clsid
;
HRESULT
hr
;
if
(
SUCCEEDED
(
IMFAttributes_GetUnknown
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE
,
&
IID_IMFActivate
,
(
void
**
)
&
activate
)))
{
IMFAttributes_GetUINT32
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS
,
&
flags
);
hr
=
IMFActivate_ActivateObject
(
activate
,
&
IID_IMFTransform
,
(
void
**
)
out
);
IMFActivate_Release
(
activate
);
if
(
FAILED
(
hr
)
&&
!
(
flags
&
MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL
))
return
hr
;
}
if
(
FAILED
(
IMFAttributes_GetGUID
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID
,
&
clsid
)))
memcpy
(
&
clsid
,
&
CLSID_MFVideoMixer9
,
sizeof
(
clsid
));
return
CoCreateInstance
(
&
clsid
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IMFTransform
,
(
void
**
)
out
);
}
static
HRESULT
evr_create_object
(
IMFAttributes
*
attributes
,
void
*
user_context
,
IUnknown
**
obj
)
{
struct
video_renderer
*
object
;
HRESULT
hr
;
TRACE
(
"%p, %p, %p.
\n
"
,
attributes
,
user_context
,
obj
);
...
...
@@ -242,9 +271,19 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context,
object
->
refcount
=
1
;
InitializeCriticalSection
(
&
object
->
cs
);
/* Create mixer. */
if
(
FAILED
(
hr
=
video_renderer_create_mixer
(
attributes
,
&
object
->
mixer
)))
goto
done
;
*
obj
=
(
IUnknown
*
)
&
object
->
IMFMediaSink_iface
;
return
S_OK
;
done:
IMFMediaSink_Release
(
&
object
->
IMFMediaSink_iface
);
return
hr
;
}
static
void
evr_shutdown_object
(
void
*
user_context
,
IUnknown
*
obj
)
...
...
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