niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

mfplat/mediatype: Implement MFCreateMediaTypeFromRepresentation.

Browse source
This commit is contained in:
Rémi Bernon 2024-03-05 23:03:31 +01:00 • committed by Alexandre Julliard
parent a4fb357c89
commit 1e053810f3
4 changed files with 80 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dlls/mfplat/mediatype.c
View file

@ -4334,3 +4334,29 @@ HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *media_type, const AM
return hr;
}
/***********************************************************************
* MFCreateMediaTypeFromRepresentation (mfplat.@)
*/
HRESULT WINAPI MFCreateMediaTypeFromRepresentation(GUID guid_representation, void *representation,
IMFMediaType **media_type)
{
HRESULT hr;
TRACE("%s, %p, %p\n", debugstr_guid(&guid_representation), representation, media_type);
if (!IsEqualGUID(&guid_representation, &AM_MEDIA_TYPE_REPRESENTATION))
return MF_E_UNSUPPORTED_REPRESENTATION;
if (!representation || !media_type)
return E_INVALIDARG;
if (FAILED(hr = MFCreateMediaType(media_type)))
return hr;
if (FAILED(hr = MFInitMediaTypeFromAMMediaType(*media_type, representation)))
{
IMFMediaType_Release(*media_type);
*media_type = NULL;
}
return hr;
}

2
dlls/mfplat/mfplat.spec
View file

@ -59,7 +59,7 @@
@ stub MFCreateMediaBufferWrapper
@ stdcall MFCreateMediaEvent(long ptr long ptr ptr)
@ stdcall MFCreateMediaType(ptr)
@ stub MFCreateMediaTypeFromRepresentation
@ stdcall MFCreateMediaTypeFromRepresentation(int128 ptr ptr)
@ stdcall MFCreateMemoryBuffer(long ptr)
@ stub MFCreateMemoryStream
@ stdcall MFCreatePathFromURL(wstr ptr)

51
dlls/mfplat/tests/mfplat.c
View file

@ -8524,6 +8524,56 @@ static void test_IMFMediaType_GetRepresentation(void)
IMFMediaType_Release(media_type);
}
static void test_MFCreateMediaTypeFromRepresentation(void)
{
IMFMediaType *media_type;
AM_MEDIA_TYPE amt = {0};
WAVEFORMATEX wfx = {0};
HRESULT hr;
GUID guid;
hr = MFCreateMediaTypeFromRepresentation(GUID_NULL, &amt, &media_type);
ok(hr == MF_E_UNSUPPORTED_REPRESENTATION, "Unexpected hr %#lx.\n", hr);
hr = MFCreateMediaTypeFromRepresentation(AM_MEDIA_TYPE_REPRESENTATION, NULL, &media_type);
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = MFCreateMediaTypeFromRepresentation(AM_MEDIA_TYPE_REPRESENTATION, &amt, NULL);
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = MFCreateMediaTypeFromRepresentation(AM_MEDIA_TYPE_REPRESENTATION, &amt, &media_type);
todo_wine
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
if (hr == S_OK)
{
memset(&guid, 0xcd, sizeof(guid));
hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(IsEqualGUID(&guid, &GUID_NULL), "got %s.\n", debugstr_guid(&guid));
memset(&guid, 0xcd, sizeof(guid));
hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(IsEqualGUID(&guid, &GUID_NULL), "got %s.\n", debugstr_guid(&guid));
IMFMediaType_Release(media_type);
}
amt.formattype = FORMAT_WaveFormatEx;
amt.majortype = MFMediaType_Audio;
amt.subtype = MFAudioFormat_PCM;
amt.pbFormat = (BYTE *)&wfx;
amt.cbFormat = sizeof(wfx);
hr = MFCreateMediaTypeFromRepresentation(AM_MEDIA_TYPE_REPRESENTATION, &amt, &media_type);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
memset(&guid, 0xcd, sizeof(guid));
hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(IsEqualGUID(&guid, &MFMediaType_Audio), "got %s.\n", debugstr_guid(&guid));
memset(&guid, 0xcd, sizeof(guid));
hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine
ok(IsEqualGUID(&guid, &MFAudioFormat_PCM), "got %s.\n", debugstr_guid(&guid));
IMFMediaType_Release(media_type);
}
static void test_MFCreateDXSurfaceBuffer(void)
{
IDirect3DSurface9 *backbuffer = NULL, *surface;
@ -11798,6 +11848,7 @@ START_TEST(mfplat)
test_MFCreateAMMediaTypeFromMFMediaType();
test_MFInitMediaTypeFromMFVideoFormat();
test_IMFMediaType_GetRepresentation();
test_MFCreateMediaTypeFromRepresentation();
test_MFCreateDXSurfaceBuffer();
test_MFCreateTrackedSample();
test_MFFrameRateToAverageTimePerFrame();

2
include/mfapi.h
View file

@ -549,6 +549,8 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR
HRESULT WINAPI MFCreateMediaType(IMFMediaType **type);
HRESULT WINAPI MFCreateAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID format_type, AM_MEDIA_TYPE **am_type);
HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size);
HRESULT WINAPI MFCreateMediaTypeFromRepresentation(GUID guid_representation, void *representation,
IMFMediaType **media_type);
HRESULT WINAPI MFCreateSample(IMFSample **sample);
HRESULT WINAPI MFCreateTempFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags,
IMFByteStream **bytestream);