[PATCH 0/2] MR10520: winegstreamer: Place 'videoconvert' prior to 'deinterlace' element.
This MR changes the order of the `videoconvert` and `deinterlace` element; now placing `videoconvert` first. This is required for `rawvideo` output, as `decodebin` does not provide a frame rate in the caps for this format. This causes the `deinterlace` element to reject the caps and the pipeline fails. However, if `videoconvert` is placed first, it inserts a fixated value for its downstream caps and this resolves the issue. `gst-play-1.0` plays the video successfully. The dot debug output shows it also does this by placing `videoconvert` prior to `deinterlace`. See attached: [0.00.00.120881712-gst-play.async-done.dot](/uploads/2fede2c4b016df009711fc72979764b5/0.00.00.120881712-gst-play.async-done.dot) This shows that prior to the `videoconvert` element, the caps does not include framerate. However, it is there for the caps between the `videoconvert` and `deinterlace` elements. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10520
From: Brendan McGrath <bmcgrath@codeweavers.com> --- dlls/wmvcore/tests/Makefile.in | 2 +- dlls/wmvcore/tests/rsrc.rc | 4 +++ dlls/wmvcore/tests/test_rawvideo.wmv | Bin 0 -> 234341 bytes dlls/wmvcore/tests/wmvcore.c | 43 +++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 dlls/wmvcore/tests/test_rawvideo.wmv diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in index 8d78d50601e..826245a64c3 100644 --- a/dlls/wmvcore/tests/Makefile.in +++ b/dlls/wmvcore/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wmvcore.dll -IMPORTS = ole32 wmvcore +IMPORTS = ole32 shcore wmvcore SOURCES = \ rsrc.rc \ diff --git a/dlls/wmvcore/tests/rsrc.rc b/dlls/wmvcore/tests/rsrc.rc index cd642ceb1d0..2593a75274e 100644 --- a/dlls/wmvcore/tests/rsrc.rc +++ b/dlls/wmvcore/tests/rsrc.rc @@ -23,3 +23,7 @@ /* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=700" -t 2.0 -f asf -vcodec wmv1 -vf scale=64x48 -acodec wmav1 test.wmv */ /* @makedep: test.wmv */ test.wmv RCDATA "test.wmv" + +/* ffmpeg -f lavfi -i smptebars -f asf -vcodec rawvideo -pix_fmt yuv420p -vf scale=64x48 -t 2.0 test_rawvideo.wmv */ +/* @makedep: test_rawvideo.wmv */ +test_rawvideo.wmv RCDATA "test_rawvideo.wmv" diff --git a/dlls/wmvcore/tests/test_rawvideo.wmv b/dlls/wmvcore/tests/test_rawvideo.wmv new file mode 100644 index 0000000000000000000000000000000000000000..f594c7ec6d5954c2772a2905aaa49eef5fafd8ee GIT binary patch literal 234341 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 U3=9m6U=dVO0W9tUCf&g#0IjT@&Hw-a literal 0 HcmV?d00001 diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index d16947db6bb..b540604fa5c 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -27,6 +27,7 @@ #include "amvideo.h" #include "uuids.h" #include "wmcodecdsp.h" +#include "shlwapi.h" #include "wine/test.h" @@ -129,6 +130,24 @@ static WCHAR *load_resource(const WCHAR *name) return pathW; } +static IStream *load_resource_as_stream(const WCHAR *name) +{ + IStream *stream; + DWORD size; + HRSRC res; + void *ptr; + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %lu.\n", GetLastError()); + size = SizeofResource(NULL, res); + ptr = LockResource(LoadResource(NULL, res)); + + stream = SHCreateMemStream(ptr, size); + ok(!!stream, "Failed to create stream"); + + return stream; +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported) { @@ -2038,6 +2057,29 @@ static void test_sync_reader_compressed_output(void) IWMProfile_Release(profile); } +void test_sync_reader_rawvideo_file(void) +{ + IWMSyncReader *reader; + IStream *stream; + HRESULT hr; + + stream = load_resource_as_stream(L"test_rawvideo.wmv"); + + hr = WMCreateSyncReader(NULL, WMT_RIGHT_PLAYBACK, &reader); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IWMSyncReader_OpenStream(reader, stream); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IWMSyncReader_Close(reader); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + IStream_Release(stream); + IWMSyncReader_Release(reader); +} + struct callback { IWMReaderCallback IWMReaderCallback_iface; @@ -4290,6 +4332,7 @@ START_TEST(wmvcore) test_sync_reader_types(); test_sync_reader_file(); test_sync_reader_compressed_output(); + test_sync_reader_rawvideo_file(); test_async_reader_settings(); test_async_reader_streaming(); test_async_reader_types(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10520
From: Brendan McGrath <bmcgrath@codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 14 +++++++++----- dlls/wmvcore/tests/wmvcore.c | 2 -- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f1926e3f081..da414af6134 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -915,11 +915,9 @@ static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser if (!strcmp(name, "video/x-raw")) { - /* DirectShow can express interlaced video, but downstream filters can't - * necessarily consume it. In particular, the video renderer can't. */ - if (!(element = create_element("deinterlace", "good")) - || !append_element(parser->container, element, &first, &last)) - return false; + /* decodebin doesn't provide framerate for raw video. This causes the + * the deinterlace element to reject the caps. So we need to go through + * videoconvert first (as it fixates the framerate) */ /* decodebin considers many YUV formats to be "raw", but some quartz * filters can't handle those. Also, videoflip can't handle all "raw" @@ -928,6 +926,12 @@ static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser || !append_element(parser->container, element, &first, &last)) return false; + /* DirectShow can express interlaced video, but downstream filters can't + * necessarily consume it. In particular, the video renderer can't. */ + if (!(element = create_element("deinterlace", "good")) + || !append_element(parser->container, element, &first, &last)) + return false; + /* Let GStreamer choose a default number of threads. */ gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index b540604fa5c..bbc37c525f3 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2069,11 +2069,9 @@ void test_sync_reader_rawvideo_file(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_OpenStream(reader, stream); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Close(reader); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); IStream_Release(stream); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10520
This merge request was approved by Elizabeth Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10520
participants (3)
-
Brendan McGrath -
Brendan McGrath (＠redmcg)
-
Elizabeth Figura (＠zfigura)