oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

audio_format: changed "bits" to "enum sample_format"

Browse Source 
This patch prepares support for floating point samples (and probably
other formats).  It changes the meaning of the "bits" attribute from a
bit count to a symbolic value.
This commit is contained in:
Max Kellermann
2009-11-10 17:11:34 +01:00
parent 68c2cfbb40
commit c412d6251e
50 changed files with 512 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pcm_mix.c
View File

@@ -103,18 +103,18 @@ pcm_add(void *buffer1, const void *buffer2, size_t size,
int vol1, int vol2,
const struct audio_format *format)
{
switch (format->bits) {
case 8:
switch (format->format) {
case SAMPLE_FORMAT_S8:
pcm_add_8((int8_t *)buffer1, (const int8_t *)buffer2,
size, vol1, vol2);
break;
case 16:
case SAMPLE_FORMAT_S16:
pcm_add_16((int16_t *)buffer1, (const int16_t *)buffer2,
size / 2, vol1, vol2);
break;
case 24:
case SAMPLE_FORMAT_S24_P32:
pcm_add_24((int32_t*)buffer1,
(const int32_t*)buffer2,
size / 4, vol1, vol2);
@@ -127,7 +127,8 @@ pcm_add(void *buffer1, const void *buffer2, size_t size,
break;
default:
g_error("%u bits not supported by pcm_add!\n", format->bits);
g_error("format %s not supported by pcm_add",
sample_format_to_string(format->format));
}
}