Commit 9aefdbb9 authored by Alexandre Julliard's avatar Alexandre Julliard

faudio: Import upstream release 23.12.

parent c0f500ba
...@@ -494,7 +494,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; ...@@ -494,7 +494,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT;
#define FAUDIO_ABI_VERSION 0 #define FAUDIO_ABI_VERSION 0
#define FAUDIO_MAJOR_VERSION 23 #define FAUDIO_MAJOR_VERSION 23
#define FAUDIO_MINOR_VERSION 10 #define FAUDIO_MINOR_VERSION 12
#define FAUDIO_PATCH_VERSION 0 #define FAUDIO_PATCH_VERSION 0
#define FAUDIO_COMPILED_VERSION ( \ #define FAUDIO_COMPILED_VERSION ( \
......
...@@ -294,7 +294,8 @@ uint32_t FAudio_CreateSourceVoice( ...@@ -294,7 +294,8 @@ uint32_t FAudio_CreateSourceVoice(
if ( pSourceFormat->wFormatTag == FAUDIO_FORMAT_PCM || if ( pSourceFormat->wFormatTag == FAUDIO_FORMAT_PCM ||
pSourceFormat->wFormatTag == FAUDIO_FORMAT_IEEE_FLOAT || 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( FAudioWaveFormatExtensible *fmtex = (FAudioWaveFormatExtensible*) audio->pMalloc(
sizeof(FAudioWaveFormatExtensible) sizeof(FAudioWaveFormatExtensible)
...@@ -321,6 +322,10 @@ uint32_t FAudio_CreateSourceVoice( ...@@ -321,6 +322,10 @@ uint32_t FAudio_CreateSourceVoice(
{ {
FAudio_memcpy(&fmtex->SubFormat, &DATAFORMAT_SUBTYPE_WMAUDIO2, sizeof(FAudioGUID)); 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; (*ppSourceVoice)->src.format = &fmtex->Format;
} }
else if (pSourceFormat->wFormatTag == FAUDIO_FORMAT_MSADPCM) else if (pSourceFormat->wFormatTag == FAUDIO_FORMAT_MSADPCM)
......
...@@ -105,6 +105,7 @@ static const char *get_wformattag_string(const FAudioWaveFormatEx *fmt) ...@@ -105,6 +105,7 @@ static const char *get_wformattag_string(const FAudioWaveFormatEx *fmt)
FMT_STRING(IEEE_FLOAT) FMT_STRING(IEEE_FLOAT)
FMT_STRING(XMAUDIO2) FMT_STRING(XMAUDIO2)
FMT_STRING(WMAUDIO2) FMT_STRING(WMAUDIO2)
FMT_STRING(WMAUDIO3)
FMT_STRING(EXTENSIBLE) FMT_STRING(EXTENSIBLE)
#undef FMT_STRING #undef FMT_STRING
return "UNKNOWN!"; return "UNKNOWN!";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment