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

Anton Baskanov : winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 08e13d197965d4978167f0dd541d32a8cec2bbf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/08e13d197965d4978167f0dd541d32… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri May 10 10:44:07 2024 +0700 winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3. Fixes: cc82780c22db31fed4da8b84e85c01652a995490 --- dlls/winegstreamer/mfplat.c | 61 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 879ea0707fc..df3d95629c1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -638,6 +638,61 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(subtype), depth); } +static void mf_media_type_to_wg_format_audio_mpeg(IMFMediaType *type, const GUID *subtype, struct wg_format *format) +{ + MPEG1WAVEFORMAT wfx = {0}; + UINT32 codec_data_size; + UINT32 rate, channels; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + FIXME("Sample rate is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + FIXME("Channel count is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, (UINT8 *)(&wfx.wfx + 1), + sizeof(wfx) - sizeof(WAVEFORMATEX), &codec_data_size))) + { + FIXME("Codec data is not set.\n"); + return; + } + if (codec_data_size < sizeof(wfx) - sizeof(WAVEFORMATEX)) + { + FIXME("Codec data is incomplete.\n"); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + format->u.audio.layer = wfx.fwHeadLayer; +} + +static void mf_media_type_to_wg_format_audio_mpeg_layer3(IMFMediaType *type, const GUID *subtype, struct wg_format *format) +{ + UINT32 rate, channels; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + FIXME("Sample rate is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + FIXME("Channel count is not set.\n"); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + format->u.audio.layer = 3; +} + static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { BYTE buffer[sizeof(HEAACWAVEFORMAT) + 64]; @@ -942,7 +997,11 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) if (IsEqualGUID(&major_type, &MFMediaType_Audio)) { - if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) || + if (IsEqualGUID(&subtype, &MFAudioFormat_MPEG)) + mf_media_type_to_wg_format_audio_mpeg(type, &subtype, format); + else if (IsEqualGUID(&subtype, &MFAudioFormat_MP3)) + mf_media_type_to_wg_format_audio_mpeg_layer3(type, &subtype, format); + else if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV8) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))

1 0

Anton Baskanov : winegstreamer: Add missing format fields to WMA support check.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: f8001fdc8e7fe62ccf124f764511a86d9d1662b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8001fdc8e7fe62ccf124f764511a8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri May 10 13:36:50 2024 +0700 winegstreamer: Add missing format fields to WMA support check. Fixes: cc82780c22db31fed4da8b84e85c01652a995490 --- dlls/winegstreamer/wma_decoder.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 15815f11374..28439b1cf7e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -1032,8 +1032,9 @@ HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) }; static const WMAUDIO2WAVEFORMAT input_format = { - .wfx = {.wFormatTag = WAVE_FORMAT_WMAUDIO2, .nSamplesPerSec = 44100, .nChannels = 1, - .cbSize = sizeof(input_format) - sizeof(WAVEFORMATEX)}, + .wfx = {.wFormatTag = WAVE_FORMAT_WMAUDIO2, .wBitsPerSample = 16, .nSamplesPerSec = 44100, .nChannels = 1, + .nAvgBytesPerSec = 3000, .nBlockAlign = 139, .cbSize = sizeof(input_format) - sizeof(WAVEFORMATEX)}, + .wEncodeOptions = 1, }; struct wma_decoder *decoder; HRESULT hr;

1 0

Hongxin Zhao : po: Add a missing \t in the Simplified Chinese translation.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: f4871cb27c2399e32b429d09c77b73bf5fc71a7e URL: https://gitlab.winehq.org/wine/wine/-/commit/f4871cb27c2399e32b429d09c77b73… Author: Hongxin Zhao <zhaohongxinxin(a)163.com> Date: Mon May 13 06:54:21 2024 +0000 po: Add a missing \t in the Simplified Chinese translation. --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index ec4a9bc96af..e3e8390a950 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14162,7 +14162,7 @@ msgstr "" "FTYPE\t\t显示或更改文件类型关联的打开命令\n" "HELP\t\t显示某个主题的帮助信息概览\n" "MD (MKDIR)\t创建子目录\n" -"MKLINK\t创建符号链接\n" +"MKLINK\t\t创建符号链接\n" "MORE\t\t分页显示输出\n" "MOVE\t\t移动一个或多个文件，或整个目录树\n" "PATH\t\t设置或显示命令搜索路径\n"

1 0

Elizabeth Figura : wined3d: Remove the GL FFP vertex pipeline.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 3e31a9742ce602c83a64a8f77b8e5910d997057a URL: https://gitlab.winehq.org/wine/wine/-/commit/3e31a9742ce602c83a64a8f77b8e59… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:00:05 2024 -0500 wined3d: Remove the GL FFP vertex pipeline. --- dlls/wined3d/ffp_gl.c | 1409 ---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1410 deletions(-)

1 0

Alexandre Julliard : ntdll: Store the CPU vendor and id during detection.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 7f9cad6979b43b4e538cf5786ecd7bde871680fe URL: https://gitlab.winehq.org/wine/wine/-/commit/7f9cad6979b43b4e538cf5786ecd7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 13 11:53:10 2024 +0200 ntdll: Store the CPU vendor and id during detection. --- dlls/ntdll/unix/system.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 280d1b7323a..d5556c0d42a 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -188,6 +188,8 @@ enum smbios_type SYSTEM_CPU_INFORMATION cpu_info = { 0 }; static SYSTEM_PROCESSOR_FEATURES_INFORMATION cpu_features; static char cpu_name[49]; +static char cpu_vendor[13]; +static ULONGLONG cpu_id; static ULONG *performance_cores; static unsigned int performance_cores_capacity = 0; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION *logical_proc_info; @@ -265,14 +267,6 @@ void copy_xstate( XSAVE_AREA_HEADER *dst, XSAVE_AREA_HEADER *src, UINT64 mask ) } } -#define AUTH 0x68747541 /* "Auth" */ -#define ENTI 0x69746e65 /* "enti" */ -#define CAMD 0x444d4163 /* "cAMD" */ - -#define GENU 0x756e6547 /* "Genu" */ -#define INEI 0x49656e69 /* "ineI" */ -#define NTEL 0x6c65746e /* "ntel" */ - extern void do_cpuid( unsigned int ax, unsigned int cx, unsigned int *p ); #ifdef __i386__ __ASM_GLOBAL_FUNC( do_cpuid, @@ -396,6 +390,9 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (!have_cpuid()) return; do_cpuid( 0x00000000, 0, regs ); /* get standard cpuid level and vendor name */ + memcpy( cpu_vendor, &regs[1], sizeof(unsigned int) ); + memcpy( cpu_vendor + 4, &regs[3], sizeof(unsigned int) ); + memcpy( cpu_vendor + 8, &regs[2], sizeof(unsigned int) ); if (regs[0]>=0x00000001) /* Check for supported cpuid version */ { do_cpuid( 0x00000001, 0, regs2 ); /* get cpu features */ @@ -421,6 +418,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24)) && have_sse_daz_mode()) /* has SSE2 and FXSAVE/FXRSTOR */ features |= CPU_FEATURE_DAZ; + cpu_id = regs2[0] | ((ULONGLONG)regs2[3] << 32); if (regs[0] >= 0x00000007) { do_cpuid( 0x00000007, 0, regs3 ); /* get extended features */ @@ -452,7 +450,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) TRACE("xstate_features_size %lld.\n", (long long)xstate_features_size); } - if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) + if (!strcmp( cpu_vendor, "AuthenticAMD" )) { info->ProcessorLevel = (regs2[0] >> 8) & 0xf; /* family */ if (info->ProcessorLevel == 0xf) /* AMD says to add the extended family to the family if family is 0xf */ @@ -474,7 +472,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (regs[0] >= 0x80000004) get_cpuid_name( cpu_name ); } - else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) + else if (!strcmp( cpu_vendor, "GenuineIntel" )) { info->ProcessorLevel = ((regs2[0] >> 8) & 0xf) + ((regs2[0] >> 20) & 0xff); /* family + extended family */ if(info->ProcessorLevel == 15) info->ProcessorLevel = 6;

1 0

Alexandre Julliard : ntdll: Add processor information to the SMBIOS data.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: dd4514a26bb411aaf4391accc63c2d779835b1ef URL: https://gitlab.winehq.org/wine/wine/-/commit/dd4514a26bb411aaf4391accc63c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 13 11:54:17 2024 +0200 ntdll: Add processor information to the SMBIOS data. --- dlls/ntdll/unix/system.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d5556c0d42a..dcfc2ebd980 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -158,6 +158,37 @@ struct smbios_chassis BYTE contained_element_rec_length; }; +struct smbios_processor +{ + struct smbios_header hdr; + BYTE socket; + BYTE type; + BYTE family; + BYTE vendor; + ULONGLONG id; + BYTE version; + BYTE voltage; + WORD clock; + WORD max_speed; + WORD cur_speed; + BYTE status; + BYTE upgrade; + WORD l1cache; + WORD l2cache; + WORD l3cache; + BYTE serial; + BYTE asset_tag; + BYTE part_number; + BYTE core_count; + BYTE core_enabled; + BYTE thread_count; + WORD characteristics; + WORD family2; + WORD core_count2; + WORD core_enabled2; + WORD thread_count2; +}; + struct smbios_boot_info { struct smbios_header hdr; @@ -173,6 +204,7 @@ enum smbios_type SMBIOS_TYPE_SYSTEM = 1, SMBIOS_TYPE_BASEBOARD = 2, SMBIOS_TYPE_CHASSIS = 3, + SMBIOS_TYPE_PROCESSOR = 4, SMBIOS_TYPE_BOOTINFO = 32, SMBIOS_TYPE_END = 127 }; @@ -1561,6 +1593,40 @@ static WORD append_smbios_board( struct smbios_buffer *buf, WORD chassis_handle, return append_smbios( buf, &board.hdr, strings, string_count ); } +static WORD append_smbios_processor( struct smbios_buffer *buf, WORD core_count, WORD thread_count, + WORD family, const char *socket, const char *vendor, + const char *version, const char *serial, const char *asset_tag ) +{ + const char *strings[5]; + unsigned int string_count = 0; + struct smbios_processor proc = { .hdr.type = SMBIOS_TYPE_PROCESSOR, .hdr.length = sizeof(proc) }; + + proc.socket = ADD_STR( socket ); + proc.type = 3; /* central processor */ + proc.family = family ? min( family, 0xfe ) : 2; /* unknown */ + proc.vendor = ADD_STR( vendor ); + proc.id = cpu_id; + proc.version = ADD_STR( version ); + proc.status = 0x41; /* cpu enabled */ + proc.upgrade = 2; /* unknown */ + proc.l1cache = 0xffff; /* unknown */ + proc.l2cache = 0xffff; /* unknown */ + proc.l3cache = 0xffff; /* unknown */ + proc.serial = ADD_STR( serial ); + proc.asset_tag = ADD_STR( asset_tag ); + proc.core_count = min( core_count, 0xff ); + proc.core_enabled = min( core_count, 0xff ); + proc.thread_count = min( thread_count, 0xff ); + proc.family2 = family ? family : 2; + proc.core_count2 = core_count; + proc.core_enabled2 = core_count; + proc.thread_count2 = thread_count; + if (sizeof(void *) > sizeof(int)) proc.characteristics |= 1 << 2; /* 64-bit */ + if (core_count > 1) proc.characteristics |= 1 << 3; /* multi-core */ + if (thread_count > core_count) proc.characteristics |= 1 << 4; /* multi-thread */ + return append_smbios( buf, &proc.hdr, strings, string_count ); +} + static WORD append_smbios_boot_info( struct smbios_buffer *buf ) { struct smbios_boot_info boot = { .hdr.type = SMBIOS_TYPE_BOOTINFO, .hdr.length = sizeof(boot) }; @@ -1575,6 +1641,41 @@ static void append_smbios_end( struct smbios_buffer *buf ) append_smbios( buf, &end, NULL, 0 ); } +static void create_smbios_processors( struct smbios_buffer *buf ) +{ + char socket[20], name[49]; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *p = logical_proc_info_ex; + UINT i, family = 0, core_count = 0, thread_count = 0, pkg_count = 0; + + strcpy( name, cpu_name ); + for (i = strlen(name); i > 0 && name[i - 1] == ' '; i--) name[i - 1] = 0; + + while ((char *)p != (char *)logical_proc_info_ex + logical_proc_info_ex_size) + { + switch (p->Relationship) + { + case RelationProcessorPackage: + if (!pkg_count++) break; + snprintf( socket, sizeof(socket), "Socket #%u", pkg_count - 1 ); + append_smbios_processor( buf, core_count, thread_count, family, + socket, cpu_vendor, name, "", "" ); + core_count = thread_count = 0; + break; + case RelationProcessorCore: + core_count++; + thread_count++; + if (p->Processor.Flags & LTP_PC_SMT) thread_count++; + break; + default: + break; + } + p = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((char *)p + p->Size); + } + snprintf( socket, sizeof(socket), "Socket #%u", pkg_count - 1 ); + append_smbios_processor( buf, core_count, thread_count, family, + socket, cpu_vendor, name, "", "" ); +} + #undef ADD_STR #ifdef linux @@ -1673,6 +1774,7 @@ static struct smbios_prologue *create_smbios_data(void) get_smbios_string( "/sys/class/dmi/id/board_asset_tag", S(asset_tag) )); #undef S + create_smbios_processors( &buf ); append_smbios_boot_info( &buf ); append_smbios_end( &buf ); return buf.prologue; @@ -1807,6 +1909,7 @@ static struct smbios_prologue *create_smbios_data(void) append_smbios_system( &buf, manufacturer, model, "1.0", serial_number, "", model, &system_uuid ); chassis = append_smbios_chassis( &buf, 0, manufacturer, "", serial_number, "" ); append_smbios_board( &buf, chassis, manufacturer, model, model, serial_number, "" ); + create_smbios_processors( &buf ); append_smbios_boot_info( &buf ); append_smbios_end( &buf ); return buf.prologue; @@ -1828,6 +1931,7 @@ static struct smbios_prologue *create_smbios_data(void) append_smbios_system( &buf, vendor, product, version, serial, "", "", &uuid ); chassis = append_smbios_chassis( &buf, 0, vendor, version, serial, "" ); append_smbios_board( &buf, chassis, vendor, product, version, serial, "" ); + create_smbios_processors( &buf ); append_smbios_boot_info( &buf ); append_smbios_end( &buf ); return buf.prologue;

1 0

Rémi Bernon : mfplat: Implement FORMAT_MPEG2Video for MFInitAMMediaTypeFromMFMediaType.
by Alexandre Julliard 12 May '24

12 May '24

Module: wine Branch: master Commit: ec0455b97a0faf9ca1dc0f08afd8aab75881f811 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec0455b97a0faf9ca1dc0f08afd8aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 9 10:57:54 2024 +0200 mfplat: Implement FORMAT_MPEG2Video for MFInitAMMediaTypeFromMFMediaType. --- dlls/mfplat/mediatype.c | 30 +++++++++++++++++ dlls/mfplat/tests/mfplat.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 3ff42769349..7e2e5d45c1c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -4136,6 +4136,14 @@ static UINT32 get_am_media_type_video_format_size(const GUID *format_type, IMFMe return size; } + if (IsEqualGUID(format_type, &FORMAT_MPEG2Video)) + { + UINT32 size = sizeof(MPEG2VIDEOINFO), sequence_size; + if (SUCCEEDED(IMFMediaType_GetBlobSize(media_type, &MF_MT_MPEG_SEQUENCE_HEADER, &sequence_size))) + size += sequence_size; + return size; + } + return 0; } @@ -4156,6 +4164,8 @@ static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, IMFMediaT if (IsEqualGUID(&am_type->subtype, &MEDIASUBTYPE_MPEG1Payload) || IsEqualGUID(&am_type->subtype, &MEDIASUBTYPE_MPEG1Packet)) am_type->formattype = FORMAT_MPEGVideo; + else if (IsEqualGUID(&am_type->subtype, &MEDIASUBTYPE_MPEG2_VIDEO)) + am_type->formattype = FORMAT_MPEG2Video; else am_type->formattype = FORMAT_VideoInfo; } @@ -4211,6 +4221,26 @@ static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, IMFMediaT am_type->bFixedSizeSamples = !!video_format; am_type->bTemporalCompression = !video_format; } + else if (IsEqualGUID(&am_type->formattype, &FORMAT_MPEG2Video)) + { + MPEG2VIDEOINFO *format = (MPEG2VIDEOINFO *)am_type->pbFormat; + + init_video_info_header2(&format->hdr, &am_type->subtype, media_type); + + format->dwStartTimeCode = media_type_get_uint32(media_type, &MF_MT_MPEG_START_TIME_CODE); + format->dwProfile = media_type_get_uint32(media_type, &MF_MT_MPEG2_PROFILE); + format->dwLevel = media_type_get_uint32(media_type, &MF_MT_MPEG2_LEVEL); + format->dwFlags = media_type_get_uint32(media_type, &MF_MT_MPEG2_FLAGS); + + if (am_type->cbFormat > sizeof(*format) && FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_MPEG_SEQUENCE_HEADER, + (BYTE *)format->dwSequenceHeader, am_type->cbFormat - sizeof(*format), NULL))) + return hr; + format->cbSequenceHeader = am_type->cbFormat - sizeof(*format); + + am_type->subtype = get_am_subtype_for_mf_subtype(am_type->subtype); + am_type->bFixedSizeSamples = !!video_format; + am_type->bTemporalCompression = !video_format; + } else { WARN("Unknown format %s\n", debugstr_mf_guid(&am_type->formattype)); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 78c4ce9d583..98f88c0c73e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7352,6 +7352,7 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) VIDEOINFOHEADER *video_info; WAVEFORMATEX *wave_format; MPEG1VIDEOINFO *mpeg1_info; + MPEG2VIDEOINFO *mpeg2_info; IMFMediaType *media_type, *other_type; AM_MEDIA_TYPE am_type; MFVideoArea *area; @@ -7459,6 +7460,13 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) ok(IsEqualGUID(&am_type.formattype, &FORMAT_MPEGVideo), "got %s.\n", debugstr_guid(&am_type.formattype)); ok(am_type.cbFormat == sizeof(MPEG1VIDEOINFO), "got %lu\n", am_type.cbFormat); CoTaskMemFree(am_type.pbFormat); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_MPEG2Video, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(IsEqualGUID(&am_type.majortype, &MFMediaType_Video), "got %s.\n", debugstr_guid(&am_type.majortype)); + ok(IsEqualGUID(&am_type.subtype, &MEDIASUBTYPE_RGB32), "got %s.\n", debugstr_guid(&am_type.subtype)); + ok(IsEqualGUID(&am_type.formattype, &FORMAT_MPEG2Video), "got %s.\n", debugstr_guid(&am_type.formattype)); + ok(am_type.cbFormat == sizeof(MPEG2VIDEOINFO), "got %lu\n", am_type.cbFormat); + CoTaskMemFree(am_type.pbFormat); /* test WAVEFORMATEX mapping */ @@ -8099,6 +8107,81 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) IMFMediaType_DeleteAllItems(media_type); + /* MEDIASUBTYPE_MPEG2_VIDEO uses FORMAT_MPEG2Video by default */ + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_MPEG2_VIDEO); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(IsEqualGUID(&am_type.majortype, &MFMediaType_Video), "got %s.\n", debugstr_guid(&am_type.majortype)); + ok(IsEqualGUID(&am_type.subtype, &MEDIASUBTYPE_MPEG2_VIDEO), "got %s.\n", debugstr_guid(&am_type.subtype)); + ok(IsEqualGUID(&am_type.formattype, &FORMAT_MPEG2Video), "got %s.\n", debugstr_guid(&am_type.formattype)); + ok(am_type.cbFormat == sizeof(MPEG2VIDEOINFO), "got %lu\n", am_type.cbFormat); + mpeg2_info = (MPEG2VIDEOINFO *)am_type.pbFormat; + ok(mpeg2_info->dwStartTimeCode == 0, "got %lu\n", mpeg2_info->dwStartTimeCode); + ok(mpeg2_info->dwProfile == 0, "got %lu\n", mpeg2_info->dwProfile); + ok(mpeg2_info->dwLevel == 0, "got %lu\n", mpeg2_info->dwLevel); + ok(mpeg2_info->dwFlags == 0, "got %lu\n", mpeg2_info->dwFlags); + ok(mpeg2_info->cbSequenceHeader == 0, "got %lu\n", mpeg2_info->cbSequenceHeader); + CoTaskMemFree(am_type.pbFormat); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_MPEG_START_TIME_CODE, 1234); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_MPEG2_PROFILE, 6); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_MPEG2_LEVEL, 7); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_MPEG2_FLAGS, 8910); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(am_type.cbFormat == sizeof(MPEG2VIDEOINFO), "got %lu\n", am_type.cbFormat); + mpeg2_info = (MPEG2VIDEOINFO *)am_type.pbFormat; + ok(mpeg2_info->dwStartTimeCode == 1234, "got %lu\n", mpeg2_info->dwStartTimeCode); + ok(mpeg2_info->dwProfile == 6, "got %lu\n", mpeg2_info->dwProfile); + ok(mpeg2_info->dwLevel == 7, "got %lu\n", mpeg2_info->dwLevel); + ok(mpeg2_info->dwFlags == 8910, "got %lu\n", mpeg2_info->dwFlags); + CoTaskMemFree(am_type.pbFormat); + + /* MF_MT_USER_DATA is ignored */ + + hr = IMFMediaType_SetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)dummy_user_data, sizeof(dummy_user_data)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(am_type.cbFormat == sizeof(MPEG2VIDEOINFO), "got %lu\n", am_type.cbFormat); + mpeg2_info = (MPEG2VIDEOINFO *)am_type.pbFormat; + ok(mpeg2_info->hdr.bmiHeader.biSize == sizeof(mpeg2_info->hdr.bmiHeader), "got %lu\n", mpeg2_info->hdr.bmiHeader.biSize); + ok(mpeg2_info->cbSequenceHeader == 0, "got %lu\n", mpeg2_info->cbSequenceHeader); + CoTaskMemFree(am_type.pbFormat); + + /* MF_MT_MPEG_SEQUENCE_HEADER is used instead in MPEG2VIDEOINFO */ + + hr = IMFMediaType_SetBlob(media_type, &MF_MT_MPEG_SEQUENCE_HEADER, (BYTE *)dummy_mpeg_sequence, sizeof(dummy_mpeg_sequence)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(am_type.cbFormat == sizeof(MPEG2VIDEOINFO) + sizeof(dummy_mpeg_sequence), "got %lu\n", am_type.cbFormat); + mpeg2_info = (MPEG2VIDEOINFO *)am_type.pbFormat; + ok(mpeg2_info->hdr.bmiHeader.biSize == sizeof(mpeg2_info->hdr.bmiHeader), "got %lu\n", mpeg2_info->hdr.bmiHeader.biSize); + ok(mpeg2_info->cbSequenceHeader == sizeof(dummy_mpeg_sequence), "got %lu\n", mpeg2_info->cbSequenceHeader); + ok(!memcmp(mpeg2_info->dwSequenceHeader, dummy_mpeg_sequence, mpeg2_info->cbSequenceHeader), "got wrong data\n"); + CoTaskMemFree(am_type.pbFormat); + + /* MFVIDEOFORMAT loses MF_MT_MPEG_SEQUENCE_HEADER */ + + hr = IMFMediaType_DeleteItem(media_type, &MF_MT_USER_DATA); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_MFVideoFormat, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(am_type.cbFormat == sizeof(MFVIDEOFORMAT), "got %lu\n", am_type.cbFormat); + CoTaskMemFree(am_type.pbFormat); + + IMFMediaType_DeleteAllItems(media_type); + + IMFMediaType_Release(media_type); }

1 0

Rémi Bernon : mfplat: Implement MFInitMediaTypeFromMPEG1VideoInfo.
by Alexandre Julliard 12 May '24

12 May '24

Module: wine Branch: master Commit: 8c77a1a09942b9fd84db229ddcda8e97cdbff744 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c77a1a09942b9fd84db229ddcda8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 6 17:25:38 2024 +0200 mfplat: Implement MFInitMediaTypeFromMPEG1VideoInfo. --- dlls/mfplat/mediatype.c | 25 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 3 ++ 4 files changed, 142 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : mfplat: Implement MFInitMediaTypeFromMPEG2VideoInfo.
by Alexandre Julliard 12 May '24

12 May '24

Module: wine Branch: master Commit: 9fac5897651e9d04e28bbd58021d7aabfc93bcf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9fac5897651e9d04e28bbd58021d7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 6 18:04:21 2024 +0200 mfplat: Implement MFInitMediaTypeFromMPEG2VideoInfo. --- dlls/mfplat/mediatype.c | 31 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 3 + 4 files changed, 178 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : mfplat: Implement MFCreateVideoMediaType.
by Alexandre Julliard 12 May '24

12 May '24

Module: wine Branch: master Commit: bf64ae2627fee37836d6fecf587b72919230b888 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf64ae2627fee37836d6fecf587b72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 6 11:21:08 2024 +0200 mfplat: Implement MFCreateVideoMediaType. --- dlls/evr/evr.spec | 2 +- dlls/mfplat/mediatype.c | 24 ++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 0a3a3fb6d42..7383589573b 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -8,7 +8,7 @@ @ stub MFConvertToFP16Array @ stdcall -import MFCopyImage(ptr long ptr long long long) @ stdcall -import MFCreateDXSurfaceBuffer(ptr ptr long ptr) -@ stub MFCreateVideoMediaType +@ stdcall -import MFCreateVideoMediaType(ptr ptr) @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr) @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index cebc458a1e3..dd0b29fac32 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3759,6 +3759,30 @@ static const GUID * get_mf_subtype_for_am_subtype(const GUID *subtype) return subtype; } +HRESULT WINAPI MFCreateVideoMediaType(const MFVIDEOFORMAT *format, IMFVideoMediaType **media_type) +{ + struct media_type *object; + HRESULT hr; + + TRACE("%p, %p.\n", format, media_type); + + if (!media_type) + return E_INVALIDARG; + + if (FAILED(hr = create_media_type(&object))) + return hr; + + if (FAILED(hr = MFInitMediaTypeFromMFVideoFormat(&object->IMFMediaType_iface, format, format->dwSize))) + { + IMFMediaType_Release(&object->IMFMediaType_iface); + return hr; + } + + *media_type = &object->IMFVideoMediaType_iface; + + return hr; +} + /*********************************************************************** * MFCreateVideoMediaTypeFromVideoInfoHeader (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index e311b3cf493..d61e18491d3 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -76,7 +76,7 @@ @ stdcall MFCreateTransformActivate(ptr) @ stub MFCreateURLFromPath @ stub MFCreateUdpSockets -@ stub MFCreateVideoMediaType +@ stdcall MFCreateVideoMediaType(ptr ptr) @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stub MFCreateVideoMediaTypeFromBitMapInfoHeaderEx @ stdcall MFCreateVideoMediaTypeFromSubtype(ptr ptr) diff --git a/include/mfapi.h b/include/mfapi.h index 2e1c2345418..86fdcb2b8e4 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -556,6 +556,7 @@ HRESULT WINAPI MFCreateMediaTypeFromRepresentation(GUID guid_representation, voi HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateTempFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, IMFByteStream **bytestream); +HRESULT WINAPI MFCreateVideoMediaType(const MFVIDEOFORMAT *format, IMFVideoMediaType **media_type); HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); #ifdef _KSMEDIA_

1 0