wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Zebediah Figura : qcap/tests: Add some basic tests for ICaptureGraphBuilder2::FindPin().
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 9d5a829034d455554d4e1551aaa0f7735a59449f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5a829034d455554d4e1551… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:51 2020 -0500 qcap/tests: Add some basic tests for ICaptureGraphBuilder2::FindPin(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/capturegraph.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index d14753d941..602fc801ba 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -547,11 +547,109 @@ static void test_find_interface(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const AM_MEDIA_TYPE mt = + { + .majortype = {0x111}, + .subtype = {0x222}, + .formattype = {0x333}, + }; + + ICaptureGraphBuilder2 *capture_graph = create_capture_graph(); + struct testfilter filter1, filter2; + IGraphBuilder *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (void **)&graph); + hr = ICaptureGraphBuilder2_SetFiltergraph(capture_graph, graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&filter1); + testfilter_init(&filter2); + IGraphBuilder_AddFilter(graph, &filter1.filter.IBaseFilter_iface, L"filter1"); + IGraphBuilder_AddFilter(graph, &filter2.filter.IBaseFilter_iface, L"filter2"); + + hr = IGraphBuilder_ConnectDirect(graph, &filter1.source1.pin.pin.IPin_iface, + &filter2.sink1.pin.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_INPUT, NULL, NULL, FALSE, 0, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == &filter1.sink1.pin.pin.IPin_iface, "Got wrong pin.\n"); + IPin_Release(pin); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_INPUT, NULL, NULL, FALSE, 1, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == &filter1.sink2.pin.pin.IPin_iface, "Got wrong pin.\n"); + IPin_Release(pin); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_INPUT, NULL, NULL, FALSE, 2, &pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, NULL, NULL, FALSE, 0, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == &filter1.source1.pin.pin.IPin_iface, "Got wrong pin.\n"); + IPin_Release(pin); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, NULL, NULL, FALSE, 1, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == &filter1.source2.pin.pin.IPin_iface, "Got wrong pin.\n"); + IPin_Release(pin); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, NULL, NULL, FALSE, 2, &pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + /* Test the unconnected flag. */ + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, NULL, NULL, TRUE, 0, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == &filter1.source2.pin.pin.IPin_iface, "Got wrong pin.\n"); + IPin_Release(pin); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, NULL, NULL, TRUE, 1, &pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + /* Test categories. */ + + filter1.source1.IKsPropertySet_iface.lpVtbl = &property_set_vtbl; + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, &PIN_CATEGORY_CAPTURE, NULL, FALSE, 0, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == &filter1.source1.pin.pin.IPin_iface, "Got wrong pin.\n"); + IPin_Release(pin); + + hr = ICaptureGraphBuilder2_FindPin(capture_graph, (IUnknown *)&filter1.filter.IBaseFilter_iface, + PINDIR_OUTPUT, &PIN_CATEGORY_CAPTURE, NULL, FALSE, 1, &pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + ref = ICaptureGraphBuilder2_Release(capture_graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&filter1.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&filter2.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(capturegraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); test_find_interface(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : qcap/tests: Use explicit source and sink structures.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: b95c00abd89074d012ff869e05bf9cb7f28fd7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95c00abd89074d012ff869e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:50 2020 -0500 qcap/tests: Use explicit source and sink structures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/capturegraph.c | 189 +++++++++++++++++++++++------------------ 1 file changed, 104 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b95c00abd89074d012ff…

1 0

Gabriel Ivăncescu : quartz/tests: Add tests for when IMediaSeeking on a filter is released by the filter graph.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: a98ca88dd1139ad8e16e63fbb349c2fc5e9ad332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a98ca88dd1139ad8e16e63fb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 8 15:39:35 2020 +0300 quartz/tests: Add tests for when IMediaSeeking on a filter is released by the filter graph. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9988dca24e..af659a9906 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1165,6 +1165,7 @@ struct testfilter ULONG misc_flags; IMediaSeeking IMediaSeeking_iface; + LONG seeking_ref; DWORD seek_caps; BOOL support_testguid; LONGLONG seek_duration, seek_current, seek_stop; @@ -1525,12 +1526,14 @@ static HRESULT WINAPI testseek_QueryInterface(IMediaSeeking *iface, REFIID iid, static ULONG WINAPI testseek_AddRef(IMediaSeeking *iface) { struct testfilter *filter = impl_from_IMediaSeeking(iface); + InterlockedIncrement(&filter->seeking_ref); return InterlockedIncrement(&filter->ref); } static ULONG WINAPI testseek_Release(IMediaSeeking *iface) { struct testfilter *filter = impl_from_IMediaSeeking(iface); + InterlockedDecrement(&filter->seeking_ref); return InterlockedDecrement(&filter->ref); } @@ -3530,14 +3533,20 @@ static void test_ec_complete(void) hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + filter1_pin.dir = PINDIR_OUTPUT; IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + filter1.IMediaSeeking_iface.lpVtbl = NULL; filter1_pin.dir = PINDIR_INPUT; filter1.pin_count = 1; @@ -3769,6 +3778,8 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCapabilities(seeking, &caps); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); + ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; hr = IMediaSeeking_CheckCapabilities(seeking, &caps); @@ -4082,10 +4093,16 @@ static void test_graph_seeking(void) IMediaFilter_Release(filter); IMediaControl_Release(control); IMediaSeeking_Release(seeking); + + ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", hr); ok(filter1.ref == 1, "Got outstanding refcount %d.\n", filter1.ref); ok(filter2.ref == 1, "Got outstanding refcount %d.\n", filter2.ref); + ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + ok(filter2.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); } static void test_default_sync_source(void)

1 0

Gabriel Ivăncescu : quartz: Cache IMediaSeeking for filters.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 0320f165c8642585e823ecc726e7c4bad3a153fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0320f165c8642585e823ecc7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 8 14:38:14 2020 -0500 quartz: Cache IMediaSeeking for filters. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c659cf96e4..7a9db402ec 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -153,6 +153,7 @@ struct filter { struct list entry, sorted_entry; IBaseFilter *filter; + IMediaSeeking *seeking; WCHAR *name; BOOL sorting; }; @@ -593,24 +594,19 @@ static BOOL has_output_pins(IBaseFilter *filter) return FALSE; } -static BOOL is_renderer(IBaseFilter *filter) +static BOOL is_renderer(struct filter *filter) { IAMFilterMiscFlags *flags; - IMediaSeeking *seeking; BOOL ret = FALSE; - if (SUCCEEDED(IBaseFilter_QueryInterface(filter, &IID_IAMFilterMiscFlags, (void **)&flags))) + if (SUCCEEDED(IBaseFilter_QueryInterface(filter->filter, &IID_IAMFilterMiscFlags, (void **)&flags))) { if (IAMFilterMiscFlags_GetMiscFlags(flags) & AM_FILTER_MISC_FLAGS_IS_RENDERER) ret = TRUE; IAMFilterMiscFlags_Release(flags); } - else if (SUCCEEDED(IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking))) - { - IMediaSeeking_Release(seeking); - if (!has_output_pins(filter)) - ret = TRUE; - } + else if (filter->seeking && !has_output_pins(filter->filter)) + ret = TRUE; return ret; } @@ -675,12 +671,19 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, } IBaseFilter_AddRef(entry->filter = filter); + + /* The Legend of Heroes: Trails of Cold Steel II destroys its filter when + * its IMediaSeeking interface is released, so cache the interface instead + * of querying for it every time. */ + if (FAILED(IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&entry->seeking))) + entry->seeking = NULL; + list_add_head(&graph->filters, &entry->entry); list_add_head(&graph->sorted_filters, &entry->sorted_entry); entry->sorting = FALSE; ++graph->version; - if (is_renderer(filter)) + if (is_renderer(entry)) ++graph->nRenderers; return duplicate_name ? VFW_S_DUPLICATE_NAME : hr; @@ -755,11 +758,13 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, NULL); if (SUCCEEDED(hr)) { - if (is_renderer(pFilter)) + if (is_renderer(entry)) --This->nRenderers; IBaseFilter_SetSyncSource(pFilter, NULL); IBaseFilter_Release(pFilter); + if (entry->seeking) + IMediaSeeking_Release(entry->seeking); list_remove(&entry->entry); list_remove(&entry->sorted_entry); CoTaskMemFree(entry->name); @@ -2219,13 +2224,9 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) { - IMediaSeeking *seek = NULL; - - IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seek); - if (!seek) + if (!filter->seeking) continue; - hr = FoundSeek(This, seek, arg); - IMediaSeeking_Release(seek); + hr = FoundSeek(This, filter->seeking, arg); if (hr_return != E_NOTIMPL) allnotimpl = FALSE; if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && SUCCEEDED(hr_return))) @@ -2414,7 +2415,6 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON { IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); HRESULT hr = E_NOTIMPL, filter_hr; - IMediaSeeking *seeking; struct filter *filter; LONGLONG filter_stop; @@ -2429,11 +2429,10 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { - if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) + if (!filter->seeking) continue; - filter_hr = IMediaSeeking_GetStopPosition(seeking, &filter_stop); - IMediaSeeking_Release(seeking); + filter_hr = IMediaSeeking_GetStopPosition(filter->seeking, &filter_stop); if (SUCCEEDED(filter_hr)) { hr = S_OK; @@ -2507,7 +2506,6 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * { IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); HRESULT hr = E_NOTIMPL, filter_hr; - IMediaSeeking *seeking; struct filter *filter; FILTER_STATE state; @@ -2539,12 +2537,11 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * { LONGLONG current = current_ptr ? *current_ptr : 0, stop = stop_ptr ? *stop_ptr : 0; - if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) + if (!filter->seeking) continue; - filter_hr = IMediaSeeking_SetPositions(seeking, &current, + filter_hr = IMediaSeeking_SetPositions(filter->seeking, &current, current_flags | AM_SEEKING_ReturnTime, &stop, stop_flags); - IMediaSeeking_Release(seeking); if (SUCCEEDED(filter_hr)) { hr = S_OK;

1 0

Nikolay Sivov : mfplat: Partially implement MFInitMediaTypeFromWaveFormatEx().
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 2cc0116da0be4c963bc78ed3068245de74b6ef88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc0116da0be4c963bc78ed3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:28 2020 +0300 mfplat: Partially implement MFInitMediaTypeFromWaveFormatEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 71 +++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 170 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 196d803722..b832e00bdd 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2089,3 +2089,74 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE return S_OK; } + +static void mediatype_set_uint32(IMFMediaType *mediatype, const GUID *attr, unsigned int value, HRESULT *hr) +{ + if (SUCCEEDED(*hr)) + *hr = IMFMediaType_SetUINT32(mediatype, attr, value); +} + +static void mediatype_set_guid(IMFMediaType *mediatype, const GUID *attr, const GUID *value, HRESULT *hr) +{ + if (SUCCEEDED(*hr)) + *hr = IMFMediaType_SetGUID(mediatype, attr, value); +} + +/*********************************************************************** + * MFInitMediaTypeFromWaveFormatEx (mfplat.@) + */ +HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size) +{ + GUID subtype; + HRESULT hr; + + TRACE("%p, %p, %u.\n", mediatype, format, size); + + if (!mediatype || !format) + return E_POINTER; + + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + FIXME("WAVE_FORMAT_EXTENSIBLE is not supported.\n"); + return E_NOTIMPL; + } + else + { + hr = IMFMediaType_DeleteAllItems(mediatype); + + mediatype_set_guid(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio, &hr); + + memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype)); + subtype.Data1 = format->wFormatTag; + mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); + + if (format->nChannels) + mediatype_set_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, format->nChannels, &hr); + + if (format->nSamplesPerSec) + mediatype_set_uint32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, format->nSamplesPerSec, &hr); + + if (format->nAvgBytesPerSec) + mediatype_set_uint32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, format->nAvgBytesPerSec, &hr); + + if (format->nBlockAlign) + mediatype_set_uint32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, format->nBlockAlign, &hr); + + if (format->wBitsPerSample) + mediatype_set_uint32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, format->wBitsPerSample, &hr); + + mediatype_set_uint32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1, &hr); + } + + switch (subtype.Data1) + { + case WAVE_FORMAT_PCM: + case WAVE_FORMAT_IEEE_FLOAT: + mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); + break; + default: + FIXME("Unhandled type %d.\n", subtype.Data1); + } + + return hr; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 25e5f62f21..a1833312fc 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -121,7 +121,7 @@ @ stub MFInitMediaTypeFromMPEG2VideoInfo @ stub MFInitMediaTypeFromVideoInfoHeader2 @ stub MFInitMediaTypeFromVideoInfoHeader -@ stub MFInitMediaTypeFromWaveFormatEx +@ stdcall MFInitMediaTypeFromWaveFormatEx(ptr ptr long) @ stub MFInitVideoFormat @ stub MFInitVideoFormat_RGB @ stdcall MFInvokeCallback(ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 78d73b7580..d9fbff570f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5084,6 +5084,102 @@ static void test_MFCreateMediaBufferFromMediaType(void) IMFMediaType_Release(media_type); } +static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *format) +{ + GUID guid, subtype; + UINT32 value; + HRESULT hr; + + hr = IMFMediaType_GetMajorType(mediatype, &guid); + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type %s.\n", wine_dbgstr_guid(&guid)); + + hr = IMFMediaType_GetGUID(mediatype, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get subtype, hr %#x.\n", hr); + + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + } + else + { + memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype)); + subtype.Data1 = format->wFormatTag; + ok(IsEqualGUID(&guid, &subtype), "Unexpected subtype %s.\n", wine_dbgstr_guid(&guid)); + + if (format->nChannels) + { + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == format->nChannels, "Unexpected NUM_CHANNELS %u.\n", value); + } + + if (format->nSamplesPerSec) + { + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == format->nSamplesPerSec, "Unexpected SAMPLES_PER_SECOND %u.\n", value); + } + + if (format->nAvgBytesPerSec) + { + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == format->nAvgBytesPerSec, "Unexpected AVG_BYTES_PER_SECOND %u.\n", value); + } + + if (format->nBlockAlign) + { + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == format->nBlockAlign, "Unexpected BLOCK_ALIGNMENT %u.\n", value); + } + + if (format->wBitsPerSample) + { + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == format->wBitsPerSample, "Unexpected BITS_PER_SAMPLE %u.\n", value); + } + + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value, "Unexpected value.\n"); + } + + /* Only set for uncompressed formats. */ + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value))) + ok(value, "Unexpected ALL_SAMPLES_INDEPENDENT value.\n"); +} + +static void test_MFInitMediaTypeFromWaveFormatEx(void) +{ + static const WAVEFORMATEX waveformatex_tests[] = + { + { WAVE_FORMAT_PCM, 2, 44100, 0, 2, 8 }, + { WAVE_FORMAT_PCM, 2, 44100, 1, 2, 8 }, + { WAVE_FORMAT_PCM, 0, 44100, 0, 0, 0 }, + { WAVE_FORMAT_PCM, 0, 0, 0, 0, 0 }, + { 1234, 0, 0, 0, 0, 0 }, + { WAVE_FORMAT_MPEGLAYER3, 0, 0, 0, 0, 0 }, + }; + IMFMediaType *mediatype; + unsigned int i; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create mediatype, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(waveformatex_tests); ++i) + { + hr = MFInitMediaTypeFromWaveFormatEx(mediatype, &waveformatex_tests[i], sizeof(waveformatex_tests[i])); + ok(hr == S_OK, "Failed to initialize media type, hr %#x.\n", hr); + + validate_media_type(mediatype, &waveformatex_tests[i]); + } + + IMFMediaType_Release(mediatype); +} + START_TEST(mfplat) { char **argv; @@ -5138,6 +5234,7 @@ START_TEST(mfplat) test_MFGetStrideForBitmapInfoHeader(); test_MFCreate2DMediaBuffer(); test_MFCreateMediaBufferFromMediaType(); + test_MFInitMediaTypeFromWaveFormatEx(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index b9383630ab..c8ae665b10 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -532,6 +532,7 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); +HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state);

1 0

Nikolay Sivov : mf: Add type handler stub for SAR stream.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: f2c9614303c72cb335d3fd4dc57ebc9b5240048c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c9614303c72cb335d3fd4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:27 2020 +0300 mf: Add type handler stub for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 17 +++++--- 2 files changed, 126 insertions(+), 8 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 0b498b73a7..4ebd64facf 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -35,6 +35,7 @@ struct audio_renderer; struct audio_renderer_stream { IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; struct audio_renderer *sink; IMFMediaEventQueue *event_queue; @@ -80,6 +81,11 @@ static struct audio_renderer_stream *impl_from_IMFStreamSink(IMFStreamSink *ifac return CONTAINING_RECORD(iface, struct audio_renderer_stream, IMFStreamSink_iface); } +static struct audio_renderer_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct audio_renderer_stream, IMFMediaTypeHandler_iface); +} + static HRESULT WINAPI audio_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -562,12 +568,18 @@ static HRESULT sar_create_mmdevice(IMFAttributes *attributes, IMMDevice **device static HRESULT WINAPI audio_renderer_stream_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { + struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFStreamSink) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = iface; + *obj = &stream->IMFStreamSink_iface; + } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &stream->IMFMediaTypeHandler_iface; } else { @@ -696,9 +708,20 @@ static HRESULT WINAPI audio_renderer_stream_GetIdentifier(IMFStreamSink *iface, static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + if (!handler) + return E_POINTER; + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + *handler = &stream->IMFMediaTypeHandler_iface; + IMFMediaTypeHandler_AddRef(*handler); + + return S_OK; } static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -740,6 +763,93 @@ static const IMFStreamSinkVtbl audio_renderer_stream_vtbl = audio_renderer_stream_Flush, }; +static HRESULT WINAPI audio_renderer_stream_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, + void **obj) +{ + struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI audio_renderer_stream_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI audio_renderer_stream_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **media_type) +{ + FIXME("%p, %u, %p.\n", iface, index, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType *media_type) +{ + FIXME("%p, %p.\n", iface, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_stream_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, + IMFMediaType **media_type) +{ + FIXME("%p, %p.\n", iface, media_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + memcpy(type, &MFMediaType_Audio, sizeof(*type)); + return S_OK; +} + +static const IMFMediaTypeHandlerVtbl audio_renderer_stream_type_handler_vtbl = +{ + audio_renderer_stream_type_handler_QueryInterface, + audio_renderer_stream_type_handler_AddRef, + audio_renderer_stream_type_handler_Release, + audio_renderer_stream_type_handler_IsMediaTypeSupported, + audio_renderer_stream_type_handler_GetMediaTypeCount, + audio_renderer_stream_type_handler_GetMediaTypeByIndex, + audio_renderer_stream_type_handler_SetCurrentMediaType, + audio_renderer_stream_type_handler_GetCurrentMediaType, + audio_renderer_stream_type_handler_GetMajorType, +}; + static HRESULT audio_renderer_create_stream(struct audio_renderer *sink, struct audio_renderer_stream **stream) { struct audio_renderer_stream *object; @@ -750,6 +860,7 @@ static HRESULT audio_renderer_create_stream(struct audio_renderer *sink, struct return E_OUTOFMEMORY; object->IMFStreamSink_iface.lpVtbl = &audio_renderer_stream_vtbl; + object->IMFMediaTypeHandler_iface.lpVtbl = &audio_renderer_stream_type_handler_vtbl; object->refcount = 1; object->sink = sink; IMFMediaSink_AddRef(&object->sink->IMFMediaSink_iface); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3b919d536a..72c70fcafe 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2635,10 +2635,10 @@ static void test_quality_manager(void) static void test_sar(void) { IMFPresentationClock *present_clock, *present_clock2; + IMFMediaTypeHandler *handler, *handler2; IMFPresentationTimeSource *time_source; IMFMediaType *mediatype, *mediatype2; IMFClockStateSink *state_sink; - IMFMediaTypeHandler *handler; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; IMFAttributes *attributes; @@ -2765,19 +2765,26 @@ todo_wine IMFMediaSink_Release(sink2); hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &handler); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ + hr = IMFStreamSink_QueryInterface(stream_sink, &IID_IMFMediaTypeHandler, (void **)&handler2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(handler2 == handler, "Unexpected instance.\n"); + IMFMediaTypeHandler_Release(handler2); + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + count = 0; hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); +todo_wine { ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); - ok(count > 0, "Unexpected type count %u.\n", count); + ok(!!count, "Unexpected type count %u.\n", count); +} +if (SUCCEEDED(hr)) +{ hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Add events support for SAR stream.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 16585fec564bd44b415677b6349c7d859cacc2e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16585fec564bd44b415677b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:26 2020 +0300 mf: Add events support for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77025fdc7c..0b498b73a7 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -37,6 +37,7 @@ struct audio_renderer_stream IMFStreamSink IMFStreamSink_iface; LONG refcount; struct audio_renderer *sink; + IMFMediaEventQueue *event_queue; CRITICAL_SECTION cs; }; @@ -321,6 +322,7 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) IMFMediaSink_Release(&renderer->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&renderer->stream->cs); renderer->stream->sink = NULL; + IMFMediaEventQueue_Shutdown(renderer->stream->event_queue); LeaveCriticalSection(&renderer->stream->cs); IMFStreamSink_Release(&renderer->stream->IMFStreamSink_iface); @@ -600,6 +602,11 @@ static ULONG WINAPI audio_renderer_stream_Release(IMFStreamSink *iface) { if (stream->sink) IMFMediaSink_Release(&stream->sink->IMFMediaSink_iface); + if (stream->event_queue) + { + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFMediaEventQueue_Release(stream->event_queue); + } DeleteCriticalSection(&stream->cs); heap_free(stream); } @@ -609,33 +616,53 @@ static ULONG WINAPI audio_renderer_stream_Release(IMFStreamSink *iface) static HRESULT WINAPI audio_renderer_stream_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("%p, %#x, %p.\n", iface, flags, event); + struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, flags, event); + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } static HRESULT WINAPI audio_renderer_stream_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } static HRESULT WINAPI audio_renderer_stream_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("%p, %p, %p.\n", iface, result, event); + struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, result, event); + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } static HRESULT WINAPI audio_renderer_stream_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI audio_renderer_stream_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) @@ -716,6 +743,7 @@ static const IMFStreamSinkVtbl audio_renderer_stream_vtbl = static HRESULT audio_renderer_create_stream(struct audio_renderer *sink, struct audio_renderer_stream **stream) { struct audio_renderer_stream *object; + HRESULT hr; object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -727,9 +755,17 @@ static HRESULT audio_renderer_create_stream(struct audio_renderer *sink, struct IMFMediaSink_AddRef(&object->sink->IMFMediaSink_iface); InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; + *stream = object; return S_OK; + +failed: + IMFStreamSink_Release(&object->IMFStreamSink_iface); + + return hr; } static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj)

1 0

Nikolay Sivov : mf: Add stream sink stub for SAR.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: a88edd3d39a390cf8948e9e0e5ec9e1091a894f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a88edd3d39a390cf8948e9e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:25 2020 +0300 mf: Add stream sink stub for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 249 ++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 60 ++++++++++++- 2 files changed, 304 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a88edd3d39a390cf8948…

1 0

Nikolay Sivov : mf: Attempt to create mmdevapi device on SAR creation.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: cb9b207284e1602b156cec46316ac017064eb4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9b207284e1602b156cec46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:24 2020 +0300 mf: Attempt to create mmdevapi device on SAR creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 27 +++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 2ef767b787..5d74238a91 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -22,6 +22,8 @@ #include "mfidl.h" #include "mferror.h" #include "mf_private.h" +#include "initguid.h" +#include "mmdeviceapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -447,9 +449,55 @@ static const IMFClockStateSinkVtbl audio_renderer_clock_sink_vtbl = audio_renderer_clock_sink_OnClockSetRate, }; +static HRESULT sar_create_mmdevice(IMFAttributes *attributes, IMMDevice **device) +{ + WCHAR *endpoint; + unsigned int length, role = eMultimedia; + IMMDeviceEnumerator *devenum; + HRESULT hr; + + if (attributes) + { + /* Mutually exclusive attributes. */ + if (SUCCEEDED(IMFAttributes_GetItem(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, NULL)) && + SUCCEEDED(IMFAttributes_GetItem(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, NULL))) + { + return E_INVALIDARG; + } + } + + if (FAILED(hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, + (void **)&devenum))) + { + return hr; + } + + role = eMultimedia; + if (attributes && SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, &role))) + TRACE("Specified role %d.\n", role); + + if (attributes && SUCCEEDED(IMFAttributes_GetAllocatedString(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, + &endpoint, &length))) + { + TRACE("Specified end point %s.\n", debugstr_w(endpoint)); + hr = IMMDeviceEnumerator_GetDevice(devenum, endpoint, device); + CoTaskMemFree(endpoint); + } + else + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, role, device); + + if (FAILED(hr)) + hr = MF_E_NO_AUDIO_PLAYBACK_DEVICE; + + IMMDeviceEnumerator_Release(devenum); + + return hr; +} + static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct audio_renderer *renderer; + IMMDevice *device; HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj); @@ -467,6 +515,11 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, if (FAILED(hr = MFCreateEventQueue(&renderer->event_queue))) goto failed; + if (FAILED(hr = sar_create_mmdevice(attributes, &device))) + goto failed; + + IMMDevice_Release(device); + *obj = (IUnknown *)&renderer->IMFMediaSink_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 98e180e453..4f29362102 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -38,6 +38,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mfapi.h" #include "mferror.h" #include "mfidl.h" +#include "mmdeviceapi.h" #include "wine/test.h" @@ -2636,6 +2637,7 @@ static void test_sar(void) IMFClockStateSink *state_sink; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; + IMFAttributes *attributes; IMFActivate *activate; MFCLOCK_STATE state; DWORD flags, count; @@ -2823,6 +2825,31 @@ todo_wine hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); + /* SAR attributes */ + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + /* Specify role. */ + hr = IMFAttributes_SetUINT32(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, eMultimedia); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(attributes, &sink); + ok(hr == S_OK, "Failed to create a sink, hr %#x.\n", hr); + IMFMediaSink_Release(sink); + + /* Invalid endpoint. */ + hr = IMFAttributes_SetString(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, L"endpoint"); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(attributes, &sink); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_DeleteItem(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE); + ok(hr == S_OK, "Failed to remove attribute, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(attributes, &sink); + ok(hr == MF_E_NO_AUDIO_PLAYBACK_DEVICE, "Failed to create a sink, hr %#x.\n", hr); + CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Add SAR attribute traces.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: f553c2b14f1062b49708e0802a6032c536e1430f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f553c2b14f1062b49708e080… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:23 2020 +0300 mfplat: Add SAR attribute traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 +++++ include/mfidl.idl | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 37ea744313..923905399b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1647,6 +1647,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MF_MT_VIDEO_CHROMA_SITING), + X(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY), X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), X(MF_MT_MPEG2_LEVEL), @@ -1749,6 +1750,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_FORMAT_ID), X(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK), X(MF_MT_PAN_SCAN_ENABLED), + X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID), X(MF_MT_DV_VAUX_CTRL_PACK), X(MFSampleExtension_ForwardedDecodeUnitType), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), @@ -1782,6 +1784,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_RESOLUTION_STATUS), X(MF_MT_ORIGINAL_4CC), X(MF_PD_AUDIO_ISVARIABLEBITRATE), + X(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS), + X(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID), X(MF_MT_MPEG2_CONTENT_PACKET), X(MFT_PROCESS_LOCAL_Attribute), X(MFT_PROCESS_LOCAL_Attribute), @@ -1830,6 +1834,7 @@ const char *debugstr_attr(const GUID *guid) X(MFT_FIELDOFUSE_UNLOCK_Attribute), X(MF_TOPONODE_ERROR_SUBTYPE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE), + X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE), X(MF_MT_VIDEO_3D_LEFT_IS_BASE), X(MF_TOPONODE_WORKQUEUE_MMCSS_TASKID), #undef X diff --git a/include/mfidl.idl b/include/mfidl.idl index a5fb8bc0bd..5a7398f290 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -967,6 +967,10 @@ cpp_quote(" return attributes->SetUINT64(key, ((UINT64)numerator << 32) | den cpp_quote("}") cpp_quote("#endif") +cpp_quote("#define MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_CROSSPROCESS 0x00000001") +cpp_quote("#define MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_NOPERSIST 0x00000002") +cpp_quote("#define MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_DONT_ALLOW_FORMAT_CHANGES 0x00000004") + cpp_quote("EXTERN_GUID(MF_ACTIVATE_MFT_LOCKED, 0xc1f6093c, 0x7f65, 0x4fbd, 0x9e, 0x39, 0x5f, 0xae, 0xc3, 0xc4, 0xfb, 0xd7);") cpp_quote("EXTERN_GUID(MF_SD_LANGUAGE, 0x00af2180, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") @@ -1065,4 +1069,10 @@ cpp_quote("EXTERN_GUID(MF_SESSION_REMOTE_SOURCE_MODE, 0xf4033ef4, 0x9bb3, 0x4378 cpp_quote("EXTERN_GUID(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME, 0x190e852f, 0x6238, 0x42d1, 0xb5, 0xaf, 0x69, 0xea, 0x33, 0x8e, 0xf8, 0x50);") cpp_quote("EXTERN_GUID(MF_PMP_SERVER_CONTEXT, 0x2f00c910, 0xd2cf, 0x4278, 0x8b, 0x6a, 0xd0, 0x77, 0xfa, 0xc3, 0xa2, 0x5f);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS, 0xede4b5e0, 0xf805, 0x4d6c, 0x99, 0xb3, 0xdb, 0x01, 0xbf, 0x95, 0xdf, 0xab);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID, 0xede4b5e3, 0xf805, 0x4d6c, 0x99, 0xb3, 0xdb, 0x01, 0xbf, 0x95, 0xdf, 0xab);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, 0xb10aaec3, 0xef71, 0x4cc3, 0xb8, 0x73, 0x05, 0xa9, 0xa0, 0x8b, 0x9f, 0x8e);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x27c5, 0x4d02, 0x98, 0x87, 0xc2, 0x86, 0x19, 0xfd, 0xb9, 0x1b);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020