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

evr/mixer: Return cloned instances for output type candidates. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-05-27 15:47:03 +03:00 committed by Alexandre Julliard
parent e7ef9fe25b
commit d271445977
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/evr/mixer.c
View File

@ -603,8 +603,8 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform
hr = MF_E_NO_MORE_TYPES; hr = MF_E_NO_MORE_TYPES;
else else
{ {
*type = mixer->output.rt_formats[index].media_type; if (SUCCEEDED(hr = MFCreateMediaType(type)))
IMFMediaType_AddRef(*type); hr = IMFMediaType_CopyAllItems(mixer->output.rt_formats[index].media_type, (IMFAttributes *)*type);
} }
LeaveCriticalSection(&mixer->cs); LeaveCriticalSection(&mixer->cs);

13
dlls/evr/tests/evr.c
View File

@ -1045,9 +1045,11 @@ static void test_default_mixer_type_negotiation(void)
while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type)))
{ {
UINT64 frame_size; UINT64 frame_size;
GUID subtype; GUID subtype, major;
UINT32 value; UINT32 value;
hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size);
@ -1059,6 +1061,15 @@ static void test_default_mixer_type_negotiation(void)
} }
ok(index > 1, "Unexpected number of available types.\n"); ok(index > 1, "Unexpected number of available types.\n");
/* Cloned type is returned. */
hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type2);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(media_type != media_type2, "Unexpected media type instance.\n");
IMFMediaType_Release(media_type);
IMFMediaType_Release(media_type2);
hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);