aboutsummaryrefslogtreecommitdiff
path: root/audio/audio_win_int.c
diff options
context:
space:
mode:
authorVolker RĂ¼melin <vr_qemu@t-online.de>2021-01-10 11:02:38 +0100
committerGerd Hoffmann <kraxel@redhat.com>2021-01-15 11:25:22 +0100
commit1157506161e4dcee5a8681618b3b3e41f759b323 (patch)
tree8f10fb2ba574efcec200d8051fea9c3d92d29c16 /audio/audio_win_int.c
parent3c18e43179c2b8c56236bd34e990e7facf21a7b4 (diff)
downloadqemu-1157506161e4dcee5a8681618b3b3e41f759b323.zip
qemu-1157506161e4dcee5a8681618b3b3e41f759b323.tar.gz
qemu-1157506161e4dcee5a8681618b3b3e41f759b323.tar.bz2
dsoundaudio: enable f32 audio sample format
Enable the f32 audio sample format for the DirectSound backend. Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de> Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de Message-Id: <20210110100239.27588-22-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio/audio_win_int.c')
-rw-r--r--audio/audio_win_int.c71
1 files changed, 47 insertions, 24 deletions
diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index b938fd6..b7db349 100644
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -5,6 +5,7 @@
#define AUDIO_CAP "win-int"
#include <windows.h>
+#include <mmreg.h>
#include <mmsystem.h>
#include "audio.h"
@@ -16,7 +17,6 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx,
{
memset (wfx, 0, sizeof (*wfx));
- wfx->wFormatTag = WAVE_FORMAT_PCM;
wfx->nChannels = as->nchannels;
wfx->nSamplesPerSec = as->freq;
wfx->nAvgBytesPerSec = as->freq << (as->nchannels == 2);
@@ -26,11 +26,13 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx,
switch (as->fmt) {
case AUDIO_FORMAT_S8:
case AUDIO_FORMAT_U8:
+ wfx->wFormatTag = WAVE_FORMAT_PCM;
wfx->wBitsPerSample = 8;
break;
case AUDIO_FORMAT_S16:
case AUDIO_FORMAT_U16:
+ wfx->wFormatTag = WAVE_FORMAT_PCM;
wfx->wBitsPerSample = 16;
wfx->nAvgBytesPerSec <<= 1;
wfx->nBlockAlign <<= 1;
@@ -38,6 +40,14 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx,
case AUDIO_FORMAT_S32:
case AUDIO_FORMAT_U32:
+ wfx->wFormatTag = WAVE_FORMAT_PCM;
+ wfx->wBitsPerSample = 32;
+ wfx->nAvgBytesPerSec <<= 2;
+ wfx->nBlockAlign <<= 2;
+ break;
+
+ case AUDIO_FORMAT_F32:
+ wfx->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
wfx->wBitsPerSample = 32;
wfx->nAvgBytesPerSec <<= 2;
wfx->nBlockAlign <<= 2;
@@ -54,12 +64,6 @@ int waveformat_from_audio_settings (WAVEFORMATEX *wfx,
int waveformat_to_audio_settings (WAVEFORMATEX *wfx,
struct audsettings *as)
{
- if (wfx->wFormatTag != WAVE_FORMAT_PCM) {
- dolog ("Invalid wave format, tag is not PCM, but %d\n",
- wfx->wFormatTag);
- return -1;
- }
-
if (!wfx->nSamplesPerSec) {
dolog ("Invalid wave format, frequency is zero\n");
return -1;
@@ -83,23 +87,42 @@ int waveformat_to_audio_settings (WAVEFORMATEX *wfx,
return -1;
}
- switch (wfx->wBitsPerSample) {
- case 8:
- as->fmt = AUDIO_FORMAT_U8;
- break;
-
- case 16:
- as->fmt = AUDIO_FORMAT_S16;
- break;
-
- case 32:
- as->fmt = AUDIO_FORMAT_S32;
- break;
-
- default:
- dolog ("Invalid wave format, bits per sample is not "
- "8, 16 or 32, but %d\n",
- wfx->wBitsPerSample);
+ if (wfx->wFormatTag == WAVE_FORMAT_PCM) {
+ switch (wfx->wBitsPerSample) {
+ case 8:
+ as->fmt = AUDIO_FORMAT_U8;
+ break;
+
+ case 16:
+ as->fmt = AUDIO_FORMAT_S16;
+ break;
+
+ case 32:
+ as->fmt = AUDIO_FORMAT_S32;
+ break;
+
+ default:
+ dolog("Invalid PCM wave format, bits per sample is not "
+ "8, 16 or 32, but %d\n",
+ wfx->wBitsPerSample);
+ return -1;
+ }
+ } else if (wfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) {
+ switch (wfx->wBitsPerSample) {
+ case 32:
+ as->fmt = AUDIO_FORMAT_F32;
+ break;
+
+ default:
+ dolog("Invalid IEEE_FLOAT wave format, bits per sample is not "
+ "32, but %d\n",
+ wfx->wBitsPerSample);
+ return -1;
+ }
+ } else {
+ dolog("Invalid wave format, tag is not PCM and not IEEE_FLOAT, "
+ "but %d\n",
+ wfx->wFormatTag);
return -1;
}