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

mfplat/allocator: Keep a reference to initialization attributes. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-02-03 14:28:01 +03:00 committed by Alexandre Julliard
parent 467a96e9e5
commit d100d92f93
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/mfplat/sample.c
View File

@ -75,6 +75,8 @@ struct sample_allocator
unsigned int buffer_count; unsigned int buffer_count;
} frame_desc; } frame_desc;
IMFAttributes *attributes;
unsigned int free_sample_count; unsigned int free_sample_count;
unsigned int cold_sample_count; unsigned int cold_sample_count;
struct list free_samples; struct list free_samples;
@ -1129,6 +1131,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface)
IDirect3DDeviceManager9_Release(allocator->d3d9_device_manager); IDirect3DDeviceManager9_Release(allocator->d3d9_device_manager);
if (allocator->dxgi_device_manager) if (allocator->dxgi_device_manager)
IMFDXGIDeviceManager_Release(allocator->dxgi_device_manager); IMFDXGIDeviceManager_Release(allocator->dxgi_device_manager);
if (allocator->attributes)
IMFAttributes_Release(allocator->attributes);
sample_allocator_release_samples(allocator); sample_allocator_release_samples(allocator);
DeleteCriticalSection(&allocator->cs); DeleteCriticalSection(&allocator->cs);
heap_free(allocator); heap_free(allocator);
@ -1348,7 +1352,10 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u
max_sample_count = max(1, max_sample_count); max_sample_count = max(1, max_sample_count);
if (attributes) if (attributes)
FIXME("Initialization attributes ignored.\n"); {
allocator->attributes = attributes;
IMFAttributes_AddRef(allocator->attributes);
}
allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.d3d9_format = subtype.Data1;
allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format);

1
dlls/mfplat/tests/mfplat.c
View File

@ -6442,7 +6442,6 @@ todo_wine
EXPECT_REF(attributes, 1); EXPECT_REF(attributes, 1);
hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
todo_wine
EXPECT_REF(attributes, 2); EXPECT_REF(attributes, 2);
count = 0; count = 0;