Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9aefdbb9
Commit
9aefdbb9
authored
Dec 04, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
faudio: Import upstream release 23.12.
parent
c0f500ba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
FAudio.h
libs/faudio/include/FAudio.h
+1
-1
FAudio.c
libs/faudio/src/FAudio.c
+6
-1
FAudio_internal.c
libs/faudio/src/FAudio_internal.c
+1
-0
No files found.
libs/faudio/include/FAudio.h
View file @
9aefdbb9
...
...
@@ -494,7 +494,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT;
#define FAUDIO_ABI_VERSION 0
#define FAUDIO_MAJOR_VERSION 23
#define FAUDIO_MINOR_VERSION 1
0
#define FAUDIO_MINOR_VERSION 1
2
#define FAUDIO_PATCH_VERSION 0
#define FAUDIO_COMPILED_VERSION ( \
...
...
libs/faudio/src/FAudio.c
View file @
9aefdbb9
...
...
@@ -294,7 +294,8 @@ uint32_t FAudio_CreateSourceVoice(
if
(
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_PCM
||
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_IEEE_FLOAT
||
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_WMAUDIO2
)
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_WMAUDIO2
||
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_WMAUDIO3
)
{
FAudioWaveFormatExtensible
*
fmtex
=
(
FAudioWaveFormatExtensible
*
)
audio
->
pMalloc
(
sizeof
(
FAudioWaveFormatExtensible
)
...
...
@@ -321,6 +322,10 @@ uint32_t FAudio_CreateSourceVoice(
{
FAudio_memcpy
(
&
fmtex
->
SubFormat
,
&
DATAFORMAT_SUBTYPE_WMAUDIO2
,
sizeof
(
FAudioGUID
));
}
else
if
(
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_WMAUDIO3
)
{
FAudio_memcpy
(
&
fmtex
->
SubFormat
,
&
DATAFORMAT_SUBTYPE_WMAUDIO3
,
sizeof
(
FAudioGUID
));
}
(
*
ppSourceVoice
)
->
src
.
format
=
&
fmtex
->
Format
;
}
else
if
(
pSourceFormat
->
wFormatTag
==
FAUDIO_FORMAT_MSADPCM
)
...
...
libs/faudio/src/FAudio_internal.c
View file @
9aefdbb9
...
...
@@ -105,6 +105,7 @@ static const char *get_wformattag_string(const FAudioWaveFormatEx *fmt)
FMT_STRING
(
IEEE_FLOAT
)
FMT_STRING
(
XMAUDIO2
)
FMT_STRING
(
WMAUDIO2
)
FMT_STRING
(
WMAUDIO3
)
FMT_STRING
(
EXTENSIBLE
)
#undef FMT_STRING
return
"UNKNOWN!"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment