May 2022 - Wine-commits - list.winehq.org

Martin Storsjö : ntdll: Fix accidentally used 64 bit types in signal_arm.c.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 234f3ffa4b9a14e71a634e83c0db2c7960b7f90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=234f3ffa4b9a14e71a634e83… Author: Martin Storsjö <martin(a)martin.st> Date: Wed May 11 09:04:25 2022 +0300 ntdll: Fix accidentally used 64 bit types in signal_arm.c. These slipped through when basing the exception handling code on signal_arm64.c. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b8e5e790965..7872962bbbe 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -69,7 +69,7 @@ struct MSVCRT_JUMP_BUFFER }; -static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) +static void dump_scope_table( ULONG base, const SCOPE_TABLE *table ) { unsigned int i; @@ -1240,7 +1240,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } else /* hack: call builtin handlers registered in the tib list */ { - DWORD64 backup_frame = dispatch.EstablisherFrame; + DWORD backup_frame = dispatch.EstablisherFrame; while ((DWORD)teb_frame < new_context.Sp && (DWORD)teb_frame < (DWORD)end_frame) { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); @@ -1333,7 +1333,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, { SCOPE_TABLE *table = dispatch->HandlerData; ULONG i; - DWORD64 ControlPc = dispatch->ControlPc; + DWORD ControlPc = dispatch->ControlPc; TRACE( "%p %p %p %p\n", rec, frame, context, dispatch ); if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table );

1 0

Louis Lenders : msvcr80: Update manifest resource.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: d5b31ea663c3dcbc75df8c0827fb21b56b41b635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b31ea663c3dcbc75df8c08… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 11 18:07:44 2022 +0200 msvcr80: Update manifest resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52975 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr80/msvcr80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr80/msvcr80.manifest b/dlls/msvcr80/msvcr80.manifest index 5f3daed5827..99b818c2030 100644 --- a/dlls/msvcr80/msvcr80.manifest +++ b/dlls/msvcr80/msvcr80.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.9672" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> <file name="msvcr80.dll"/> <file name="msvcp80.dll"/> <file name="msvcm80.dll"/>

1 0

Georg Lehmann : winevulkan: Prevent infinite recursion in make_vulkan.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 3d824d11dbde45299963a758b97d1e417dca36e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d824d11dbde45299963a758… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 10 19:54:35 2022 +0200 winevulkan: Prevent infinite recursion in make_vulkan. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c26951d06b9..4348201810b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2043,6 +2043,8 @@ class VkStruct(Sequence): """ for m in self.members: + if self.name == m.type: + continue if m.needs_alignment(): return True return False @@ -2057,6 +2059,8 @@ class VkStruct(Sequence): return True for m in self.members: + if self.name == m.type: + continue if m.needs_conversion(): return True return False @@ -2065,6 +2069,8 @@ class VkStruct(Sequence): """ Returns if struct members need unwrapping of handle. """ for m in self.members: + if self.name == m.type: + continue if m.needs_unwrapping(): return True return False @@ -2073,11 +2079,11 @@ class VkStruct(Sequence): """ Check if any struct member needs some memory freeing.""" for m in self.members: + if self.name == m.type: + continue if m.needs_free(): return True - continue - return False def needs_struct_extensions_conversion(self): @@ -3350,7 +3356,7 @@ class VkRegistry(object): if "data" in type_info: types[m.type]["data"].required = True - if type_info["category"] == "struct": + if type_info["category"] == "struct" and struct.name != m.type: # Yay, recurse mark_struct_dependencies(type_info["data"], types) elif type_info["category"] == "funcpointer":

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.213.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: d20d5d0737115537fe76086b17394092c6fe2c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d20d5d0737115537fe76086b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 10 19:55:24 2022 +0200 winevulkan: Update to VK spec version 1.3.213. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 19 +++++++ dlls/winevulkan/loader_thunks.h | 15 ++++++ dlls/winevulkan/make_vulkan | 6 ++- dlls/winevulkan/vulkan_thunks.c | 91 +++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 16 ++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 117 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 263 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d20d5d0737115537fe76…

1 0

Huw Davies : winecoreaudio: Remove DWORDs from the midi syscall interface.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: ca1e298f5267f12d212cfff64c6cd29d1801fb3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1e298f5267f12d212cfff6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 11 10:20:05 2022 +0100 winecoreaudio: Remove DWORDs from the midi syscall interface. This makes it consistent with the other drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 64 +++++++++++++++++++-------------------- dlls/winecoreaudio.drv/midi.c | 6 ++-- dlls/winecoreaudio.drv/unixlib.h | 28 ++++++++--------- 3 files changed, 49 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca1e298f5267f12d212c…

1 0

Eric Pouech : winecoreaudio: Enable compilation with long types.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: ae39289ca7f931257c76a533ab68d35cc24f88c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae39289ca7f931257c76a533… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat May 7 09:06:54 2022 +0200 winecoreaudio: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/Makefile.in | 1 - dlls/winecoreaudio.drv/coreaudio.c | 6 +++--- dlls/winecoreaudio.drv/midi.c | 10 +++++----- dlls/winecoreaudio.drv/mmdevdrv.c | 40 +++++++++++++++++++------------------- 4 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae39289ca7f931257c76…

1 0

Anton Baskanov : include: Add IMpegAudioDecoder definition.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: ce4c1987a11bcacb7d1ba14f2e9a6bb18d23728b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4c1987a11bcacb7d1ba14f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 13 09:21:52 2022 +0700 include: Add IMpegAudioDecoder definition. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mmreg.h | 12 +++++++++ include/mpegtype.idl | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f3e62c4bb5a..14c4caeb688 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -435,6 +435,7 @@ SOURCES = \ mmreg.h \ mmstream.idl \ mmsystem.h \ + mpegtype.idl \ mprapi.h \ mprerror.h \ msacm.h \ diff --git a/include/mmreg.h b/include/mmreg.h index bcee2a5ec61..1b19e1f068f 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -836,6 +836,18 @@ typedef struct { GUID SubFormat; } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; +typedef struct { + WAVEFORMATEX wfx; + WORD fwHeadLayer; + DWORD dwHeadBitrate; + WORD fwHeadMode; + WORD fwHeadModeExt; + WORD wHeadEmphasis; + WORD fwHeadFlags; + DWORD dwPTSLow; + DWORD dwPTSHigh; +} MPEG1WAVEFORMAT; + #pragma pack(pop) cpp_quote("#endif") diff --git a/include/mpegtype.idl b/include/mpegtype.idl new file mode 100644 index 00000000000..dd0284cfc53 --- /dev/null +++ b/include/mpegtype.idl @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2022 Anton Baskanov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +cpp_quote("#include <mmreg.h>") +#include <mmreg.h> + +[ + object, + /* uuid(b45dd570-3c77-11d1-abe1-00a0c905f375) conflicts with uuids.h */ + pointer_default(unique) +] +interface IMpegAudioDecoder : IUnknown +{ + [propget] HRESULT FrequencyDivider( + [out, retval] unsigned long *divider); + + [propput] HRESULT FrequencyDivider( + unsigned long divider); + + [propget] HRESULT DecoderAccuracy( + [out, retval] unsigned long *accuracy); + + [propput] HRESULT DecoderAccuracy( + unsigned long accuracy); + + [propget] HRESULT Stereo( + [out, retval] unsigned long *stereo); + + [propput] HRESULT Stereo( + unsigned long stereo); + + [propget] HRESULT DecoderWordSize( + [out, retval] unsigned long *word_size); + + [propput] HRESULT DecoderWordSize( + unsigned long word_size); + + [propget] HRESULT IntegerDecode( + [out, retval] unsigned long *integer_decode); + + [propput] HRESULT IntegerDecode( + unsigned long integer_decode); + + [propget] HRESULT DualMode( + [out, retval] unsigned long *dual_mode); + + [propput] HRESULT DualMode( + unsigned long dual_mode); + + [propget] HRESULT AudioFormat( + [out, retval] MPEG1WAVEFORMAT *format); +}

1 0

Anton Baskanov : winegstreamer: Add IMpegAudioDecoder stub to MPEG audio decoder.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: bae7ac48bce5e0566b30a8dd3a766b343b5617a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae7ac48bce5e0566b30a8dd… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 13 09:29:51 2022 +0700 winegstreamer: Add IMpegAudioDecoder stub to MPEG audio decoder. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50462 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 1 + dlls/winegstreamer/quartz_transform.c | 140 ++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 105469edaf1..99d078f9835 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -221,6 +221,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMpegAudioDecoder, TRUE); check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 5019cc6032b..2e5bd5d801e 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -21,6 +21,7 @@ #include "gst_private.h" #include "mferror.h" +#include "mpegtype.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -28,6 +29,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); struct transform { struct strmbase_filter filter; + IMpegAudioDecoder IMpegAudioDecoder_iface; struct strmbase_sink sink; struct strmbase_source source; @@ -71,6 +73,19 @@ static void transform_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT transform_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + + if (IsEqualGUID(iid, &IID_IMpegAudioDecoder) && filter->IMpegAudioDecoder_iface.lpVtbl) + *out = &filter->IMpegAudioDecoder_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT transform_init_stream(struct strmbase_filter *iface) { struct transform *filter = impl_from_strmbase_filter(iface); @@ -115,10 +130,133 @@ static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = transform_get_pin, .filter_destroy = transform_destroy, + .filter_query_interface = transform_query_interface, .filter_init_stream = transform_init_stream, .filter_cleanup_stream = transform_cleanup_stream, }; +static struct transform *impl_from_IMpegAudioDecoder(IMpegAudioDecoder *iface) +{ + return CONTAINING_RECORD(iface, struct transform, IMpegAudioDecoder_iface); +} + +static HRESULT WINAPI mpeg_audio_decoder_QueryInterface(IMpegAudioDecoder *iface, + REFIID iid, void **out) +{ + struct transform *filter = impl_from_IMpegAudioDecoder(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI mpeg_audio_decoder_AddRef(IMpegAudioDecoder *iface) +{ + struct transform *filter = impl_from_IMpegAudioDecoder(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI mpeg_audio_decoder_Release(IMpegAudioDecoder *iface) +{ + struct transform *filter = impl_from_IMpegAudioDecoder(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI mpeg_audio_decoder_get_FrequencyDivider(IMpegAudioDecoder *iface, ULONG *divider) +{ + FIXME("iface %p, divider %p, stub!\n", iface, divider); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_put_FrequencyDivider(IMpegAudioDecoder *iface, ULONG divider) +{ + FIXME("iface %p, divider %lu, stub!\n", iface, divider); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_get_DecoderAccuracy(IMpegAudioDecoder *iface, ULONG *accuracy) +{ + FIXME("iface %p, accuracy %p, stub!\n", iface, accuracy); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_put_DecoderAccuracy(IMpegAudioDecoder *iface, ULONG accuracy) +{ + FIXME("iface %p, accuracy %lu, stub!\n", iface, accuracy); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_get_Stereo(IMpegAudioDecoder *iface, ULONG *stereo) +{ + FIXME("iface %p, stereo %p, stub!\n", iface, stereo); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_put_Stereo(IMpegAudioDecoder *iface, ULONG stereo) +{ + FIXME("iface %p, stereo %lu, stub!\n", iface, stereo); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_get_DecoderWordSize(IMpegAudioDecoder *iface, ULONG *word_size) +{ + FIXME("iface %p, word_size %p, stub!\n", iface, word_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_put_DecoderWordSize(IMpegAudioDecoder *iface, ULONG word_size) +{ + FIXME("iface %p, word_size %lu, stub!\n", iface, word_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_get_IntegerDecode(IMpegAudioDecoder *iface, ULONG *integer_decode) +{ + FIXME("iface %p, integer_decode %p, stub!\n", iface, integer_decode); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_put_IntegerDecode(IMpegAudioDecoder *iface, ULONG integer_decode) +{ + FIXME("iface %p, integer_decode %lu, stub!\n", iface, integer_decode); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_get_DualMode(IMpegAudioDecoder *iface, ULONG *dual_mode) +{ + FIXME("iface %p, dual_mode %p, stub!\n", iface, dual_mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_put_DualMode(IMpegAudioDecoder *iface, ULONG dual_mode) +{ + FIXME("iface %p, dual_mode %lu, stub!\n", iface, dual_mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI mpeg_audio_decoder_get_AudioFormat(IMpegAudioDecoder *iface, MPEG1WAVEFORMAT *format) +{ + FIXME("iface %p, format %p, stub!\n", iface, format); + return E_NOTIMPL; +} + +static const IMpegAudioDecoderVtbl mpeg_audio_decoder_vtbl = +{ + mpeg_audio_decoder_QueryInterface, + mpeg_audio_decoder_AddRef, + mpeg_audio_decoder_Release, + mpeg_audio_decoder_get_FrequencyDivider, + mpeg_audio_decoder_put_FrequencyDivider, + mpeg_audio_decoder_get_DecoderAccuracy, + mpeg_audio_decoder_put_DecoderAccuracy, + mpeg_audio_decoder_get_Stereo, + mpeg_audio_decoder_put_Stereo, + mpeg_audio_decoder_get_DecoderWordSize, + mpeg_audio_decoder_put_DecoderWordSize, + mpeg_audio_decoder_get_IntegerDecode, + mpeg_audio_decoder_put_IntegerDecode, + mpeg_audio_decoder_get_DualMode, + mpeg_audio_decoder_put_DualMode, + mpeg_audio_decoder_get_AudioFormat, +}; + static HRESULT transform_sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { struct transform *filter = impl_from_strmbase_filter(pin->filter); @@ -440,6 +578,8 @@ HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out) wcscpy(object->sink.pin.name, L"XForm In"); wcscpy(object->source.pin.name, L"XForm Out"); + object->IMpegAudioDecoder_iface.lpVtbl = &mpeg_audio_decoder_vtbl; + TRACE("Created MPEG audio decoder %p.\n", object); *out = &object->filter.IUnknown_inner; return hr;

1 0

Anton Baskanov : winegstreamer: Register MPEG audio decoder.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: faf6f267aead1c2c1f59b051aa7bc12d25dc8941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf6f267aead1c2c1f59b051… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Apr 7 12:23:10 2022 +0700 winegstreamer: Register MPEG audio decoder. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index a408704cf47..c3adbb82d61 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -520,6 +520,39 @@ static const REGFILTER2 reg_avi_splitter = .u.s2.rgPins2 = reg_avi_splitter_pins, }; +static const REGPINTYPES reg_mpeg_audio_codec_sink_mts[3] = +{ + {&MEDIATYPE_Audio, &MEDIASUBTYPE_MPEG1Packet}, + {&MEDIATYPE_Audio, &MEDIASUBTYPE_MPEG1Payload}, + {&MEDIATYPE_Audio, &MEDIASUBTYPE_MPEG1AudioPayload}, +}; + +static const REGPINTYPES reg_mpeg_audio_codec_source_mts[1] = +{ + {&MEDIATYPE_Audio, &MEDIASUBTYPE_PCM}, +}; + +static const REGFILTERPINS2 reg_mpeg_audio_codec_pins[2] = +{ + { + .nMediaTypes = 3, + .lpMediaType = reg_mpeg_audio_codec_sink_mts, + }, + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .nMediaTypes = 1, + .lpMediaType = reg_mpeg_audio_codec_source_mts, + }, +}; + +static const REGFILTER2 reg_mpeg_audio_codec = +{ + .dwVersion = 2, + .dwMerit = 0x03680001, + .u.s2.cPins2 = 2, + .u.s2.rgPins2 = reg_mpeg_audio_codec_pins, +}; + static const REGPINTYPES reg_mpeg_splitter_sink_mts[4] = { {&MEDIATYPE_Stream, &MEDIASUBTYPE_MPEG1Audio}, @@ -650,6 +683,8 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, L"AVI Splitter", NULL, NULL, NULL, &reg_avi_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_decodebin_parser, L"GStreamer splitter filter", NULL, NULL, NULL, &reg_decodebin_parser); + IFilterMapper2_RegisterFilter(mapper, &CLSID_CMpegAudioCodec, + L"MPEG Audio Decoder", NULL, NULL, NULL, &reg_mpeg_audio_codec); IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, L"MPEG-I Stream Splitter", NULL, NULL, NULL, &reg_mpeg_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, L"Wave Parser", NULL, NULL, NULL, &reg_wave_parser); @@ -679,6 +714,7 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_AviSplitter); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_decodebin_parser); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_CMpegAudioCodec); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_MPEG1Splitter); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_WAVEParser);

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder sample timestamps.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 5db4b0cff96dae30643613a01d13b75196a00c25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5db4b0cff96dae30643613a0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun May 8 19:57:00 2022 +0700 quartz/tests: Add tests for MPEG audio decoder sample timestamps. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 99d078f9835..5fdf443f3c8 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -796,6 +796,8 @@ struct testfilter struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; unsigned int got_sample; + REFERENCE_TIME expected_start_time; + REFERENCE_TIME expected_stop_time; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -872,6 +874,8 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + REFERENCE_TIME start, stop; + HRESULT hr; LONG size; ++filter->got_sample; @@ -881,6 +885,16 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample size = IMediaSample_GetActualDataLength(sample); ok(size == 768, "Got valid size %lu.\n", size); + start = 0xdeadbeef; + stop = 0xdeadbeef; + hr = IMediaSample_GetTime(sample, &start, &stop); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (filter->got_sample == 1) + { + todo_wine ok(start == filter->expected_start_time, "Got start time %s.\n", wine_dbgstr_longlong(start)); + todo_wine ok(stop == filter->expected_stop_time, "Got stop time %s.\n", wine_dbgstr_longlong(stop)); + } + return S_OK; } @@ -1060,6 +1074,7 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, static void test_sample_processing(IMediaControl *control, IMemInputPin *input, struct testfilter *sink) { + REFERENCE_TIME start, stop; IMemAllocator *allocator; IMediaSample *sample; HRESULT hr; @@ -1095,6 +1110,52 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, hr = IMediaSample_SetActualDataLength(sample, 48); ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaSample_SetTime(sample, NULL, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + sink->expected_start_time = 0; + sink->expected_stop_time = 120000; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(sink->got_sample >= 1, "Got %u calls to Receive().\n", sink->got_sample); + sink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + start = 22222; + hr = IMediaSample_SetTime(sample, &start, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + sink->expected_start_time = 22222; + sink->expected_stop_time = 142222; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(sink->got_sample >= 1, "Got %u calls to Receive().\n", sink->got_sample); + sink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + start = 22222; + stop = 33333; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + sink->expected_start_time = 22222; + sink->expected_stop_time = 142222; hr = IMemInputPin_Receive(input, sample); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample);

1 0