pcm_mix: return bool, make unimplemented format non-fatal

Let the caller deal with a failure.

3 files changed, 43 insertions, 28 deletions

diff --git a/src/output_thread.c b/src/output_thread.c
index e6b815ce0..02c315af9 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -401,8 +401,12 @@ ao_filter_chunk(struct audio_output *ao, const struct music_chunk *chunk,
 		char *dest = pcm_buffer_get(&ao->cross_fade_buffer,
 					    other_length);
 		memcpy(dest, other_data, other_length);
-		pcm_mix(dest, data, length, ao->in_audio_format.format,
-			1.0 - chunk->mix_ratio);
+		if (!pcm_mix(dest, data, length, ao->in_audio_format.format,
+			     1.0 - chunk->mix_ratio)) {
+			g_warning("Cannot cross-fade format %s",
+				  sample_format_to_string(ao->in_audio_format.format));
+			return NULL;
+		}
 
 		data = dest;
 		length = other_length;
diff --git a/src/pcm_mix.c b/src/pcm_mix.c
index b1b4f4f2b..ef81f44a4 100644
--- a/src/pcm_mix.c
+++ b/src/pcm_mix.c
@@ -22,7 +22,6 @@
 #include "pcm_volume.h"
 #include "pcm_utils.h"
 #include "audio_format.h"
-#include "mpd_error.h"
 
 #include <glib.h>
 
@@ -99,36 +98,41 @@ pcm_add_vol_32(int32_t *buffer1, const int32_t *buffer2,
 	}
 }
 
-static void
+static bool
 pcm_add_vol(void *buffer1, const void *buffer2, size_t size,
 	    int vol1, int vol2,
 	    enum sample_format format)
 {
 	switch (format) {
+	case SAMPLE_FORMAT_UNDEFINED:
+	case SAMPLE_FORMAT_S24:
+		/* not implemented */
+		return false;
+
 	case SAMPLE_FORMAT_S8:
 		pcm_add_vol_8((int8_t *)buffer1, (const int8_t *)buffer2,
 			      size, vol1, vol2);
-		break;
+		return true;
 
 	case SAMPLE_FORMAT_S16:
 		pcm_add_vol_16((int16_t *)buffer1, (const int16_t *)buffer2,
 			       size / 2, vol1, vol2);
-		break;
+		return true;
 
 	case SAMPLE_FORMAT_S24_P32:
 		pcm_add_vol_24((int32_t *)buffer1, (const int32_t *)buffer2,
 			       size / 4, vol1, vol2);
-		break;
+		return true;
 
 	case SAMPLE_FORMAT_S32:
 		pcm_add_vol_32((int32_t *)buffer1, (const int32_t *)buffer2,
 			       size / 4, vol1, vol2);
-		break;
-
-	default:
-		MPD_ERROR("format %s not supported by pcm_add_vol",
-			  sample_format_to_string(format));
+		return true;
 	}
+
+	/* unreachable */
+	assert(false);
+	return false;
 }
 
 static void
@@ -187,34 +191,39 @@ pcm_add_32(int32_t *buffer1, const int32_t *buffer2, unsigned num_samples)
 	}
 }
 
-static void
+static bool
 pcm_add(void *buffer1, const void *buffer2, size_t size,
 	enum sample_format format)
 {
 	switch (format) {
+	case SAMPLE_FORMAT_UNDEFINED:
+	case SAMPLE_FORMAT_S24:
+		/* not implemented */
+		return false;
+
 	case SAMPLE_FORMAT_S8:
 		pcm_add_8((int8_t *)buffer1, (const int8_t *)buffer2, size);
-		break;
+		return true;
 
 	case SAMPLE_FORMAT_S16:
 		pcm_add_16((int16_t *)buffer1, (const int16_t *)buffer2, size / 2);
-		break;
+		return true;
 
 	case SAMPLE_FORMAT_S24_P32:
 		pcm_add_24((int32_t *)buffer1, (const int32_t *)buffer2, size / 4);
-		break;
+		return true;
 
 	case SAMPLE_FORMAT_S32:
 		pcm_add_32((int32_t *)buffer1, (const int32_t *)buffer2, size / 4);
-		break;
-
-	default:
-		MPD_ERROR("format %s not supported by pcm_add",
-			  sample_format_to_string(format));
+		return true;
 	}
+
+	/* unreachable */
+	assert(false);
+	return false;
 }
 
-void
+bool
 pcm_mix(void *buffer1, const void *buffer2, size_t size,
 	enum sample_format format, float portion1)
 {
@@ -223,10 +232,8 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
 
 	/* portion1 is between 0.0 and 1.0 for crossfading, MixRamp uses NaN
 	 * to signal mixing rather than fading */
-	if (isnan(portion1)) {
-		pcm_add(buffer1, buffer2, size, format);
-		return;
-	}
+	if (isnan(portion1))
+		return pcm_add(buffer1, buffer2, size, format);
 
 	s = sin(M_PI_2 * portion1);
 	s *= s;
@@ -234,5 +241,5 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
 	vol1 = s * PCM_VOLUME_1 + 0.5;
 	vol1 = vol1 > PCM_VOLUME_1 ? PCM_VOLUME_1 : (vol1 < 0 ? 0 : vol1);
 
-	pcm_add_vol(buffer1, buffer2, size, vol1, PCM_VOLUME_1 - vol1, format);
+	return pcm_add_vol(buffer1, buffer2, size, vol1, PCM_VOLUME_1 - vol1, format);
 }
diff --git a/src/pcm_mix.h b/src/pcm_mix.h
index 10a07168f..0e58d01ee 100644
--- a/src/pcm_mix.h
+++ b/src/pcm_mix.h
@@ -22,6 +22,7 @@
 
 #include "audio_format.h"
 
+#include <stdbool.h>
 #include <stddef.h>
 
 /*
@@ -37,8 +38,11 @@
  * @param portion1 a number between 0.0 and 1.0 specifying the portion
  * of the first buffer in the mix; portion2 = (1.0 - portion1). The value
  * NaN is used by the MixRamp code to specify that simple addition is required.
+ *
+ * @return true on success, false if the format is not supported
  */
-void
+G_GNUC_WARN_UNUSED_RESULT
+bool
 pcm_mix(void *buffer1, const void *buffer2, size_t size,
 	enum sample_format format, float portion1);