- Wine-Commits - list.winehq.org

Eric Pouech : cmd: Set success/failure return code for TYPE command.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 0b6fc4cd1cc6ac4c0410fa99e517a23184efe488 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b6fc4cd1cc6ac4c0410fa99e517a2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:28:53 2024 +0200 cmd: Set success/failure return code for TYPE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 12 +++++++----- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 708e3c6dce6..2510735f00d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3490,21 +3490,22 @@ void WCMD_title (const WCHAR *args) { * Copy a file to standard output. */ -void WCMD_type (WCHAR *args) { - +RETURN_CODE WCMD_type(WCHAR *args) +{ + RETURN_CODE return_code; int argno = 0; WCHAR *argN = args; BOOL writeHeaders = FALSE; if (param1[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } if (param2[0] != 0x00) writeHeaders = TRUE; /* Loop through all args */ - errorlevel = NO_ERROR; + return_code = NO_ERROR; while (argN) { WCHAR *thisArg = WCMD_parameter (args, argno++, &argN, FALSE, FALSE); @@ -3520,7 +3521,7 @@ void WCMD_type (WCHAR *args) { if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); - errorlevel = ERROR_INVALID_FUNCTION; + return errorlevel = ERROR_INVALID_FUNCTION; } else { if (writeHeaders) { WCMD_output_stderr(L"\n%1\n\n\n", thisArg); @@ -3533,6 +3534,7 @@ void WCMD_type (WCHAR *args) { CloseHandle (h); } } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 58e115642b2..5919bcf4f77 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -465,14 +465,14 @@ SUCCESS 666 SUCCESS 0 FAILURE 33 --- success/failure for TYPE command -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 @todo_wine(a)a@space@ @todo_wine(a)b@space@ @todo_wine(a)FAILURE 1 @todo_wine(a)--- -(a)todo_wine@FAILURE 1 +FAILURE 1 --- success/failure for COPY command @todo_wine(a)FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 9f8bdd46044..44cdd415fbe 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -202,7 +202,7 @@ void WCMD_setshow_time (void); void WCMD_shift (const WCHAR *args); void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); -void WCMD_type (WCHAR *); +RETURN_CODE WCMD_type(WCHAR *); void WCMD_verify (const WCHAR *args); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 46ec53587e7..cd2043b02f3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1896,7 +1896,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_title(&whichcmd[count+1]); break; case WCMD_TYPE: - WCMD_type (parms_start); + return_code = WCMD_type(parms_start); break; case WCMD_VER: WCMD_output_asis(L"\r\n");

1 0

Eric Pouech : cmd: Add success/failure tests for file related commands.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: a132d9c37ebc5638244dd9223edf39e7665bad86 URL: https://gitlab.winehq.org/wine/wine/-/commit/a132d9c37ebc5638244dd9223edf39… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 24 11:06:03 2024 +0200 cmd: Add success/failure tests for file related commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 58 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 34 ++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d31cb3ef72a..ccdddd289bd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -466,6 +466,64 @@ call :setError 666 & ((for %%i in () do echo "") &&echo SUCCESS !errorlevel!||ec call :setError 666 & ((for %%i in () do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 0) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) + +echo --- success/failure for TYPE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (type &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- +call :setError 666 & (type i\dont\exist\at\all.txt file* &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for COPY command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (copy fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA fileZ >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA+fileD fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileD+fileA fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +if exist fileD echo Unexpected fileD +cd .. && rd /q /s foo + +echo --- success/failure for MOVE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (move >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileA fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileC nowhere\fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileD fileE >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileC fileB /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for RENAME command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (rename fileB >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB nowhere\fileB >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileD fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for ERASE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +echo e > fileE +call :setError 666 & (erase &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase fileE &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c2dba03b740..58e115642b2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -464,7 +464,39 @@ SUCCESS 666 SUCCESS 666 SUCCESS 0 FAILURE 33 ---- +--- success/failure for TYPE command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@a(a)space@ +(a)todo_wine@b(a)space@ +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- +(a)todo_wine@FAILURE 1 +--- success/failure for COPY command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for MOVE command +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for RENAME command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +SUCCESS 0 +--- success/failure for ERASE command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- ------------ Testing 'set' ------------ 1 0

1 0

Eric Pouech : cmd: Set success/failure return code DELETE command.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: ca3b24733a981b456edc8f26859ce988a293a7c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca3b24733a981b456edc8f26859ce9… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:39:24 2024 +0200 cmd: Set success/failure return code DELETE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 22 +++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2510735f00d..2a7e08da898 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1438,37 +1438,41 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { * non-hidden files */ -BOOL WCMD_delete (WCHAR *args) { +RETURN_CODE WCMD_delete(WCHAR *args) +{ int argno; WCHAR *argN; BOOL argsProcessed = FALSE; - BOOL foundAny = FALSE; errorlevel = NO_ERROR; - for (argno=0; ; argno++) { - BOOL found; + for (argno = 0; ; argno++) + { WCHAR *thisArg; argN = NULL; - thisArg = WCMD_parameter (args, argno, &argN, FALSE, FALSE); + thisArg = WCMD_parameter(args, argno, &argN, FALSE, FALSE); if (!argN) break; /* no more parameters */ if (argN[0] == '/') continue; /* skip options */ argsProcessed = TRUE; - found = WCMD_delete_one(thisArg); - if (!found) + if (!WCMD_delete_one(thisArg)) + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); - foundAny |= found; + errorlevel = ERROR_INVALID_FUNCTION; + } } /* Handle no valid args */ if (!argsProcessed) + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); + errorlevel = ERROR_INVALID_FUNCTION; + } - return foundAny; + return errorlevel; } /* diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5919bcf4f77..8d23e7efaf8 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -492,10 +492,10 @@ SUCCESS 0 @todo_wine(a)FAILURE 1 SUCCESS 0 --- success/failure for ERASE command -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 @todo_wine(a)--- ------------ Testing 'set' ------------ 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 44cdd415fbe..db63966bffe 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -168,7 +168,7 @@ void WCMD_clear_screen (void); void WCMD_color (void); void WCMD_copy (WCHAR *); void WCMD_create_dir (WCHAR *); -BOOL WCMD_delete (WCHAR *); +RETURN_CODE WCMD_delete(WCHAR *); void WCMD_directory (WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); void WCMD_endlocal (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cd2043b02f3..0ec3b014283 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1830,7 +1830,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_DEL: case WCMD_ERASE: - WCMD_delete (parms_start); + return_code = WCMD_delete(parms_start); break; case WCMD_DIR: WCMD_directory (parms_start);

1 0

Elizabeth Figura : winegstreamer: Implement WMA to IMFMediaType conversion.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 6013852094476ee6c5e857ef7b8dd87346fb1482 URL: https://gitlab.winehq.org/wine/wine/-/commit/6013852094476ee6c5e857ef7b8dd8… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 18:48:38 2024 -0500 winegstreamer: Implement WMA to IMFMediaType conversion. --- dlls/winegstreamer/mfplat.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 0c21f8b7d82..b3bb4573847 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -662,12 +662,42 @@ static IMFMediaType *mf_media_type_from_wg_format_wmv(const struct wg_format *fo return type; } +static IMFMediaType *mf_media_type_from_wg_format_wma(const struct wg_format *format) +{ + IMFMediaType *type; + + if (FAILED(MFCreateMediaType(&type))) + return NULL; + + IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + + if (format->u.audio.version == 1) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_MSAUDIO1); + else if (format->u.audio.version == 2) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFAudioFormat_WMAudioV8); + else if (format->u.audio.version == 3) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFAudioFormat_WMAudioV9); + else if (format->u.audio.version == 4) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFAudioFormat_WMAudio_Lossless); + else + FIXME("Unhandled version %#x.\n", format->u.audio.version); + + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, format->u.audio.rate); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, format->u.audio.bitrate / 8); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, format->u.audio.block_align); + IMFMediaType_SetBlob(type, &MF_MT_USER_DATA, format->u.audio.codec_data, format->u.audio.codec_data_len); + + return type; +} + IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) { switch (format->major_type) { case WG_MAJOR_TYPE_AUDIO_MPEG1: - case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_INDEO: case WG_MAJOR_TYPE_VIDEO_MPEG1: @@ -690,6 +720,9 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_VIDEO_WMV: return mf_media_type_from_wg_format_wmv(format); + + case WG_MAJOR_TYPE_AUDIO_WMA: + return mf_media_type_from_wg_format_wma(format); } assert(0);

1 0

Elizabeth Figura : winegstreamer: Implement MPEG-1 audio to IMFMediaType conversion.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 8f4bb2e9f9151ebbcea4c1be6c86a29586156de5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f4bb2e9f9151ebbcea4c1be6c86a2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 18:51:07 2024 -0500 winegstreamer: Implement MPEG-1 audio to IMFMediaType conversion. --- dlls/winegstreamer/mfplat.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index b3bb4573847..d84939ce13d 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -586,6 +586,28 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * return NULL; } +static IMFMediaType *mf_media_type_from_wg_format_audio_mpeg1(const struct wg_format *format) +{ + IMFMediaType *type; + + if (FAILED(MFCreateMediaType(&type))) + return NULL; + + if (format->u.audio.layer != 3) + FIXME("Unhandled layer %#x.\n", format->u.audio.layer); + + IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFAudioFormat_MP3); + IMFMediaType_SetGUID(type, &MF_MT_AM_FORMAT_TYPE, &FORMAT_WaveFormatEx); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_FIXED_SIZE_SAMPLES, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + + return type; +} + static IMFMediaType *mf_media_type_from_wg_format_audio_mpeg4(const struct wg_format *format) { IMFMediaType *type; @@ -697,7 +719,6 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) { switch (format->major_type) { - case WG_MAJOR_TYPE_AUDIO_MPEG1: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_INDEO: case WG_MAJOR_TYPE_VIDEO_MPEG1: @@ -715,6 +736,9 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_VIDEO_H264: return mf_media_type_from_wg_format_h264(format); + case WG_MAJOR_TYPE_AUDIO_MPEG1: + return mf_media_type_from_wg_format_audio_mpeg1(format); + case WG_MAJOR_TYPE_AUDIO_MPEG4: return mf_media_type_from_wg_format_audio_mpeg4(format);

1 0

Elizabeth Figura : winegstreamer: Implement WMV to IMFMediaType conversion.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 1eb60c34c3d032de4ec1c090d9390b1775c35e6a URL: https://gitlab.winehq.org/wine/wine/-/commit/1eb60c34c3d032de4ec1c090d9390b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 18:44:04 2024 -0500 winegstreamer: Implement WMV to IMFMediaType conversion. --- dlls/winegstreamer/mfplat.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 9ba1271afc5..0c21f8b7d82 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -630,6 +630,38 @@ static IMFMediaType *mf_media_type_from_wg_format_h264(const struct wg_format *f return type; } +static IMFMediaType *mf_media_type_from_wg_format_wmv(const struct wg_format *format) +{ + IMFMediaType *type; + + if (FAILED(MFCreateMediaType(&type))) + return NULL; + + IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + + if (format->u.video.format == WG_VIDEO_FORMAT_WMV1) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_WMV1); + else if (format->u.video.format == WG_VIDEO_FORMAT_WMV2) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_WMV2); + else if (format->u.video.format == WG_VIDEO_FORMAT_WMV3) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_WMV3); + else if (format->u.video.format == WG_VIDEO_FORMAT_WMVA) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_WMVA); + else if (format->u.video.format == WG_VIDEO_FORMAT_WVC1) + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MEDIASUBTYPE_WVC1); + else + FIXME("Unhandled format %#x.\n", format->u.video.format); + + IMFMediaType_SetUINT64(type, &MF_MT_FRAME_SIZE, + make_uint64(format->u.video.width, format->u.video.height)); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); + + if (format->u.video.codec_data_len) + IMFMediaType_SetBlob(type, &MF_MT_USER_DATA, format->u.video.codec_data, format->u.video.codec_data_len); + + return type; +} + IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) { switch (format->major_type) @@ -637,7 +669,6 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_AUDIO_MPEG1: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: - case WG_MAJOR_TYPE_VIDEO_WMV: case WG_MAJOR_TYPE_VIDEO_INDEO: case WG_MAJOR_TYPE_VIDEO_MPEG1: FIXME("Format %u not implemented!\n", format->major_type); @@ -656,6 +687,9 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_AUDIO_MPEG4: return mf_media_type_from_wg_format_audio_mpeg4(format); + + case WG_MAJOR_TYPE_VIDEO_WMV: + return mf_media_type_from_wg_format_wmv(format); } assert(0);

1 0

Elizabeth Figura : winegstreamer: Implement AAC to IMFMediaType conversion.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 056b8436e03eaf935b70785810381d8652ba1eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/056b8436e03eaf935b70785810381d… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 18:37:25 2024 -0500 winegstreamer: Implement AAC to IMFMediaType conversion. --- dlls/winegstreamer/mfplat.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 81a0859ac1e..9ba1271afc5 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -586,6 +586,29 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * return NULL; } +static IMFMediaType *mf_media_type_from_wg_format_audio_mpeg4(const struct wg_format *format) +{ + IMFMediaType *type; + + if (FAILED(MFCreateMediaType(&type))) + return NULL; + + IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFAudioFormat_AAC); + IMFMediaType_SetGUID(type, &MF_MT_AM_FORMAT_TYPE, &FORMAT_WaveFormatEx); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, format->u.audio.rate); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); + IMFMediaType_SetUINT32(type, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 0); /* unknown */ + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_FIXED_SIZE_SAMPLES, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetBlob(type, &MF_MT_USER_DATA, format->u.audio.codec_data, format->u.audio.codec_data_len); + + return type; +} + static IMFMediaType *mf_media_type_from_wg_format_h264(const struct wg_format *format) { IMFMediaType *type; @@ -612,7 +635,6 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) switch (format->major_type) { case WG_MAJOR_TYPE_AUDIO_MPEG1: - case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_WMV: @@ -631,6 +653,9 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_VIDEO_H264: return mf_media_type_from_wg_format_h264(format); + + case WG_MAJOR_TYPE_AUDIO_MPEG4: + return mf_media_type_from_wg_format_audio_mpeg4(format); } assert(0);

1 0

Elizabeth Figura : winegstreamer: Implement H.264 to wg_format conversion.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 6c541e38374799c7aac47a1a5408e186d282c541 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c541e38374799c7aac47a1a5408e1… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 21:20:13 2024 -0500 winegstreamer: Implement H.264 to wg_format conversion. --- dlls/winegstreamer/wg_format.c | 121 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 83348b0341a..e9eb2734b9c 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -446,6 +446,123 @@ static void wg_format_from_caps_video_mpeg1(struct wg_format *format, const GstC format->u.video.fps_d = fps_d; } +static const struct +{ + enum eAVEncH264VLevel level; + const char *string; +} +h264_levels[] = +{ + {eAVEncH264VLevel1, "1"}, + {eAVEncH264VLevel1_1, "1.1"}, + {eAVEncH264VLevel1_2, "1.2"}, + {eAVEncH264VLevel1_3, "1.3"}, + {eAVEncH264VLevel2, "2"}, + {eAVEncH264VLevel2_1, "2.1"}, + {eAVEncH264VLevel2_2, "2.2"}, + {eAVEncH264VLevel3, "3"}, + {eAVEncH264VLevel3_1, "3.1"}, + {eAVEncH264VLevel3_2, "3.2"}, + {eAVEncH264VLevel4, "4"}, + {eAVEncH264VLevel4_1, "4.1"}, + {eAVEncH264VLevel4_2, "4.2"}, + {eAVEncH264VLevel5, "5"}, + {eAVEncH264VLevel5_1, "5.1"}, + {eAVEncH264VLevel5_2, "5.2"}, +}; + +static enum eAVEncH264VLevel level_from_string(const char *string) +{ + for (unsigned int i = 0; i < ARRAY_SIZE(h264_levels); ++i) + { + if (!strcmp(h264_levels[i].string, string)) + return h264_levels[i].level; + } + + GST_FIXME("Unrecognized level %s.\n", string); + return eAVEncH264VLevel1; +} + +static void wg_format_from_caps_video_h264(struct wg_format *format, const GstCaps *caps) +{ + const GstStructure *structure = gst_caps_get_structure(caps, 0); + const gchar *stream_format, *profile, *level; + gint width, height, fps_n, fps_d; + const GValue *codec_data_value; + GstBuffer *codec_data; + GstMapInfo map; + + if (!(stream_format = gst_structure_get_string(structure, "stream-format"))) + { + GST_WARNING("Missing \"stream-format\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + + /* Windows requires byte-stream format. */ + if (strcmp(stream_format, "byte-stream")) + { + GST_DEBUG("Rejecting stream format %s.\n", stream_format); + return; + } + + if (!gst_structure_get_int(structure, "width", &width)) + { + GST_WARNING("Missing \"width\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + if (!gst_structure_get_int(structure, "height", &height)) + { + GST_WARNING("Missing \"height\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + if (!gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d)) + { + fps_n = 0; + fps_d = 1; + } + if (!(profile = gst_structure_get_string(structure, "profile"))) + { + GST_WARNING("Missing \"profile\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + if (!(level = gst_structure_get_string(structure, "level"))) + { + GST_WARNING("Missing \"level\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + + format->major_type = WG_MAJOR_TYPE_VIDEO_H264; + format->u.video.width = width; + format->u.video.height = height; + format->u.video.fps_n = fps_n; + format->u.video.fps_d = fps_d; + + if (!strcmp(profile, "high")) + format->u.video.profile = eAVEncH264VProfile_High; + else if (!strcmp(profile, "high-4:4:4")) + format->u.video.profile = eAVEncH264VProfile_444; + else if (!strcmp(profile, "main")) + format->u.video.profile = eAVEncH264VProfile_Main; + else + GST_FIXME("Unhandled profile %s.\n", profile); + + format->u.video.level = level_from_string(level); + + if ((codec_data_value = gst_structure_get_value(structure, "streamheader")) + && (codec_data = gst_value_get_buffer(codec_data_value))) + { + gst_buffer_map(codec_data, &map, GST_MAP_READ); + if (map.size <= sizeof(format->u.video.codec_data)) + { + format->u.video.codec_data_len = map.size; + memcpy(format->u.video.codec_data, map.data, map.size); + } + else + GST_WARNING("Too big codec_data value (%u) in %" GST_PTR_FORMAT ".", (UINT)map.size, caps); + gst_buffer_unmap(codec_data, &map); + } +} + void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); @@ -497,6 +614,10 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { wg_format_from_caps_video_mpeg1(format, caps); } + else if (!strcmp(name, "video/x-h264")) + { + wg_format_from_caps_video_h264(format, caps); + } else { GST_FIXME("Unhandled caps %" GST_PTR_FORMAT ".", caps);

1 0

Elizabeth Figura : winegstreamer: Check the version before calling wg_format_from_caps_video_mpeg1().
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 92956ae554dca4b8ec683436c75c817332fba884 URL: https://gitlab.winehq.org/wine/wine/-/commit/92956ae554dca4b8ec683436c75c81… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 21:18:24 2024 -0500 winegstreamer: Check the version before calling wg_format_from_caps_video_mpeg1(). --- dlls/winegstreamer/wg_format.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index dac618fd7f5..3e573048c01 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -397,6 +397,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) const GstStructure *structure = gst_caps_get_structure(caps, 0); const char *name = gst_structure_get_name(structure); gboolean parsed; + gint version; memset(format, 0, sizeof(*format)); @@ -430,7 +431,9 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { wg_format_from_caps_video_wmv(format, caps); } - else if (!strcmp(name, "video/mpeg") && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed) + else if (!strcmp(name, "video/mpeg") + && gst_structure_get_int(structure, "mpegversion", &version) && (version == 1 || version == 2) + && gst_structure_get_boolean(structure, "parsed", &parsed) && parsed) { wg_format_from_caps_video_mpeg1(format, caps); }

1 0

Elizabeth Figura : winegstreamer: Implement MPEG-4 audio to wg_format conversion.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 2a0a43627b9bf3d2073e06322d651a827af64cc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a0a43627b9bf3d2073e06322d651a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 15 21:18:03 2024 -0500 winegstreamer: Implement MPEG-4 audio to wg_format conversion. --- dlls/winegstreamer/wg_format.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 3e573048c01..83348b0341a 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -203,6 +203,60 @@ static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstC format->u.audio.rate = rate; } +static void wg_format_from_caps_audio_mpeg4(struct wg_format *format, const GstCaps *caps) +{ + const GstStructure *structure = gst_caps_get_structure(caps, 0); + const GValue *codec_data_value; + const gchar *stream_format; + GstBuffer *codec_data; + gint channels, rate; + GstMapInfo map; + + if (!gst_structure_get_int(structure, "channels", &channels)) + { + GST_WARNING("Missing \"channels\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + if (!gst_structure_get_int(structure, "rate", &rate)) + { + GST_WARNING("Missing \"rate\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + if (!(codec_data_value = gst_structure_get_value(structure, "codec_data")) + || !(codec_data = gst_value_get_buffer(codec_data_value))) + { + GST_WARNING("Missing \"codec_data\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + if (!(stream_format = gst_structure_get_string(structure, "stream-format"))) + { + GST_WARNING("Missing \"stream-format\" value in %" GST_PTR_FORMAT ".", caps); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG4; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + if (!strcmp(stream_format, "raw")) + format->u.audio.payload_type = 0; + else if (!strcmp(stream_format, "adts")) + format->u.audio.payload_type = 1; + else if (!strcmp(stream_format, "adif")) + format->u.audio.payload_type = 2; + else if (!strcmp(stream_format, "loas")) + format->u.audio.payload_type = 3; + + gst_buffer_map(codec_data, &map, GST_MAP_READ); + if (map.size <= sizeof(format->u.audio.codec_data)) + { + format->u.audio.codec_data_len = map.size; + memcpy(format->u.audio.codec_data, map.data, map.size); + } + else + GST_WARNING("Too big codec_data value (%u) in %" GST_PTR_FORMAT ".", (UINT)map.size, caps); + gst_buffer_unmap(codec_data, &map); +} + static void wg_format_from_caps_audio_wma(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); @@ -419,6 +473,12 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { wg_format_from_caps_audio_mpeg1(format, caps); } + else if (!strcmp(name, "audio/mpeg") + && gst_structure_get_int(structure, "mpegversion", &version) && version == 4 + && gst_structure_get_boolean(structure, "framed", &parsed) && parsed) + { + wg_format_from_caps_audio_mpeg4(format, caps); + } else if (!strcmp(name, "audio/x-wma")) { wg_format_from_caps_audio_wma(format, caps);

1 0