system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 17:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegstreamer: Enforce default stride presence in the video processor.

Browse source
This commit is contained in:
Rémi Bernon 2024-05-06 11:42:50 +02:00 committed by Alexandre Julliard
parent 5b8b20c82a
commit 2fef494765
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/mf/tests/transform.c
View file

@ -9377,7 +9377,6 @@ static void test_video_processor_with_dxgi_manager(void)
IMFSample_Release(output.pSample);
ret = check_mf_sample_collection(output_samples, &output_sample_desc_rgb32, L"rgb32frame.bmp");
todo_wine /* FIXME: video process vertically flips the frame... */
ok(ret <= 5, "got %lu%% diff\n", ret);
for (i = 0; i < 9; i++)

40
dlls/winegstreamer/video_processor.c
View file

@ -91,9 +91,36 @@ struct video_processor
IMFVideoSampleAllocatorEx *allocator;
};
static HRESULT normalize_stride(IMFMediaType *media_type, BOOL bottom_up, IMFMediaType **ret)
{
MFVIDEOFORMAT *format;
LONG stride;
UINT32 size;
HRESULT hr;
if (SUCCEEDED(hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)))
{
*ret = media_type;
IMFMediaType_AddRef(media_type);
return hr;
}
if (SUCCEEDED(hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &format, &size)))
{
if (bottom_up) format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep;
hr = MFCreateVideoMediaType(format, (IMFVideoMediaType **)ret);
CoTaskMemFree(format);
}
return hr;
}
static HRESULT try_create_wg_transform(struct video_processor *impl)
{
BOOL bottom_up = !impl->device_manager; /* when not D3D-enabled, the transform outputs bottom up RGB buffers */
IMFMediaType *input_type, *output_type;
struct wg_transform_attrs attrs = {0};
HRESULT hr;
if (impl->wg_transform)
{
@ -101,7 +128,18 @@ static HRESULT try_create_wg_transform(struct video_processor *impl)
impl->wg_transform = 0;
}
return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform);
if (FAILED(hr = normalize_stride(impl->input_type, bottom_up, &input_type)))
return hr;
if (FAILED(hr = normalize_stride(impl->output_type, bottom_up, &output_type)))
{
IMFMediaType_Release(input_type);
return hr;
}
hr = wg_transform_create_mf(input_type, output_type, &attrs, &impl->wg_transform);
IMFMediaType_Release(output_type);
IMFMediaType_Release(input_type);
return hr;
}
static HRESULT video_processor_init_allocator(struct video_processor *processor)