October 2020 - Wine-Devel - list.winehq.org

[PATCH 2/5] conhost: Don't create tty input thread if we don't have tty_input handle.
by Jacek Caban Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/5] conhost: Scroll window to cursor position when needed.
by Jacek Caban Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)

1 0

[PATCH 1/6] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 113 +++++++++++++++++++++++++----- 1 file changed, 97 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..520f3c3177e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,42 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_resolve(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); + + if (!source_caps) + return E_FAIL; + + if (!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK); + assert(gst_element_link(videoconvert, stream->appsink)); + + gst_element_sync_state_with_parent(videoconvert); + + g_object_set(stream->appsink, "caps", source_caps, NULL); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + g_object_set(stream->appsink, "caps", source_caps, NULL); + assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK); + } + + gst_caps_unref(source_caps); + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +450,7 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + media_stream_resolve(object); gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +470,74 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + unsigned int i; HRESULT hr; + if (!strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "video/x-raw")) + { + GstElementFactory *videoconvert_factory = gst_element_factory_find("videoconvert"); + /* output every format supported by videoconvert */ + const GList *template_list = gst_element_factory_get_static_pad_templates(videoconvert_factory); + for (;template_list; template_list = template_list->next) + { + GstStaticPadTemplate *template = (GstStaticPadTemplate *)template_list->data; + GstCaps *src_caps; + GValueArray *formats; + if (template->direction != GST_PAD_SRC) + continue; + src_caps = gst_static_pad_template_get_caps(template); + gst_structure_get_list(gst_caps_get_structure(src_caps, 0), "format", &formats); + stream_types = heap_alloc( sizeof(IMFMediaType*) * formats->n_values ); + for (i = 0; i < formats->n_values; i++) + { + GValue *format = g_value_array_get_nth(formats, i); + GstCaps *modified_caps = gst_caps_copy(current_caps); + gst_caps_set_value(modified_caps, "format", format); + stream_types[type_count] = mf_media_type_from_caps(modified_caps); + gst_caps_unref(modified_caps); + if (stream_types[type_count]) + type_count++; + } + g_value_array_free(formats); + gst_caps_unref(src_caps); + break; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } - stream_type = mf_media_type_from_caps(current_caps); gst_caps_unref(current_caps); - if (!stream_type) + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); return E_FAIL; + } - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); - - IMFMediaType_Release(stream_type); - - if (FAILED(hr)) - return hr; + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; - - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); - - IMFMediaTypeHandler_Release(type_handler); - + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

3 15

[PATCH v3 1/2] amstream: Implement AMDirectDrawStream::BeginFlush and ::EndFlush.
by Anton Baskanov Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 36 ++++++++-- dlls/amstream/tests/amstream.c | 128 ++++++++++++++++++++++++++++++++- 2 files changed, 157 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 98e81105f6e..befdd093b07 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -59,6 +59,7 @@ struct ddraw_stream struct format format; FILTER_STATE state; BOOL eos; + BOOL flushing; CONDITION_VARIABLE update_queued_cv; struct list update_queue; }; @@ -1142,7 +1143,7 @@ static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) EnterCriticalSection(&stream->cs); - if (stream->eos) + if (stream->eos || stream->flushing) { LeaveCriticalSection(&stream->cs); return E_FAIL; @@ -1159,14 +1160,34 @@ static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) static HRESULT WINAPI ddraw_sink_BeginFlush(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct ddraw_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + stream->flushing = TRUE; + stream->eos = FALSE; + WakeConditionVariable(&stream->update_queued_cv); + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_sink_EndFlush(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct ddraw_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + stream->flushing = FALSE; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) @@ -1299,6 +1320,11 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * LeaveCriticalSection(&stream->cs); return S_OK; } + if (stream->flushing) + { + LeaveCriticalSection(&stream->cs); + return S_FALSE; + } if (!list_empty(&stream->update_queue)) { struct ddraw_sample *sample = LIST_ENTRY(list_head(&stream->update_queue), struct ddraw_sample, entry); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ef648252798..88f98a8b195 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4005,6 +4005,7 @@ static IPin *ammediastream_pin; static IMemInputPin *ammediastream_mem_input_pin; static IMediaSample *ammediastream_media_sample; static DWORD ammediastream_sleep_time; +static HRESULT ammediastream_expected_hr; static DWORD CALLBACK ammediastream_end_of_stream(void *param) { @@ -4012,7 +4013,7 @@ static DWORD CALLBACK ammediastream_end_of_stream(void *param) Sleep(ammediastream_sleep_time); hr = IPin_EndOfStream(ammediastream_pin); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == ammediastream_expected_hr, "Got hr %#x.\n", hr); return 0; } @@ -4023,7 +4024,7 @@ static DWORD CALLBACK ammediastream_receive(void *param) Sleep(ammediastream_sleep_time); hr = IMemInputPin_Receive(ammediastream_mem_input_pin, ammediastream_media_sample); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == ammediastream_expected_hr, "Got hr %#x.\n", hr); return 0; } @@ -4197,6 +4198,7 @@ static void test_audiostreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample1; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -4216,6 +4218,7 @@ static void test_audiostreamsample_update(void) ammediastream_pin = pin; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_end_of_stream, NULL, 0, NULL); hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -5157,6 +5160,7 @@ static void test_ddrawstream_receive(void) ammediastream_mem_input_pin = source.source.pMemInputPin; ammediastream_media_sample = sample; ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n"); @@ -5196,6 +5200,121 @@ static void test_ddrawstream_receive(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_begin_flush_end_flush(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawStreamSample *stream_sample; + IDirectDrawMediaStream *ddraw_stream; + IMediaSample *media_sample; + IMediaFilter *media_filter; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + HANDLE thread; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_SetSyncSource(media_filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 3; + video_info.bmiHeader.biHeight = 1; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ammediastream_mem_input_pin = source.source.pMemInputPin; + ammediastream_media_sample = media_sample; + ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_FALSE; + thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); + CloseHandle(thread); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IDirectDrawStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaFilter_Release(media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -7062,6 +7181,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample; ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); Sleep(100); @@ -7109,6 +7229,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample; ammediastream_sleep_time = 0; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); Sleep(100); @@ -7161,6 +7282,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_mem_input_pin = mem_input_pin; ammediastream_media_sample = media_sample; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); hr = IDirectDrawStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -7183,6 +7305,7 @@ static void test_ddrawstreamsample_update(void) ammediastream_pin = pin; ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; thread = CreateThread(NULL, 0, ammediastream_end_of_stream, NULL, 0, NULL); hr = IDirectDrawStreamSample_Update(stream_sample, 0, NULL, NULL, 0); @@ -7714,6 +7837,7 @@ START_TEST(amstream) test_ddrawstream_get_format(); test_ddrawstream_set_format(); test_ddrawstream_receive(); + test_ddrawstream_begin_flush_end_flush(); test_ddrawstreamsample_get_media_stream(); test_ddrawstreamsample_update(); -- 2.17.1

2 3

[PATCH 4/4] include: Add IMFMetadataProvider interface in mfidl.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH 3/4] include: Add IMFMetadata interface in mfidl.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH 2/4] include: Fix CancelObjectCreation name in IMFSourceResolver interface.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH 1/4] include: Add MFPMPSESSION_CREATION_FLAGS enumeration in mfidl.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH vkd3d v2] include: Add ID3D12InfoQueue interface in d3d12sdklayers.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

1 0

[PATCH vkd3d] include: Add ID3D12InfoQueue interface in d3d12sdklayers.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

1 1