[PATCH 0/4] MR140: qasf: More ASF reader filter implementation.
From: Rémi Bernon <rbernon(a)codeweavers.com> And name pins accordingly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 53 ++++++++++++++++++++++++++++++++++++- dlls/qasf/tests/asfreader.c | 4 +-- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 13b6e2d7bbe..d9f50abcd6f 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -48,6 +48,47 @@ struct asf_reader struct asf_stream streams[16]; }; +static inline struct asf_stream *impl_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct asf_stream, source.pin); +} + +static inline struct asf_reader *asf_reader_from_asf_stream(struct asf_stream *stream) +{ + return CONTAINING_RECORD(stream, struct asf_reader, streams[stream->index]); +} + +static HRESULT asf_stream_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *media_type) +{ + struct asf_stream *stream = impl_from_strmbase_pin(iface); + struct asf_reader *filter = asf_reader_from_asf_stream(stream); + IWMOutputMediaProps *props; + DWORD size; + HRESULT hr; + + TRACE("iface %p, index %u, media_type %p.\n", iface, index, media_type); + + if (FAILED(IWMReader_GetOutputFormat(filter->reader, stream->index, index, &props))) + return VFW_S_NO_MORE_ITEMS; + + if (FAILED(hr = IWMOutputMediaProps_GetMediaType(props, NULL, &size))) + goto done; + + if (!(media_type->cbFormat = (size - sizeof(WM_MEDIA_TYPE)))) + media_type->pbFormat = NULL; + else if (!(media_type->pbFormat = CoTaskMemAlloc(media_type->cbFormat))) + { + IWMOutputMediaProps_Release(props); + return E_OUTOFMEMORY; + } + + hr = IWMOutputMediaProps_GetMediaType(props, (WM_MEDIA_TYPE *)media_type, &size); + +done: + IWMOutputMediaProps_Release(props); + return hr; +} + static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, filter); @@ -120,6 +161,7 @@ static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops source_ops = { + .base.pin_get_media_type = asf_stream_get_media_type, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = asf_reader_DecideBufferSize, @@ -275,6 +317,7 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA WMT_ATTR_DATATYPE type, BYTE *value, void *context) { struct asf_reader *filter = impl_from_IWMReaderCallback(iface)->filter; + AM_MEDIA_TYPE stream_media_type = {0}; DWORD i, stream_count; WCHAR name[MAX_PATH]; @@ -304,7 +347,15 @@ static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STA for (i = 0; i < stream_count; ++i) { struct asf_stream *stream = filter->streams + i; - swprintf(name, ARRAY_SIZE(name), L"Raw Stream %u", stream->index); + + if (FAILED(hr = asf_stream_get_media_type(&stream->source.pin, 0, &stream_media_type))) + WARN("Failed to get stream media type, hr %#lx.\n", hr); + if (IsEqualGUID(&stream_media_type.majortype, &MEDIATYPE_Video)) + swprintf(name, ARRAY_SIZE(name), L"Raw Video %u", stream->index); + else + swprintf(name, ARRAY_SIZE(name), L"Raw Audio %u", stream->index); + FreeMediaType(&stream_media_type); + strmbase_source_init(&stream->source, &filter->filter, name, &source_ops); } filter->stream_count = stream_count; diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c index 494d0384ac8..ed78a856003 100644 --- a/dlls/qasf/tests/asfreader.c +++ b/dlls/qasf/tests/asfreader.c @@ -231,13 +231,11 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(info.pFilter == expect_filter, "Got filter %p.\n", info.pFilter); ok(info.dir == expect_dir, "Got dir %#x.\n", info.dir); - todo_wine ok(!wcscmp(info.achName, expect_name), "Got name %s.\n", debugstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!wcscmp(id, expect_id), "Got id %s.\n", debugstr_w(id)); CoTaskMemFree(id); @@ -253,7 +251,7 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec FreeMediaType(mt); CoTaskMemFree(mt); } - todo_wine + todo_wine_if(IsEqualGUID(&expect_mt[0].majortype, &MEDIATYPE_Video)) ok(i == expect_mt_count, "Got %u types.\n", i); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumMediaTypes_Release(enum_mt); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=115653 Your paranoid android. === debian11 (32 bit report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). Report validation errors: qasf:asfreader prints too much data (35179 bytes) === debian11 (32 bit Arabic:Morocco report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit German report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit French report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit Hebrew:Israel report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit Hindi:India report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit Japanese:Japan report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit Chinese:China report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit WoW report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). Report validation errors: qasf:asfreader prints too much data (35187 bytes) === debian11 (64 bit WoW report) === qasf: Unhandled exception: page fault on execute access to 0x0000004000000028 in 64-bit code (0x00004000000028). Report validation errors: qasf:asfreader prints too much data (45609 bytes)
From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 03adea8a318..a235f2d15c6 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -116,8 +116,12 @@ static HRESULT WINAPI output_props_GetMediaType(IWMOutputMediaProps *iface, WM_M static HRESULT WINAPI output_props_SetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt) { - FIXME("iface %p, mt %p, stub!\n", iface, mt); - return E_NOTIMPL; + const struct output_props *props = impl_from_IWMOutputMediaProps(iface); + + TRACE("iface %p, mt %p.\n", iface, mt); + + FreeMediaType((AM_MEDIA_TYPE *)&props->mt); + return CopyMediaType((AM_MEDIA_TYPE *)&props->mt, (AM_MEDIA_TYPE *)mt); } static HRESULT WINAPI output_props_GetStreamGroupName(IWMOutputMediaProps *iface, WCHAR *name, WORD *len) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140
From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index d9f50abcd6f..9a2e598b1e6 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -89,6 +89,27 @@ done: return hr; } +static HRESULT asf_stream_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *media_type) +{ + struct asf_stream *stream = impl_from_strmbase_pin(iface); + struct asf_reader *filter = asf_reader_from_asf_stream(stream); + IWMOutputMediaProps *props; + HRESULT hr; + + TRACE("iface %p, media_type %p.\n", iface, media_type); + strmbase_dump_media_type(media_type); + + if (FAILED(IWMReader_GetOutputFormat(filter->reader, stream->index, 0, &props))) + return VFW_S_NO_MORE_ITEMS; + + hr = IWMOutputMediaProps_SetMediaType(props, (WM_MEDIA_TYPE *)media_type); + if (SUCCEEDED(hr)) + hr = IWMReader_SetOutputProps(filter->reader, stream->index, props); + + IWMOutputMediaProps_Release(props); + return hr; +} + static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, filter); @@ -162,6 +183,7 @@ static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops source_ops = { .base.pin_get_media_type = asf_stream_get_media_type, + .base.pin_query_accept = asf_stream_query_accept, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = asf_reader_DecideBufferSize, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=115655 Your paranoid android. === debian11 (32 bit report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). Report validation errors: qasf:asfreader prints too much data (35199 bytes) === debian11 (32 bit Chinese:China report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit WoW report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). Report validation errors: qasf:asfreader prints too much data (35187 bytes) === debian11 (64 bit WoW report) === qasf: Unhandled exception: page fault on execute access to 0x0000004000000028 in 64-bit code (0x00004000000028). Report validation errors: qasf:asfreader prints too much data (45649 bytes)
From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 9a2e598b1e6..964d7a2bb7a 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -176,8 +176,29 @@ static const struct strmbase_filter_ops filter_ops = static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) { - FIXME("iface %p, allocator %p, req_props %p stub!\n", iface, allocator, req_props); - return E_NOTIMPL; + struct asf_stream *stream = impl_from_strmbase_pin(&iface->pin); + unsigned int buffer_size = 16384; + ALLOCATOR_PROPERTIES ret_props; + + TRACE("iface %p, allocator %p, req_props %p.\n", iface, allocator, req_props); + + if (IsEqualGUID(&stream->source.pin.mt.formattype, &FORMAT_VideoInfo)) + { + VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)stream->source.pin.mt.pbFormat; + buffer_size = format->bmiHeader.biSizeImage; + } + else if (IsEqualGUID(&stream->source.pin.mt.formattype, &FORMAT_WaveFormatEx) + && (IsEqualGUID(&stream->source.pin.mt.subtype, &MEDIASUBTYPE_PCM) + || IsEqualGUID(&stream->source.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) + { + WAVEFORMATEX *format = (WAVEFORMATEX *)stream->source.pin.mt.pbFormat; + buffer_size = format->nAvgBytesPerSec; + } + + req_props->cBuffers = max(req_props->cBuffers, 1); + req_props->cbBuffer = max(req_props->cbBuffer, buffer_size); + req_props->cbAlign = max(req_props->cbAlign, 1); + return IMemAllocator_SetProperties(allocator, req_props, &ret_props); } static const struct strmbase_source_ops source_ops = -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/140
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=115656 Your paranoid android. === debian11 (32 bit report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). Report validation errors: qasf:asfreader prints too much data (35179 bytes) === debian11 (32 bit Chinese:China report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). === debian11 (32 bit WoW report) === qasf: Unhandled exception: page fault on execute access to 0x00000030 in 32-bit code (0x00000030). Report validation errors: qasf:asfreader prints too much data (35187 bytes) === debian11 (64 bit WoW report) === qasf: Unhandled exception: page fault on execute access to 0x0000004000000028 in 64-bit code (0x00004000000028). Report validation errors: qasf:asfreader prints too much data (45629 bytes)
I'll fix the crahes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/140#note_1250
participants (2)
-
Marvin -
Rémi Bernon