ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evr/mixer: Create dxva processor when output type is set. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-10-21 09:46:30 +03:00 committed by Alexandre Julliard
parent 35663e6a7f
commit 70399c4e4a
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/evr/mixer.c
View File

@ -82,6 +82,7 @@ struct video_mixer
struct output_stream output; struct output_stream output;
IDirect3DDeviceManager9 *device_manager; IDirect3DDeviceManager9 *device_manager;
IDirectXVideoProcessor *processor;
HANDLE device_handle; HANDLE device_handle;
IMediaEventSink *event_sink; IMediaEventSink *event_sink;
@ -270,6 +271,8 @@ static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface)
static void video_mixer_release_device_manager(struct video_mixer *mixer) static void video_mixer_release_device_manager(struct video_mixer *mixer)
{ {
if (mixer->processor)
IDirectXVideoProcessor_Release(mixer->processor);
if (mixer->device_manager) if (mixer->device_manager)
{ {
IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle);
@ -277,6 +280,7 @@ static void video_mixer_release_device_manager(struct video_mixer *mixer)
} }
mixer->device_handle = NULL; mixer->device_handle = NULL;
mixer->device_manager = NULL; mixer->device_manager = NULL;
mixer->processor = NULL;
} }
static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface)
@ -819,10 +823,33 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D
if (SUCCEEDED(hr) && !(flags & MFT_SET_TYPE_TEST_ONLY)) if (SUCCEEDED(hr) && !(flags & MFT_SET_TYPE_TEST_ONLY))
{ {
if (mixer->output.media_type) IDirectXVideoProcessorService *service;
IMFMediaType_Release(mixer->output.media_type);
mixer->output.media_type = type; if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service)))
IMFMediaType_AddRef(mixer->output.media_type); {
DXVA2_VideoDesc video_desc;
GUID subtype = { 0 };
D3DFORMAT rt_format;
if (mixer->processor)
IDirectXVideoProcessor_Release(mixer->processor);
mixer->processor = NULL;
video_mixer_init_dxva_videodesc(mixer->inputs[0].media_type, &video_desc);
IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype);
rt_format = subtype.Data1;
if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device,
&video_desc, rt_format, MAX_MIXER_INPUT_STREAMS, &mixer->processor)))
{
if (mixer->output.media_type)
IMFMediaType_Release(mixer->output.media_type);
mixer->output.media_type = type;
IMFMediaType_AddRef(mixer->output.media_type);
}
IDirectXVideoProcessorService_Release(service);
}
} }
LeaveCriticalSection(&mixer->cs); LeaveCriticalSection(&mixer->cs);