[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: Win32: Fix build issues.
PulseAudio Marge Bot
gitlab at gitlab.freedesktop.org
Wed Mar 24 00:46:21 UTC 2021
PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits:
e12ba8ea by Edward Lee at 2021-03-23T13:12:18-04:00
Win32: Fix build issues.
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/359>
- - - - -
169f8c5f by Edward Lee at 2021-03-23T13:12:38-04:00
Win32: Use WAVEFORMATEX for multi-channel audio output on Windows.
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/359>
- - - - -
5 changed files:
- src/modules/module-waveout.c
- src/pulse/channelmap.c
- src/pulsecore/arpa-inet.c
- src/pulsecore/arpa-inet.h
- src/pulsecore/poll.h
Changes:
=====================================
src/modules/module-waveout.c
=====================================
@@ -24,6 +24,7 @@
#include <windows.h>
#include <mmsystem.h>
+#include <mmreg.h>
#include <string.h>
#include <pulse/xmalloc.h>
@@ -458,31 +459,96 @@ static void sink_set_volume_cb(pa_sink *s) {
return;
}
-static int ss_to_waveformat(pa_sample_spec *ss, LPWAVEFORMATEX wf) {
- wf->wFormatTag = WAVE_FORMAT_PCM;
-
- if (ss->channels > 2) {
- pa_log_error("More than two channels not supported.");
- return -1;
+static DWORD channel_position_to_wavefmt(pa_channel_position_t channel) {
+ switch(channel) {
+ case PA_CHANNEL_POSITION_MONO:
+ case PA_CHANNEL_POSITION_FRONT_LEFT:
+ return SPEAKER_FRONT_LEFT;
+ case PA_CHANNEL_POSITION_FRONT_RIGHT:
+ return SPEAKER_FRONT_RIGHT;
+ case PA_CHANNEL_POSITION_FRONT_CENTER:
+ return SPEAKER_FRONT_CENTER;
+
+ case PA_CHANNEL_POSITION_REAR_LEFT:
+ return SPEAKER_BACK_LEFT;
+ case PA_CHANNEL_POSITION_REAR_RIGHT:
+ return SPEAKER_BACK_RIGHT;
+ case PA_CHANNEL_POSITION_REAR_CENTER:
+ return SPEAKER_BACK_CENTER;
+
+ case PA_CHANNEL_POSITION_LFE:
+ return SPEAKER_LOW_FREQUENCY;
+
+ case PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER:
+ return SPEAKER_FRONT_LEFT_OF_CENTER;
+ case PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER:
+ return SPEAKER_FRONT_RIGHT_OF_CENTER;
+
+ case PA_CHANNEL_POSITION_SIDE_LEFT:
+ return SPEAKER_SIDE_LEFT;
+ case PA_CHANNEL_POSITION_SIDE_RIGHT:
+ return SPEAKER_SIDE_RIGHT;
+
+ case PA_CHANNEL_POSITION_TOP_CENTER:
+ return SPEAKER_TOP_CENTER;
+
+ case PA_CHANNEL_POSITION_TOP_FRONT_LEFT:
+ return SPEAKER_TOP_FRONT_LEFT;
+ case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT:
+ return SPEAKER_TOP_FRONT_RIGHT;
+ case PA_CHANNEL_POSITION_TOP_FRONT_CENTER:
+ return SPEAKER_TOP_FRONT_CENTER;
+
+ case PA_CHANNEL_POSITION_TOP_REAR_LEFT:
+ return SPEAKER_TOP_BACK_LEFT;
+ case PA_CHANNEL_POSITION_TOP_REAR_RIGHT:
+ return SPEAKER_TOP_BACK_RIGHT;
+ case PA_CHANNEL_POSITION_TOP_REAR_CENTER:
+ return SPEAKER_TOP_BACK_CENTER;
+
+ default:
+ return 0;
}
+}
- wf->nChannels = ss->channels;
+static int ss_to_waveformat(pa_sample_spec *ss, pa_channel_map *map, PWAVEFORMATEXTENSIBLE wf) {
+ wf->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+ wf->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
- wf->nSamplesPerSec = ss->rate;
+ wf->Format.nChannels = ss->channels;
+ wf->Format.nSamplesPerSec = ss->rate;
- if (ss->format == PA_SAMPLE_U8)
- wf->wBitsPerSample = 8;
- else if (ss->format == PA_SAMPLE_S16NE)
- wf->wBitsPerSample = 16;
- else {
- pa_log_error("Unsupported sample format, only u8 and s16 are supported.");
+ wf->dwChannelMask = 0;
+ for (int i = 0; i < map->channels; i++) {
+ DWORD thisSpeaker = channel_position_to_wavefmt(map->map[i]);
+ if (thisSpeaker == 0 || (wf->dwChannelMask & thisSpeaker)) {
+ pa_log_error("Invalid channel map: unknown or duplicated channel %d.", map->map[i]);
+ return -1;
+ }
+ wf->dwChannelMask |= thisSpeaker;
+ }
+
+ if (ss->format == PA_SAMPLE_U8) {
+ wf->Format.wBitsPerSample = 8;
+ wf->Samples.wValidBitsPerSample = 8;
+ } else if (ss->format == PA_SAMPLE_S16LE) {
+ wf->Format.wBitsPerSample = 16;
+ wf->Samples.wValidBitsPerSample = 16;
+ } else if (ss->format == PA_SAMPLE_S24LE) {
+ wf->Format.wBitsPerSample = 24;
+ wf->Samples.wValidBitsPerSample = 24;
+ } else if (ss->format == PA_SAMPLE_S32LE) {
+ wf->Format.wBitsPerSample = 32;
+ wf->Samples.wValidBitsPerSample = 32;
+ } else {
+ pa_log_error("Unsupported sample format, only u8, s16le, s24le, and s32le are supported.");
return -1;
}
- wf->nBlockAlign = wf->nChannels * wf->wBitsPerSample/8;
- wf->nAvgBytesPerSec = wf->nSamplesPerSec * wf->nBlockAlign;
+ wf->Format.nBlockAlign = wf->Format.nChannels * wf->Format.wBitsPerSample/8;
+ wf->Format.nAvgBytesPerSec = wf->Format.nSamplesPerSec * wf->Format.nBlockAlign;
- wf->cbSize = 0;
+ wf->Format.cbSize = 22;
return 0;
}
@@ -501,7 +567,7 @@ int pa__init(pa_module *m) {
struct userdata *u = NULL;
HWAVEOUT hwo = INVALID_HANDLE_VALUE;
HWAVEIN hwi = INVALID_HANDLE_VALUE;
- WAVEFORMATEX wf;
+ WAVEFORMATEXTENSIBLE wf;
WAVEOUTCAPS pwoc;
WAVEINCAPS pwic;
MMRESULT result;
@@ -606,7 +672,7 @@ int pa__init(pa_module *m) {
goto fail;
}
- if (ss_to_waveformat(&ss, &wf) < 0)
+ if (ss_to_waveformat(&ss, &map, &wf) < 0)
goto fail;
u = pa_xmalloc(sizeof(struct userdata));
@@ -615,7 +681,7 @@ int pa__init(pa_module *m) {
result = waveInOpen(&hwi, input_device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY);
if (result != MMSYSERR_NOERROR) {
pa_log_warn("Sample spec not supported by WaveIn, falling back to default sample rate.");
- ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate;
+ ss.rate = wf.Format.nSamplesPerSec = m->core->default_sample_spec.rate;
}
result = waveInOpen(&hwi, input_device, &wf, (DWORD_PTR) chunk_ready_cb, (DWORD_PTR) u, CALLBACK_FUNCTION);
if (result != MMSYSERR_NOERROR) {
@@ -635,7 +701,7 @@ int pa__init(pa_module *m) {
result = waveOutOpen(&hwo, output_device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY);
if (result != MMSYSERR_NOERROR) {
pa_log_warn("Sample spec not supported by WaveOut, falling back to default sample rate.");
- ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate;
+ ss.rate = wf.Format.nSamplesPerSec = m->core->default_sample_spec.rate;
}
result = waveOutOpen(&hwo, output_device, &wf, (DWORD_PTR) chunk_done_cb, (DWORD_PTR) u, CALLBACK_FUNCTION);
if (result != MMSYSERR_NOERROR) {
=====================================
src/pulse/channelmap.c
=====================================
@@ -296,8 +296,7 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
case PA_CHANNEL_MAP_WAVEEX:
- /* Following http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EKLAC */
-
+ /* following: https://docs.microsoft.com/en-us/previous-versions/windows/hardware/design/dn653308(v=vs.85) */
switch (channels) {
case 1:
m->map[0] = PA_CHANNEL_POSITION_MONO;
=====================================
src/pulsecore/arpa-inet.c
=====================================
@@ -21,7 +21,7 @@
#include <config.h>
#endif
-#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) && NTDDI_VERSION < NTDDI_VISTA
+#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) && (_WIN32_WINNT <= 0x0600)
#include <errno.h>
=====================================
src/pulsecore/arpa-inet.h
=====================================
@@ -12,7 +12,7 @@
#include <pulsecore/socket.h>
-#if NTDDI_VERSION < NTDDI_VISTA
+#if (_WIN32_WINNT <= 0x0600)
const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
=====================================
src/pulsecore/poll.h
=====================================
@@ -24,7 +24,7 @@
#if defined(HAVE_POLL_H)
#include <poll.h>
-#elif OS_IS_WIN32 && HAVE_WINSOCK2_H && NTDDI_VERSION >= NTDDI_VISTA
+#elif OS_IS_WIN32 && HAVE_WINSOCK2_H && (_WIN32_WINNT >= 0x0600)
#include <winsock2.h>
#else
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/8db4dff2c5caffb1e30548e095b98c27aeb68f89...169f8c5f2cf5d2aec735843d17818968ab7ebb2a
--
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/8db4dff2c5caffb1e30548e095b98c27aeb68f89...169f8c5f2cf5d2aec735843d17818968ab7ebb2a
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20210324/eebecfe3/attachment-0001.htm>
More information about the pulseaudio-commits
mailing list