output/openal: force 16 bit playback, as 8 bit doesn't work

The OpenAL specification says that AL_FORMAT_MONO8 and AL_FORMAT_STEREO8 expect unsigned 8 bit samples, but MPD uses unsigned samples.

output/openal: force 16 bit playback, as 8 bit doesn't work
96ad5b84 · Max Kellermann · 097e5dfb · 96ad5b84 · 96ad5b84
Commit 96ad5b84 authored Dec 13, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 10 deletions

NEWS NEWS +1 -0

openal_plugin.c src/output/openal_plugin.c +4 -10

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.16.7 (2011/??/??)
 * output:
  - httpd: fix excessive buffering
+  - openal: force 16 bit playback, as 8 bit doesn't work


 ver 0.16.6 (2011/12/01)

--- a/src/output/openal_plugin.c
+++ b/src/output/openal_plugin.c
@@ -58,6 +58,10 @@ openal_output_quark(void)
 static ALenum
 openal_audio_format(struct audio_format *audio_format)
 {
+	/* note: cannot map SAMPLE_FORMAT_S8 to AL_FORMAT_STEREO8 or
+	   AL_FORMAT_MONO8 since OpenAL expects unsigned 8 bit
+	   samples, while MPD uses signed samples */
+
 	switch (audio_format->format) {
 	case SAMPLE_FORMAT_S16:
 		if (audio_format->channels == 2)
@@ -69,16 +73,6 @@ openal_audio_format(struct audio_format *audio_format)
 		audio_format->channels = 1;
 		return openal_audio_format(audio_format);

-	case SAMPLE_FORMAT_S8:
-		if (audio_format->channels == 2)
-			return AL_FORMAT_STEREO8;
-		if (audio_format->channels == 1)
-			return AL_FORMAT_MONO8;
-
-		/* fall back to mono */
-		audio_format->channels = 1;
-		return openal_audio_format(audio_format);
-
 	default:
 		/* fall back to 16 bit */
 		audio_format->format = SAMPLE_FORMAT_S16;