November 2020 - Wine-commits

Nikolay Sivov : mf/tests: Add a test for copier buffer handling.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: e6cc5c067b11281ab27909b0d787a0a0b2455117 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6cc5c067b11281ab27909b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:40 2020 +0300 mf/tests: Add a test for copier buffer handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d304a62f08a..c38c817eb4b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3921,6 +3921,108 @@ static void test_sample_copier(void) IMFTransform_Release(copier); } +static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_buffer, + IMFMediaBuffer *output_buffer) +{ + IMFSample *input_sample, *output_sample; + MFT_OUTPUT_DATA_BUFFER buffer; + DWORD status; + HRESULT hr; + + hr = MFCreateSample(&input_sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = MFCreateSample(&output_sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(input_sample, input_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(output_sample, output_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(copier, 0, input_sample, 0); + ok(hr == S_OK, "Failed to process input, hr %#x.\n", hr); + + status = 0; + memset(&buffer, 0, sizeof(buffer)); + buffer.pSample = output_sample; + hr = IMFTransform_ProcessOutput(copier, 0, 1, &buffer, &status); + ok(hr == S_OK, "Failed to get output, hr %#x.\n", hr); + + IMFSample_Release(input_sample); + IMFSample_Release(output_sample); +} + +static void test_sample_copier_output_processing(void) +{ + IMFMediaBuffer *input_buffer, *output_buffer; + MFT_OUTPUT_STREAM_INFO output_info; + IMFMediaType *mediatype; + IMFTransform *copier; + DWORD max_length; + HRESULT hr; + BYTE *ptr; + + hr = MFCreateSampleCopierMFT(&copier); + ok(hr == S_OK, "Failed to create sample copier, hr %#x.\n", hr); + + /* Configure for 16 x 16 of D3DFMT_X8R8G8B8. */ + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(mediatype, &MF_MT_FRAME_SIZE, ((UINT64)16) << 32 | 16); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(copier, 0, mediatype, 0); + ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(copier, 0, mediatype, 0); + ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); + + /* Source and destination are linear buffers, destination is twice as large. */ + hr = IMFTransform_GetOutputStreamInfo(copier, 0, &output_info); + ok(hr == S_OK, "Failed to get output info, hr %#x.\n", hr); + + hr = MFCreateAlignedMemoryBuffer(output_info.cbSize, output_info.cbAlignment, &output_buffer); + ok(hr == S_OK, "Failed to create media buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(ptr, 0xcc, max_length); + hr = IMFMediaBuffer_Unlock(output_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateAlignedMemoryBuffer(output_info.cbSize, output_info.cbAlignment, &input_buffer); + ok(hr == S_OK, "Failed to create media buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(input_buffer, &ptr, &max_length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(ptr, 0xaa, max_length); + hr = IMFMediaBuffer_Unlock(input_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(input_buffer, 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + sample_copier_process(copier, input_buffer, output_buffer); + + hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ptr[0] == 0xaa && ptr[4] == 0xcc, "Unexpected buffer contents.\n"); + + hr = IMFMediaBuffer_Unlock(output_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(mediatype); + IMFTransform_Release(copier); +} + static void test_MFGetTopoNodeCurrentType(void) { IMFMediaType *media_type, *media_type2; @@ -4020,5 +4122,6 @@ START_TEST(mf) test_MFGetSupportedMimeTypes(); test_MFGetSupportedSchemes(); test_sample_copier(); + test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); }

1 0

Nikolay Sivov : mf/evr: Accept samples when prerolling.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 8c9988d8d45bf48f5b40ef76856a08a24ce872af URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9988d8d45bf48f5b40ef76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:41 2020 +0300 mf/evr: Accept samples when prerolling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index f5bbfffc4a5..486958f5f79 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -350,7 +350,7 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS { WARN("No sample timestamp, hr %#x.\n", hr); } - else if (stream->parent->state == EVR_STATE_RUNNING) + else if (stream->parent->state == EVR_STATE_RUNNING || stream->flags & EVR_STREAM_PREROLLING) { if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);

1 0

Nikolay Sivov : evr/mixer: Reuse full set of type attributes for output types.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 292b54f3ae4725f287fe587e3420fd5a7b59f03a URL: https://source.winehq.org/git/wine.git/?a=commit;h=292b54f3ae4725f287fe587e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:42 2020 +0300 evr/mixer: Reuse full set of type attributes for output types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 16 ++++++++++++---- dlls/evr/tests/evr.c | 21 ++++++++++++++++++++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 20b5e3b2bba..a60da623f64 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -653,7 +653,8 @@ static int rt_formats_sort_compare(const void *left, const void *right) } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, - IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) + IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, + const GUID *devices, unsigned int flags) { unsigned int i, j, format_count, count; struct rt_format *rt_formats = NULL, *ptr; @@ -706,9 +707,16 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const { for (i = 0; i < count; ++i) { + IMFMediaType *rt_media_type; + subtype.Data1 = rt_formats[i].format; mixer->output.rt_formats[i] = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.rt_formats[i].media_type); + + MFCreateMediaType(&rt_media_type); + IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); + IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + + mixer->output.rt_formats[i].media_type = rt_media_type; } mixer->output.rt_formats_count = count; } @@ -785,8 +793,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids))) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, - guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, media_type, + service, count, guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { if (mixer->inputs[0].media_type) IMFMediaType_Release(mixer->inputs[0].media_type); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a711be7ad21..a1d7b7109d9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -915,11 +915,11 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; + DWORD index, count; GUID guid, *guids; IDirect3D9 *d3d; IUnknown *unk; HWND window; - DWORD count; HRESULT hr; UINT token; @@ -1013,6 +1013,25 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Check attributes on available output types. */ + index = 0; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) + { + UINT64 frame_size; + GUID subtype; + UINT32 value; + + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + } + ok(index > 1, "Unexpected number of available types.\n"); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Add partial implementation of sample processing.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 409392dfb778e018d49f11aabf827a6c5214e287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409392dfb778e018d49f11aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:43 2020 +0300 evr/mixer: Add partial implementation of sample processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a60da623f64..8eba3e3611b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1163,6 +1163,65 @@ static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDe return hr; } +static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int height, + const MFVideoNormalizedRect *scale) +{ + if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) + { + SetRect(rect, 0, 0, width, height); + } + else + { + rect->left = width * scale->left; + rect->right = width * scale->right; + rect->top = height * scale->top; + rect->bottom = height * scale->bottom; + } +} + +static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) +{ + DXVA2_VideoSample samples[1] = {{ 0 }}; + DXVA2_VideoProcessBltParams params = { 0 }; + MFVideoNormalizedRect zoom_rect; + struct input_stream *stream; + IDirect3DSurface9 *surface; + D3DSURFACE_DESC desc; + HRESULT hr; + + IDirect3DSurface9_GetDesc(rt, &desc); + + if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, + sizeof(zoom_rect), NULL))) + { + zoom_rect.left = zoom_rect.top = 0.0f; + zoom_rect.right = zoom_rect.bottom = 1.0f; + } + + video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); + + /* FIXME: for now only handle reference stream. */ + + video_mixer_get_input(mixer, 0, &stream); + + if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) + { + WARN("Failed to get source surface, hr %#x.\n", hr); + return; + } + + IDirect3DSurface9_GetDesc(surface, &desc); + + samples[0].SrcSurface = surface; + SetRect(&samples[0].SrcRect, 0, 0, desc.Width, desc.Height); + video_mixer_scale_rect(&samples[0].DstRect, desc.Width, desc.Height, &stream->rect); + + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, 1, NULL))) + WARN("Failed to process samples, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); +} + static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { @@ -1197,13 +1256,15 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D } } - /* FIXME: for now discard input */ + if (SUCCEEDED(hr)) + video_mixer_render(mixer, surface); if (SUCCEEDED(hr)) { for (i = 0; i < mixer->input_count; ++i) { - IMFSample_Release(mixer->inputs[i].sample); + if (mixer->inputs[i].sample) + IMFSample_Release(mixer->inputs[i].sample); mixer->inputs[i].sample = NULL; video_mixer_request_sample(mixer, i); }

1 0

Nikolay Sivov : evr/presenter: Fix error handling on object creation.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: c528ef47ebb9b3ee9399928d4a53927ffca96cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c528ef47ebb9b3ee9399928d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:44 2020 +0300 evr/presenter: Fix error handling on object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 1b98e63a49a..335e5df2459 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1207,13 +1207,18 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) - IUnknown_Release(&object->IUnknown_inner); + goto failed; if (FAILED(hr = video_presenter_init_d3d(object))) - IUnknown_Release(&object->IUnknown_inner); + goto failed; - if (SUCCEEDED(hr)) - *out = &object->IUnknown_inner; + *out = &object->IUnknown_inner; + + return S_OK; + +failed: + + IUnknown_Release(&object->IUnknown_inner); return hr; }

1 0

Derek Lesho : winegstreamer: Require media source's IMFByteStream to be seekable.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 964cf9cfce5c4eec804db0294dfdb33a76488168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964cf9cfce5c4eec804db029… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 15:48:33 2020 -0600 winegstreamer: Require media source's IMFByteStream to be seekable. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 06f35ce24b6..e69eeba4294 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1235,6 +1235,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; @@ -1242,6 +1243,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (!object) return E_OUTOFMEMORY; + if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + return hr; + + if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) + { + FIXME("Non-seekable bytestreams not supported.\n"); + return MF_E_BYTESTREAM_NOT_SEEKABLE; + } + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1;

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::GetCharacteristics.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: e12b7d210422311a562ff830535054f740ab3257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12b7d210422311a562ff830… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 13:34:53 2020 -0600 winegstreamer: Implement IMFMediaSource::GetCharacteristics. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e69eeba4294..9d7df347dab 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1035,12 +1035,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, characteristics); + TRACE("(%p)->(%p)\n", source, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + *characteristics = MFMEDIASOURCE_CAN_SEEK; + + return S_OK; } static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor)

1 0

Derek Lesho : winegstreamer: Set MF_PD_DURATION on source's presentation descriptor.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 59c55e96f5d925c58f96de8766b1501f4c431d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c55e96f5d925c58f96de87… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 13:34:55 2020 -0600 winegstreamer: Set MF_PD_DURATION on source's presentation descriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9d7df347dab..66bdf64a669 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1237,6 +1237,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + gint64 total_pres_time = 0; DWORD bytestream_caps; unsigned int i; HRESULT hr; @@ -1357,6 +1358,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ heap_free(descriptors); descriptors = NULL; + for (i = 0; i < object->stream_count; i++) + { + gint64 stream_pres_time; + if (gst_pad_query_duration(object->streams[i]->their_src, GST_FORMAT_TIME, &stream_pres_time)) + { + TRACE("Stream %u has duration %llu\n", i, (unsigned long long int) stream_pres_time); + + if (stream_pres_time > total_pres_time) + total_pres_time = stream_pres_time; + } + else + { + WARN("Unable to get presentation time of stream %u\n", i); + } + } + + if (object->stream_count) + IMFPresentationDescriptor_SetUINT64(object->pres_desc, &MF_PD_DURATION, total_pres_time / 100); + object->state = SOURCE_STOPPED; *out_media_source = object;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.160.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 572aa09de1b0e3ba0e8b19f48d5e96539625bb0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=572aa09de1b0e3ba0e8b19f4… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 9 10:11:35 2020 -0800 winevulkan: Update to VK spec version 1.2.160. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 27 ++ dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1014 +++++++++++++++++++++------------------ 5 files changed, 572 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=572aa09de1b0e3ba0e8b…

1 0

Daniel Lehman : tzres: Add Aus Central W. Standard Time Zone.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 4c72ae947748393d0b56d14027a0ab67e79e231d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c72ae947748393d0b56d140… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Nov 8 23:02:33 2020 -0800 tzres: Add Aus Central W. Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 14 ++ po/ar.po | 418 ++++++++++++++++++++++++++------------------------- po/ast.po | 418 ++++++++++++++++++++++++++------------------------- po/bg.po | 414 +++++++++++++++++++++++++------------------------- po/ca.po | 418 ++++++++++++++++++++++++++------------------------- po/cs.po | 418 ++++++++++++++++++++++++++------------------------- po/da.po | 418 ++++++++++++++++++++++++++------------------------- po/de.po | 418 ++++++++++++++++++++++++++------------------------- po/el.po | 414 +++++++++++++++++++++++++------------------------- po/en.po | 414 +++++++++++++++++++++++++------------------------- po/en_US.po | 414 +++++++++++++++++++++++++------------------------- po/eo.po | 418 ++++++++++++++++++++++++++------------------------- po/es.po | 418 ++++++++++++++++++++++++++------------------------- po/fa.po | 416 +++++++++++++++++++++++++------------------------- po/fi.po | 418 ++++++++++++++++++++++++++------------------------- po/fr.po | 418 ++++++++++++++++++++++++++------------------------- po/he.po | 418 ++++++++++++++++++++++++++------------------------- po/hi.po | 414 +++++++++++++++++++++++++------------------------- po/hr.po | 418 ++++++++++++++++++++++++++------------------------- po/hu.po | 418 ++++++++++++++++++++++++++------------------------- po/it.po | 418 ++++++++++++++++++++++++++------------------------- po/ja.po | 418 ++++++++++++++++++++++++++------------------------- po/ko.po | 418 ++++++++++++++++++++++++++------------------------- po/lt.po | 418 ++++++++++++++++++++++++++------------------------- po/ml.po | 414 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 418 ++++++++++++++++++++++++++------------------------- po/nl.po | 418 ++++++++++++++++++++++++++------------------------- po/or.po | 414 +++++++++++++++++++++++++------------------------- po/pa.po | 414 +++++++++++++++++++++++++------------------------- po/pl.po | 418 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 418 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 418 ++++++++++++++++++++++++++------------------------- po/rm.po | 414 +++++++++++++++++++++++++------------------------- po/ro.po | 418 ++++++++++++++++++++++++++------------------------- po/ru.po | 414 +++++++++++++++++++++++++------------------------- po/si.po | 418 ++++++++++++++++++++++++++------------------------- po/sk.po | 418 ++++++++++++++++++++++++++------------------------- po/sl.po | 418 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 416 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 416 +++++++++++++++++++++++++------------------------- po/sv.po | 418 ++++++++++++++++++++++++++------------------------- po/ta.po | 414 +++++++++++++++++++++++++------------------------- po/te.po | 414 +++++++++++++++++++++++++------------------------- po/th.po | 416 +++++++++++++++++++++++++------------------------- po/tr.po | 418 ++++++++++++++++++++++++++------------------------- po/uk.po | 414 +++++++++++++++++++++++++------------------------- po/wa.po | 416 +++++++++++++++++++++++++------------------------- po/wine.pot | 414 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 418 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 418 ++++++++++++++++++++++++++------------------------- 51 files changed, 10485 insertions(+), 9947 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c72ae947748393d0b56…

1 0