diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/crossfade.c | 2 | ||||
| -rw-r--r-- | src/pcm_mix.c | 118 | ||||
| -rw-r--r-- | src/pcm_mix.h | 30 | ||||
| -rw-r--r-- | src/pcm_utils.c | 89 | ||||
| -rw-r--r-- | src/pcm_utils.h | 3 |
6 files changed, 151 insertions, 93 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2c2b14665..c5259b155 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ mpd_headers = \ mapper.h \ pcm_utils.h \ pcm_volume.h \ + pcm_mix.h \ pcm_channels.h \ pcm_resample.h \ pcm_dither.h \ @@ -131,6 +132,7 @@ mpd_SOURCES = \ mapper.c \ pcm_utils.c \ pcm_volume.c \ + pcm_mix.c \ pcm_channels.c \ pcm_resample.c \ pcm_dither.c \ diff --git a/src/crossfade.c b/src/crossfade.c index ac2461689..a21b05fa2 100644 --- a/src/crossfade.c +++ b/src/crossfade.c @@ -19,7 +19,7 @@ #include "crossfade.h" #include "audio.h" -#include "pcm_utils.h" +#include "pcm_mix.h" #include "pipe.h" #include "audio_format.h" #include "tag.h" diff --git a/src/pcm_mix.c b/src/pcm_mix.c new file mode 100644 index 000000000..208805831 --- /dev/null +++ b/src/pcm_mix.c @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "pcm_mix.h" +#include "pcm_volume.h" +#include "pcm_utils.h" +#include "audio_format.h" + +#include <glib.h> + +#include <math.h> + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "pcm" + +static void +pcm_add_8(int8_t *buffer1, const int8_t *buffer2, + unsigned num_samples, int volume1, int volume2) +{ + while (num_samples > 0) { + int32_t sample1 = *buffer1; + int32_t sample2 = *buffer2++; + + sample1 = ((sample1 * volume1 + sample2 * volume2) + + pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1; + + *buffer1++ = pcm_range(sample1, 8); + --num_samples; + } +} + +static void +pcm_add_16(int16_t *buffer1, const int16_t *buffer2, + unsigned num_samples, int volume1, int volume2) +{ + while (num_samples > 0) { + int32_t sample1 = *buffer1; + int32_t sample2 = *buffer2++; + + sample1 = ((sample1 * volume1 + sample2 * volume2) + + pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1; + + *buffer1++ = pcm_range(sample1, 16); + --num_samples; + } +} + +static void +pcm_add_24(int32_t *buffer1, const int32_t *buffer2, + unsigned num_samples, unsigned volume1, unsigned volume2) +{ + while (num_samples > 0) { + int64_t sample1 = *buffer1; + int64_t sample2 = *buffer2++; + + sample1 = ((sample1 * volume1 + sample2 * volume2) + + pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1; + + *buffer1++ = pcm_range(sample1, 24); + --num_samples; + } +} + +static void +pcm_add(char *buffer1, const char *buffer2, size_t size, + int vol1, int vol2, + const struct audio_format *format) +{ + switch (format->bits) { + case 8: + pcm_add_8((int8_t *)buffer1, (const int8_t *)buffer2, + size, vol1, vol2); + break; + + case 16: + pcm_add_16((int16_t *)buffer1, (const int16_t *)buffer2, + size / 2, vol1, vol2); + break; + + case 24: + pcm_add_24((int32_t*)buffer1, + (const int32_t*)buffer2, + size / 4, vol1, vol2); + break; + + default: + g_error("%u bits not supported by pcm_add!\n", format->bits); + } +} + +void +pcm_mix(char *buffer1, const char *buffer2, size_t size, + const struct audio_format *format, float portion1) +{ + int vol1; + float s = sin(M_PI_2 * portion1); + s *= s; + + vol1 = s * PCM_VOLUME_1 + 0.5; + vol1 = vol1 > PCM_VOLUME_1 ? PCM_VOLUME_1 : (vol1 < 0 ? 0 : vol1); + + pcm_add(buffer1, buffer2, size, vol1, PCM_VOLUME_1 - vol1, format); +} diff --git a/src/pcm_mix.h b/src/pcm_mix.h new file mode 100644 index 000000000..cce35dedf --- /dev/null +++ b/src/pcm_mix.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef PCM_MIX_H +#define PCM_MIX_H + +#include <stddef.h> + +struct audio_format; + +void +pcm_mix(char *buffer1, const char *buffer2, size_t size, + const struct audio_format *format, float portion1); + +#endif diff --git a/src/pcm_utils.c b/src/pcm_utils.c index d619c9dd7..fd2786e3a 100644 --- a/src/pcm_utils.c +++ b/src/pcm_utils.c @@ -18,8 +18,6 @@ #include "pcm_utils.h" #include "pcm_channels.h" -#include "pcm_prng.h" -#include "pcm_volume.h" #include "conf.h" #include "audio_format.h" @@ -31,93 +29,6 @@ #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "pcm" -static void -pcm_add_8(int8_t *buffer1, const int8_t *buffer2, - unsigned num_samples, int volume1, int volume2) -{ - while (num_samples > 0) { - int32_t sample1 = *buffer1; - int32_t sample2 = *buffer2++; - - sample1 = ((sample1 * volume1 + sample2 * volume2) + - pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1; - - *buffer1++ = pcm_range(sample1, 8); - --num_samples; - } -} - -static void -pcm_add_16(int16_t *buffer1, const int16_t *buffer2, - unsigned num_samples, int volume1, int volume2) -{ - while (num_samples > 0) { - int32_t sample1 = *buffer1; - int32_t sample2 = *buffer2++; - - sample1 = ((sample1 * volume1 + sample2 * volume2) + - pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1; - - *buffer1++ = pcm_range(sample1, 16); - --num_samples; - } -} - -static void -pcm_add_24(int32_t *buffer1, const int32_t *buffer2, - unsigned num_samples, unsigned volume1, unsigned volume2) -{ - while (num_samples > 0) { - int64_t sample1 = *buffer1; - int64_t sample2 = *buffer2++; - - sample1 = ((sample1 * volume1 + sample2 * volume2) + - pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1; - - *buffer1++ = pcm_range(sample1, 24); - --num_samples; - } -} - -static void pcm_add(char *buffer1, const char *buffer2, size_t size, - int vol1, int vol2, - const struct audio_format *format) -{ - switch (format->bits) { - case 8: - pcm_add_8((int8_t *)buffer1, (const int8_t *)buffer2, - size, vol1, vol2); - break; - - case 16: - pcm_add_16((int16_t *)buffer1, (const int16_t *)buffer2, - size / 2, vol1, vol2); - break; - - case 24: - pcm_add_24((int32_t*)buffer1, - (const int32_t*)buffer2, - size / 4, vol1, vol2); - break; - - default: - g_error("%u bits not supported by pcm_add!\n", format->bits); - } -} - -void pcm_mix(char *buffer1, const char *buffer2, size_t size, - const struct audio_format *format, float portion1) -{ - int vol1; - float s = sin(M_PI_2 * portion1); - s *= s; - - vol1 = s * PCM_VOLUME_1 + 0.5; - vol1 = vol1 > PCM_VOLUME_1 ? PCM_VOLUME_1 : (vol1 < 0 ? 0 : vol1); - - pcm_add(buffer1, buffer2, size, vol1, PCM_VOLUME_1 - vol1, format); -} - void pcm_convert_init(struct pcm_convert_state *state) { memset(state, 0, sizeof(*state)); diff --git a/src/pcm_utils.h b/src/pcm_utils.h index 61262048f..5d29420f3 100644 --- a/src/pcm_utils.h +++ b/src/pcm_utils.h @@ -52,9 +52,6 @@ pcm_range(int32_t sample, unsigned bits) return sample; } -void pcm_mix(char *buffer1, const char *buffer2, size_t size, - const struct audio_format *format, float portion1); - void pcm_convert_init(struct pcm_convert_state *state); size_t pcm_convert(const struct audio_format *inFormat, |