October 2020 - Wine-commits

Michael Stefaniuc : sapi/tests: Use wide-char string literals.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 85458d804a5def9df5f854e518998dd189bb974e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85458d804a5def9df5f854e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:08 2020 +0100 sapi/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 1ca49398ad1..47196d42dc7 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -54,7 +54,6 @@ static void test_token_category(void) ISpObjectTokenCategory *cat; IEnumSpObjectTokens *enum_tokens; HRESULT hr; - WCHAR bogus[] = {'b','o','g','u','s',0}; ULONG count; hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, @@ -64,7 +63,7 @@ static void test_token_category(void) hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); - hr = ISpObjectTokenCategory_SetId( cat, bogus, FALSE ); + hr = ISpObjectTokenCategory_SetId( cat, L"bogus", FALSE ); ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE );

1 0

Alexandre Julliard : gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 374944994360590cea79ebd5da42bdaf9f092d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=374944994360590cea79ebd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:13:53 2020 +0100 gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++++++++- dlls/gdi32/freetype.c | 28 +++++++--------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a587715d6c3..b74632c882b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1118,13 +1118,23 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) { struct font_physdev *physdev = get_font_dev( dev ); + DWORD size, num_ranges; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetFontUnicodeRanges ); return dev->funcs->pGetFontUnicodeRanges( dev, glyphset ); } - return font_funcs->pGetFontUnicodeRanges( physdev->font, glyphset ); + + num_ranges = font_funcs->get_unicode_ranges( physdev->font, glyphset ); + size = offsetof( GLYPHSET, ranges[num_ranges] ); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; + } + return size; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3959261e609..1d076e77cf8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6680,12 +6680,16 @@ static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct c } -/* Retrieve a list of supported Unicode ranges for a given font. +/************************************************************* + * freetype_get_unicode_ranges + * + * Retrieve a list of supported Unicode ranges for a given font. * Can be called with NULL gs to calculate the buffer size. Returns * the number of ranges found. */ -static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) +static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET *gs ) { + FT_Face face = get_font_ptr(font)->ft_face; DWORD num_ranges = 0; if (face->charmap->encoding == FT_ENCODING_UNICODE) @@ -6744,24 +6748,6 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) return num_ranges; } -/************************************************************* - * freetype_GetFontUnicodeRanges - */ -static DWORD CDECL freetype_GetFontUnicodeRanges( struct gdi_font *font, GLYPHSET *glyphset ) -{ - DWORD size, num_ranges; - - num_ranges = get_font_unicode_ranges(get_font_ptr(font)->ft_face, glyphset); - size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); - if (glyphset) - { - glyphset->cbThis = size; - glyphset->cRanges = num_ranges; - glyphset->flAccel = 0; - } - return size; -} - /************************************************************* * freetype_FontIsLinked */ @@ -6988,7 +6974,6 @@ static const struct font_backend_funcs font_funcs = freetype_EnumFonts, freetype_FontIsLinked, freetype_GetCharWidthInfo, - freetype_GetFontUnicodeRanges, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6998,6 +6983,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_glyph_index, freetype_get_default_glyph, freetype_get_glyph_outline, + freetype_get_unicode_ranges, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b37cf598e9..e180121ae40 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -367,7 +367,6 @@ struct font_backend_funcs BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); - DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs UINT (CDECL *get_default_glyph)( struct gdi_font *gdi_font ); DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); + DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Alexandre Julliard : gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 72272d0088d15e53ebafea53cdec9f908ac61c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72272d0088d15e53ebafea53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:14:01 2020 +0100 gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 8 +++++++- dlls/gdi32/freetype.c | 22 ++++++++-------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b74632c882b..bb1c07c6f9e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1053,13 +1053,19 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *bu static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) { struct font_physdev *physdev = get_font_dev( dev ); + struct char_width_info *info = ptr; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidthInfo ); return dev->funcs->pGetCharWidthInfo( dev, ptr ); } - return font_funcs->pGetCharWidthInfo( physdev->font, ptr ); + + info->unk = 0; + if (!physdev->font->scalable || !font_funcs->get_char_width_info( physdev->font, info )) + info->lsb = info->rsb = 0; + + return TRUE; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1d076e77cf8..82a7e6f01b7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6654,29 +6654,23 @@ done: } /************************************************************* - * freetype_GetCharWidthInfo + * freetype_get_char_width_info */ -static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct char_width_info *info ) +static BOOL CDECL freetype_get_char_width_info( struct gdi_font *font, struct char_width_info *info ) { - GdiFont *font = get_font_ptr(gdi_font); + FT_Face face = get_font_ptr(font)->ft_face; TT_HoriHeader *pHori; TRACE("%p, %p\n", font, info); - if (gdi_font->scalable && - (pHori = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_hhea))) + if ((pHori = pFT_Get_Sfnt_Table(face, ft_sfnt_hhea))) { - FT_Fixed em_scale; - em_scale = MulDiv(gdi_font->ppem, 1 << 16, font->ft_face->units_per_EM); + FT_Fixed em_scale = MulDiv(font->ppem, 1 << 16, face->units_per_EM); info->lsb = (SHORT)pFT_MulFix(pHori->min_Left_Side_Bearing, em_scale); info->rsb = (SHORT)pFT_MulFix(pHori->min_Right_Side_Bearing, em_scale); + return TRUE; } - else - info->lsb = info->rsb = 0; - - info->unk = 0; - - return TRUE; + return FALSE; } @@ -6973,7 +6967,6 @@ static const struct font_backend_funcs font_funcs = { freetype_EnumFonts, freetype_FontIsLinked, - freetype_GetCharWidthInfo, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6984,6 +6977,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_default_glyph, freetype_get_glyph_outline, freetype_get_unicode_ranges, + freetype_get_char_width_info, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e180121ae40..7d2f5e0240e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -366,7 +366,6 @@ struct font_backend_funcs { BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); - BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); + BOOL (CDECL *get_char_width_info)( struct gdi_font *font, struct char_width_info *info ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Hans Leidekker : msi: Use wide character string literals in dialog.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: d9fbe788af65c2b2696c446d765a34ae40e3226b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fbe788af65c2b2696c446d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:46 2020 +0100 msi: Use wide character string literals in dialog.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 500 +++++++++++++++++++----------------------------------- 1 file changed, 174 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fbe788af65c2b2696c…

1 0

Hans Leidekker : msi: Use wide character string literals in msi.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 8255da2249816b77b709d1e6c888760c5e59a8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8255da2249816b77b709d1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:47 2020 +0100 msi: Use wide character string literals in msi.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 182 ++++++++++++++++++++------------------------------------- 1 file changed, 64 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8255da2249816b77b709…

1 0

Hans Leidekker : msi: Use wide character string literals in package.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 731bb72c3d00b089ee23297efdfe0496733e96a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731bb72c3d00b089ee23297e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:48 2020 +0100 msi: Use wide character string literals in package.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 526 ++++++++++++++++++----------------------------------- 1 file changed, 179 insertions(+), 347 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=731bb72c3d00b089ee23…

1 0

Hans Leidekker : msi: Use wide character string literals in registry.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 2672646eaeb1877e0d746e8554529396ec8d9eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2672646eaeb1877e0d746e85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:49 2020 +0100 msi: Use wide character string literals in registry.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 349 ++++++++++++++++------------------------------------ 1 file changed, 104 insertions(+), 245 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2672646eaeb1877e0d74…

1 0

Hans Leidekker : msi: Use wide character string literals in classes.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: e7dd9b3f3694b276d50ccfb5515e7e0f70b1c555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dd9b3f3694b276d50ccfb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:50 2020 +0100 msi: Use wide character string literals in classes.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/classes.c | 266 ++++++++++++++++++++--------------------------------- 1 file changed, 100 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7dd9b3f3694b276d50c…

1 0

Michael Stefaniuc : msxml3/tests: Use wide-char string literals.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 21ca8e16485c41d21544065c211eaffd10252ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ca8e16485c41d21544065c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:36 2020 +0100 msxml3/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 13 +++---------- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c19dd6c430e..02e31b4aafb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -733,11 +733,7 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to IXMLDOMParseError_Release(error); } -static const WCHAR szComplete1[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 -}; +static const WCHAR szComplete1[] = L"<?xml version='1.0'?>\n<open></open>\n"; static const char complete4A[] = "<?xml version=\'1.0\'?>\n" "<lc dl=\'str1\'>\n" @@ -1148,10 +1144,7 @@ static const char attributes_map[] = { static const WCHAR nonexistent_fileW[] = L"c:\\Nonexistent.xml"; -static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; - -static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; +static const WCHAR szStrangeChars[] = L"&x \x2103"; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -5872,7 +5865,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML4 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\">&x \x2103</EleTest>" ), "incorrect element xml\n"); SysFreeString(str); hr = IXMLDOMElement_get_text(pElement, &str); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 47d158ab3ea..ab814c5f764 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1518,9 +1518,9 @@ static HRESULT WINAPI isaxattributes_getQName( const WCHAR **QName, int *QNameLength) { - static const WCHAR attrqnamesW[][15] = {{'a',':','a','t','t','r','1','j','u','n','k',0}, - {'a','t','t','r','2','j','u','n','k',0}, - {'a','t','t','r','3',0}}; + static const WCHAR attrqnamesW[][15] = {L"a:attr1junk", + L"attr2junk", + L"attr3"}; static const int attrqnamelen[] = {7, 5, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -1609,9 +1609,9 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName( static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, const WCHAR **value, int *nValue) { - static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, - {'a','2','j','u','n','k',0}, - {'<','&','"','>','\'',0}}; + static const WCHAR attrvaluesW[][10] = {L"a1junk", + L"a2junk", + L"<&\">'"}; static const int attrvalueslen[] = {2, 2, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -3960,7 +3960,7 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { - static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; + static const WCHAR embedded_nullbytes[] = L"a\0b\0\0\0c"; const struct writer_characters_t *table = writer_characters; IVBSAXContentHandler *vb_content; ISAXContentHandler *content;

1 0

Derek Lesho : winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: f26e81cf38b2bf0305581522d3d980d3508a43ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26e81cf38b2bf0305581522… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:04 2020 -0500 winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 0991710755c..d6c7837e544 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -388,7 +388,7 @@ static const IMFMediaStreamVtbl media_stream_vtbl = the user throws at us through gstreamer's caps negotiation. */ static HRESULT media_stream_connect_to_sink(struct media_stream *stream) { - GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); const gchar *stream_type; if (!source_caps)

1 0