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

evr/mixer: Use regular media type interface for input streams. 

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-12 14:17:26 +03:00 committed by Alexandre Julliard
parent 14d2b04478
commit 7ab646ad48
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/evr/mixer.c
View File

@ -40,7 +40,7 @@ struct input_stream
{ {
unsigned int id; unsigned int id;
IMFAttributes *attributes; IMFAttributes *attributes;
IMFVideoMediaType *media_type; IMFMediaType *media_type;
MFVideoNormalizedRect rect; MFVideoNormalizedRect rect;
unsigned int zorder; unsigned int zorder;
}; };
@ -170,7 +170,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer)
for (i = 0; i < mixer->input_count; ++i) for (i = 0; i < mixer->input_count; ++i)
{ {
if (mixer->inputs[i].media_type) if (mixer->inputs[i].media_type)
IMFVideoMediaType_Release(mixer->inputs[i].media_type); IMFMediaType_Release(mixer->inputs[i].media_type);
mixer->inputs[i].media_type = NULL; mixer->inputs[i].media_type = NULL;
} }
for (i = 0; i < mixer->output.type_count; ++i) for (i = 0; i < mixer->output.type_count; ++i)
@ -714,14 +714,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW
if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count,
guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY))
{ {
GUID subtype = { 0 }; if (SUCCEEDED(hr = MFCreateMediaType(&mixer->inputs[0].media_type)))
if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype)))
WARN("Failed to get subtype %#x.\n", hr);
if (SUCCEEDED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->inputs[0].media_type)))
hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)mixer->inputs[0].media_type); hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)mixer->inputs[0].media_type);
} }
CoTaskMemFree(guids); CoTaskMemFree(guids);
} }