[PATCH 0/1] MR2889: winegstreamer: Implement Flush for WMV decoder DMO.
From: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mf/tests/transform.c | 3 --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 12 ++++++++++++ dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 7 +++++++ dlls/winegstreamer/wg_parser.c | 1 + dlls/winegstreamer/wg_transform.c | 12 ++++++++++++ dlls/winegstreamer/wmv_decoder.c | 10 ++++++++-- 8 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index b1ac3ffbb14..0635439f2e4 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5609,10 +5609,8 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); hr = IMediaObject_Flush(media_object); - todo_wine ok(hr == S_OK, "Flush returned %#lx.\n", hr); hr = IMediaObject_Flush(media_object); - todo_wine ok(hr == S_OK, "Flush returned %#lx.\n", hr); output_media_buffer->length = 0; output_data_buffer.pBuffer = &output_media_buffer->IMediaBuffer_iface; @@ -5622,7 +5620,6 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); todo_wine ok(hr == S_FALSE, "ProcessOutput returned %#lx.\n", hr); - todo_wine ok(output_media_buffer->length == 0, "Unexpected length %#lx.\n", output_media_buffer->length); /* Test ProcessOutput with setting framerate. */ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 54f59aa708a..86f9358c129 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -146,6 +146,7 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, IMFSample *sample, DWORD sample_size, struct wg_format *format, DWORD *flags); HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sample *sample); HRESULT wg_transform_read_dmo(struct wg_transform *transform, DMO_OUTPUT_DATA_BUFFER *buffer); +void wg_transform_flush(struct wg_transform *transform); HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 2e7763872d0..e1a00b86094 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -426,6 +426,18 @@ bool wg_transform_set_output_format(struct wg_transform *transform, struct wg_fo return !WINE_UNIX_CALL(unix_wg_transform_set_output_format, ¶ms); } +void wg_transform_flush(struct wg_transform *transform) +{ + struct wg_transform_flush_params params = + { + .transform = transform, + }; + + TRACE("transform %p.\n", transform); + + WINE_UNIX_CALL(unix_wg_transform_flush, ¶ms); +} + #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) unsigned int wg_format_get_stride(const struct wg_format *format) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 962668045c1..ed55520646d 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -53,6 +53,7 @@ extern NTSTATUS wg_transform_set_output_format(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_transform_push_data(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_transform_read_data(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_transform_get_status(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_flush(void *args) DECLSPEC_HIDDEN; /* wg_allocator.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index e20fdd7256b..bd33635bc8e 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -339,6 +339,12 @@ struct wg_transform_get_status_params UINT32 accepts_input; }; +struct wg_transform_flush_params +{ + struct wg_transform *transform; +}; + + enum unix_funcs { unix_wg_init_gstreamer, @@ -376,6 +382,7 @@ enum unix_funcs unix_wg_transform_push_data, unix_wg_transform_read_data, unix_wg_transform_get_status, + unix_wg_transform_flush, }; #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index ef274b1dc27..e05cf7eeb84 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1939,4 +1939,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_transform_push_data), X(wg_transform_read_data), X(wg_transform_get_status), + X(wg_transform_flush), }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index f75d1b4b6df..934ff3c68b0 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -875,3 +875,15 @@ NTSTATUS wg_transform_get_status(void *args) params->accepts_input = gst_atomic_queue_length(transform->input_queue) < transform->input_max_length; return STATUS_SUCCESS; } + +NTSTATUS wg_transform_flush(void *args) +{ + struct wg_transform_flush_params *params = args; + struct wg_transform *transform = params->transform; + GstBuffer *buffer; + + while ((buffer = gst_atomic_queue_pop(transform->input_queue))) + gst_buffer_unref(buffer); + + return STATUS_SUCCESS; +} diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index a22de7ccb7f..6153a18fbaf 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -656,8 +656,14 @@ static HRESULT WINAPI media_object_SetInputMaxLatency(IMediaObject *iface, DWORD static HRESULT WINAPI media_object_Flush(IMediaObject *iface) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + struct wmv_decoder *decoder = impl_from_IMediaObject(iface); + + TRACE("iface %p.\n", iface); + + wg_transform_flush(decoder->wg_transform); + wg_sample_queue_flush(decoder->wg_sample_queue, TRUE); + + return S_OK; } static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD index) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2889
This is probably something that will need to be implemented but it isn't that simple. Other MFT also need flush, but also drain, and I have plans to upstream Paul's changes that are in proton soon-ish. Unless you need this now for some other changes I'd suggest to delay this MR for now, and instead implement a different aspect of the dmo. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2889#note_33628
On Wed May 24 07:40:32 2023 +0000, Rémi Bernon wrote:
This is probably something that will need to be implemented but it isn't that simple. Other MFT also need flush, but also drain, and I have plans to upstream Paul's changes that are in proton soon-ish. Unless you need this now for some other changes I'd suggest to delay this MR for now, and instead implement a different aspect of the dmo. That sounds good to me. I think it's better to delay it.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2889#note_33641
This merge request was closed by Ziqing Hui. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2889
On Wed May 24 07:40:32 2023 +0000, Ziqing Hui wrote:
That sounds good to me. I think it's better to delay it. I have opened https://gitlab.winehq.org/wine/wine/-/merge_requests/2893 which should have all we need to implement flush and drain in the DMO.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2889#note_33694
participants (3)
-
Rémi Bernon -
Ziqing Hui
-
Ziqing Hui (＠zhui)