Mercurial > audlegacy
changeset 4281:3c673b6803c1
Remove legacy XMMS format conversion API. We have a new audio engine which does this the correct way.
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Tue, 12 Feb 2008 01:20:32 -0600 |
| parents | 6c97378391b8 |
| children | cfd60a10a6e2 |
| files | src/audacious/Makefile src/audacious/plugin.h src/audacious/volumecontrol.c src/audacious/xconvert.c src/audacious/xconvert.h |
| diffstat | 5 files changed, 2 insertions(+), 914 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/Makefile Mon Feb 11 04:05:26 2008 -0600 +++ b/src/audacious/Makefile Tue Feb 12 01:20:32 2008 -0600 @@ -80,8 +80,7 @@ vfs_common.c \ visualization.c \ volumecontrol.c \ - sync-menu.c \ - xconvert.c + sync-menu.c ifdef USE_DBUS SRCS += dbus.c @@ -117,8 +116,7 @@ util.h \ vfs.h \ vfs_buffer.h \ - vfs_buffered_file.h \ - xconvert.h + vfs_buffered_file.h DATA = images/about-logo.png \ images/appearance.png \
--- a/src/audacious/plugin.h Mon Feb 11 04:05:26 2008 -0600 +++ b/src/audacious/plugin.h Tue Feb 12 01:20:32 2008 -0600 @@ -157,7 +157,6 @@ #include "audacious/mime.h" #include "audacious/custom_uri.h" #include "audacious/hook.h" -#include "audacious/xconvert.h" #include "audacious/ui_plugin_menu.h" #include "audacious/formatter.h" #include "audacious/flow.h" @@ -524,17 +523,6 @@ gint (*hook_dissociate)(const gchar *name, HookFunction func); void (*hook_call)(const gchar *name, gpointer hook_data); - /* xconvert API */ - struct xmms_convert_buffers *(*xmms_convert_buffers_new)(void); - void (*xmms_convert_buffers_free)(struct xmms_convert_buffers *buf); - void (*xmms_convert_buffers_destroy)(struct xmms_convert_buffers *buf); - convert_func_t (*xmms_convert_get_func)(AFormat output, AFormat input); - convert_channel_func_t (*xmms_convert_get_channel_func)(AFormat fmt, - int output, - int input); - convert_freq_func_t (*xmms_convert_get_frequency_func)(AFormat fmt, - int channels); - /* PluginMenu API */ gint (*menu_plugin_item_add)(gint, GtkWidget *); gint (*menu_plugin_item_remove)(gint, GtkWidget *); @@ -883,13 +871,6 @@ #define aud_read_ini_string _audvt->read_ini_string #define aud_read_ini_array _audvt->read_ini_array -#define aud_convert_buffers_new _audvt->xmms_convert_buffers_new -#define aud_convert_buffers_free _audvt->xmms_convert_buffers_free -#define aud_convert_buffers_destroy _audvt->xmms_convert_buffers_destroy -#define aud_convert_get_func _audvt->xmms_convert_get_func -#define aud_convert_get_channel_func _audvt->xmms_convert_get_channel_func -#define aud_convert_get_frequency_func _audvt->xmms_convert_get_frequency_func - #define audacious_menu_plugin_item_add _audvt->menu_plugin_item_add #define audacious_menu_plugin_item_remove _audvt->menu_plugin_item_remove #define aud_menu_plugin_item_add _audvt->menu_plugin_item_add
--- a/src/audacious/volumecontrol.c Mon Feb 11 04:05:26 2008 -0600 +++ b/src/audacious/volumecontrol.c Tue Feb 12 01:20:32 2008 -0600 @@ -30,7 +30,6 @@ #include "configdb.h" #include "effect.h" -#include "xconvert.h" #include "volumecontrol.h"
--- a/src/audacious/xconvert.c Mon Feb 11 04:05:26 2008 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,851 +0,0 @@ -/* Audacious - * Copyright (C) 2005-2007 Audacious team - * - * XMMS - Cross-platform multimedia player - * Copyright (C) 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas, - * Thomas Nilsson and 4Front Technologies - * Copyright (C) 1999-2003 Haavard Kvaalen - * - * 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; under version 3 of the License. - * - * 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, see <http://www.gnu.org/licenses>. - * - * The Audacious team does not consider modular code linking to - * Audacious or using our public API to be a derived work. - */ - -#include "config.h" -#include <stdlib.h> -#include <audacious/plugin.h> -#include "xconvert.h" - -#define IS_BIG_ENDIAN (G_BYTE_ORDER==G_BIG_ENDIAN) - -/** - * buffer: - * - * Contains data for conversion. - * - * @buffer: A pointer to the memory being used in the conversion process. - * @size: The size of the memory being referenced. - **/ -struct buffer { - void *buffer; - int size; -}; - -/** - * xmms_convert_buffers: - * - * Stores data for conversion. - * - * @format_buffer: A buffer for converting formats. - * @stereo_buffer: A buffer for downmixing or upmixing. - * @freq_buffer: A buffer used for resampling. - **/ -struct xmms_convert_buffers { - struct buffer format_buffer, stereo_buffer, freq_buffer; -}; - -/** - * xmms_convert_buffers_new: - * - * Factory for an #xmms_convert_buffers struct. - * - * Return value: An #xmms_convert_buffers struct. - **/ -struct xmms_convert_buffers * -xmms_convert_buffers_new(void) -{ - return g_malloc0(sizeof(struct xmms_convert_buffers)); -} - -/** - * convert_get_buffer: - * @buffer: A buffer to resize. - * @size: The new size for that buffer. - * - * Resizes a conversion buffer. - **/ -static void * -convert_get_buffer(struct buffer *buffer, size_t size) -{ - if (size > 0 && size <= (size_t)buffer->size) - return buffer->buffer; - - buffer->size = size; - buffer->buffer = g_realloc(buffer->buffer, size); - return buffer->buffer; -} - -/** - * xmms_convert_buffers_free: - * @buf: An xmms_convert_buffers structure to free. - * - * Frees the actual buffers contained inside the buffer struct. - **/ -void -xmms_convert_buffers_free(struct xmms_convert_buffers *buf) -{ - convert_get_buffer(&buf->format_buffer, 0); - convert_get_buffer(&buf->stereo_buffer, 0); - convert_get_buffer(&buf->freq_buffer, 0); -} - -/** - * xmms_convert_buffers_destroy: - * @buf: An xmms_convert_buffers structure to destroy. - * - * Destroys an xmms_convert_buffers structure. - **/ -void -xmms_convert_buffers_destroy(struct xmms_convert_buffers *buf) -{ - if (!buf) - return; - xmms_convert_buffers_free(buf); - g_free(buf); -} - -static int -convert_swap_endian(struct xmms_convert_buffers *buf, void **data, int length) -{ - guint16 *ptr = *data; - int i; - for (i = 0; i < length; i += 2, ptr++) - *ptr = GUINT16_SWAP_LE_BE(*ptr); - - return i; -} - -static int -convert_swap_sign_and_endian_to_native(struct - xmms_convert_buffers - *buf, void **data, int length) -{ - guint16 *ptr = *data; - int i; - for (i = 0; i < length; i += 2, ptr++) - *ptr = GUINT16_SWAP_LE_BE(*ptr) ^ 1 << 15; - - return i; -} - -static int -convert_swap_sign_and_endian_to_alien(struct - xmms_convert_buffers *buf, - void **data, int length) -{ - guint16 *ptr = *data; - int i; - for (i = 0; i < length; i += 2, ptr++) - *ptr = GUINT16_SWAP_LE_BE(*ptr ^ 1 << 15); - - return i; -} - -static int -convert_swap_sign16(struct xmms_convert_buffers *buf, void **data, int length) -{ - gint16 *ptr = *data; - int i; - for (i = 0; i < length; i += 2, ptr++) - *ptr ^= 1 << 15; - - return i; -} - -static int -convert_swap_sign8(struct xmms_convert_buffers *buf, void **data, int length) -{ - gint8 *ptr = *data; - int i; - for (i = 0; i < length; i++) - *ptr++ ^= 1 << 7; - - return i; -} - -static int -convert_to_8_native_endian(struct xmms_convert_buffers *buf, - void **data, int length) -{ - gint8 *output = *data; - gint16 *input = *data; - int i; - for (i = 0; i < length / 2; i++) - *output++ = *input++ >> 8; - - return i; -} - -static int -convert_to_8_native_endian_swap_sign(struct xmms_convert_buffers - *buf, void **data, int length) -{ - gint8 *output = *data; - gint16 *input = *data; - int i; - for (i = 0; i < length / 2; i++) - *output++ = (*input++ >> 8) ^ (1 << 7); - - return i; -} - - -static int -convert_to_8_alien_endian(struct xmms_convert_buffers *buf, - void **data, int length) -{ - gint8 *output = *data; - gint16 *input = *data; - int i; - for (i = 0; i < length / 2; i++) - *output++ = *input++ & 0xff; - - return i; -} - -static int -convert_to_8_alien_endian_swap_sign(struct xmms_convert_buffers - *buf, void **data, int length) -{ - gint8 *output = *data; - gint16 *input = *data; - int i; - for (i = 0; i < length / 2; i++) - *output++ = (*input++ & 0xff) ^ (1 << 7); - - return i; -} - -static int -convert_to_16_native_endian(struct xmms_convert_buffers *buf, - void **data, int length) -{ - guint8 *input = *data; - guint16 *output; - int i; - *data = convert_get_buffer(&buf->format_buffer, length * 2); - output = *data; - for (i = 0; i < length; i++) - *output++ = *input++ << 8; - - return i * 2; -} - -static int -convert_to_16_native_endian_swap_sign(struct - xmms_convert_buffers *buf, - void **data, int length) -{ - guint8 *input = *data; - guint16 *output; - int i; - *data = convert_get_buffer(&buf->format_buffer, length * 2); - output = *data; - for (i = 0; i < length; i++) - *output++ = (*input++ << 8) ^ (1 << 15); - - return i * 2; -} - - -static int -convert_to_16_alien_endian(struct xmms_convert_buffers *buf, - void **data, int length) -{ - guint8 *input = *data; - guint16 *output; - int i; - *data = convert_get_buffer(&buf->format_buffer, length * 2); - output = *data; - for (i = 0; i < length; i++) - *output++ = *input++; - - return i * 2; -} - -static int -convert_to_16_alien_endian_swap_sign(struct xmms_convert_buffers - *buf, void **data, int length) -{ - guint8 *input = *data; - guint16 *output; - int i; - *data = convert_get_buffer(&buf->format_buffer, length * 2); - output = *data; - for (i = 0; i < length; i++) - *output++ = *input++ ^ (1 << 7); - - return i * 2; -} - -static AFormat -unnativize(AFormat fmt) -{ - if (fmt == FMT_S16_NE) { - if (IS_BIG_ENDIAN) - return FMT_S16_BE; - else - return FMT_S16_LE; - } - if (fmt == FMT_U16_NE) { - if (IS_BIG_ENDIAN) - return FMT_U16_BE; - else - return FMT_U16_LE; - } - return fmt; -} - -/** - * xmms_convert_get_func: - * @output: A format to output data as. - * @input: The format of the inbound data. - * - * Looks up the proper conversion method to use. - * - * Return value: A function pointer to the desired conversion function. - **/ -convert_func_t -xmms_convert_get_func(AFormat output, AFormat input) -{ - output = unnativize(output); - input = unnativize(input); - - if (output == input) - return NULL; - - if ((output == FMT_U16_BE && input == FMT_U16_LE) || - (output == FMT_U16_LE && input == FMT_U16_BE) || - (output == FMT_S16_BE && input == FMT_S16_LE) || - (output == FMT_S16_LE && input == FMT_S16_BE)) - return convert_swap_endian; - - if ((output == FMT_U16_BE && input == FMT_S16_BE) || - (output == FMT_U16_LE && input == FMT_S16_LE) || - (output == FMT_S16_BE && input == FMT_U16_BE) || - (output == FMT_S16_LE && input == FMT_U16_LE)) - return convert_swap_sign16; - - if ((IS_BIG_ENDIAN && - ((output == FMT_U16_BE && input == FMT_S16_LE) || - (output == FMT_S16_BE && input == FMT_U16_LE))) || - (!IS_BIG_ENDIAN && - ((output == FMT_U16_LE && input == FMT_S16_BE) || - (output == FMT_S16_LE && input == FMT_U16_BE)))) - return convert_swap_sign_and_endian_to_native; - - if ((!IS_BIG_ENDIAN && - ((output == FMT_U16_BE && input == FMT_S16_LE) || - (output == FMT_S16_BE && input == FMT_U16_LE))) || - (IS_BIG_ENDIAN && - ((output == FMT_U16_LE && input == FMT_S16_BE) || - (output == FMT_S16_LE && input == FMT_U16_BE)))) - return convert_swap_sign_and_endian_to_alien; - - if ((IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_U16_BE) || - (output == FMT_S8 && input == FMT_S16_BE))) || - (!IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_U16_LE) || - (output == FMT_S8 && input == FMT_S16_LE)))) - return convert_to_8_native_endian; - - if ((IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_S16_BE) || - (output == FMT_S8 && input == FMT_U16_BE))) || - (!IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_S16_LE) || - (output == FMT_S8 && input == FMT_U16_LE)))) - return convert_to_8_native_endian_swap_sign; - - if ((!IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_U16_BE) || - (output == FMT_S8 && input == FMT_S16_BE))) || - (IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_U16_LE) || - (output == FMT_S8 && input == FMT_S16_LE)))) - return convert_to_8_alien_endian; - - if ((!IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_S16_BE) || - (output == FMT_S8 && input == FMT_U16_BE))) || - (IS_BIG_ENDIAN && - ((output == FMT_U8 && input == FMT_S16_LE) || - (output == FMT_S8 && input == FMT_U16_LE)))) - return convert_to_8_alien_endian_swap_sign; - - if ((output == FMT_U8 && input == FMT_S8) || - (output == FMT_S8 && input == FMT_U8)) - return convert_swap_sign8; - - if ((IS_BIG_ENDIAN && - ((output == FMT_U16_BE && input == FMT_U8) || - (output == FMT_S16_BE && input == FMT_S8))) || - (!IS_BIG_ENDIAN && - ((output == FMT_U16_LE && input == FMT_U8) || - (output == FMT_S16_LE && input == FMT_S8)))) - return convert_to_16_native_endian; - - if ((IS_BIG_ENDIAN && - ((output == FMT_U16_BE && input == FMT_S8) || - (output == FMT_S16_BE && input == FMT_U8))) || - (!IS_BIG_ENDIAN && - ((output == FMT_U16_LE && input == FMT_S8) || - (output == FMT_S16_LE && input == FMT_U8)))) - return convert_to_16_native_endian_swap_sign; - - if ((!IS_BIG_ENDIAN && - ((output == FMT_U16_BE && input == FMT_U8) || - (output == FMT_S16_BE && input == FMT_S8))) || - (IS_BIG_ENDIAN && - ((output == FMT_U16_LE && input == FMT_U8) || - (output == FMT_S16_LE && input == FMT_S8)))) - return convert_to_16_alien_endian; - - if ((!IS_BIG_ENDIAN && - ((output == FMT_U16_BE && input == FMT_S8) || - (output == FMT_S16_BE && input == FMT_U8))) || - (IS_BIG_ENDIAN && - ((output == FMT_U16_LE && input == FMT_S8) || - (output == FMT_S16_LE && input == FMT_U8)))) - return convert_to_16_alien_endian_swap_sign; - - g_warning("Translation needed, but not available.\n" - "Input: %d; Output %d.", input, output); - return NULL; -} - -static int -convert_mono_to_stereo(struct xmms_convert_buffers *buf, - void **data, int length, int b16) -{ - int i; - void *outbuf = convert_get_buffer(&buf->stereo_buffer, length * 2); - - if (b16) { - guint16 *output = outbuf, *input = *data; - for (i = 0; i < length / 2; i++) { - *output++ = *input; - *output++ = *input; - input++; - } - } - else { - guint8 *output = outbuf, *input = *data; - for (i = 0; i < length; i++) { - *output++ = *input; - *output++ = *input; - input++; - } - } - *data = outbuf; - - return length * 2; -} - -static int -convert_mono_to_stereo_8(struct xmms_convert_buffers *buf, - void **data, int length) -{ - return convert_mono_to_stereo(buf, data, length, FALSE); -} - -static int -convert_mono_to_stereo_16(struct xmms_convert_buffers *buf, - void **data, int length) -{ - return convert_mono_to_stereo(buf, data, length, TRUE); -} - -static int -convert_stereo_to_mono_u8(struct xmms_convert_buffers *buf, - void **data, int length) -{ - guint8 *output = *data, *input = *data; - int i; - for (i = 0; i < length / 2; i++) { - guint16 tmp; - tmp = *input++; - tmp += *input++; - *output++ = tmp / 2; - } - return length / 2; -} -static int -convert_stereo_to_mono_s8(struct xmms_convert_buffers *buf, - void **data, int length) -{ - gint8 *output = *data, *input = *data; - int i; - for (i = 0; i < length / 2; i++) { - gint16 tmp; - tmp = *input++; - tmp += *input++; - *output++ = tmp / 2; - } - return length / 2; -} -static int -convert_stereo_to_mono_u16le(struct xmms_convert_buffers *buf, - void **data, int length) -{ - guint16 *output = *data, *input = *data; - int i; - for (i = 0; i < length / 4; i++) { - guint32 tmp; - guint16 stmp; - tmp = GUINT16_FROM_LE(*input); - input++; - tmp += GUINT16_FROM_LE(*input); - input++; - stmp = tmp / 2; - *output++ = GUINT16_TO_LE(stmp); - } - return length / 2; -} - -static int -convert_stereo_to_mono_u16be(struct xmms_convert_buffers *buf, - void **data, int length) -{ - guint16 *output = *data, *input = *data; - int i; - for (i = 0; i < length / 4; i++) { - guint32 tmp; - guint16 stmp; - tmp = GUINT16_FROM_BE(*input); - input++; - tmp += GUINT16_FROM_BE(*input); - input++; - stmp = tmp / 2; - *output++ = GUINT16_TO_BE(stmp); - } - return length / 2; -} - -static int -convert_stereo_to_mono_s16le(struct xmms_convert_buffers *buf, - void **data, int length) -{ - gint16 *output = *data, *input = *data; - int i; - for (i = 0; i < length / 4; i++) { - gint32 tmp; - gint16 stmp; - tmp = GINT16_FROM_LE(*input); - input++; - tmp += GINT16_FROM_LE(*input); - input++; - stmp = tmp / 2; - *output++ = GINT16_TO_LE(stmp); - } - return length / 2; -} - -static int -convert_stereo_to_mono_s16be(struct xmms_convert_buffers *buf, - void **data, int length) -{ - gint16 *output = *data, *input = *data; - int i; - for (i = 0; i < length / 4; i++) { - gint32 tmp; - gint16 stmp; - tmp = GINT16_FROM_BE(*input); - input++; - tmp += GINT16_FROM_BE(*input); - input++; - stmp = tmp / 2; - *output++ = GINT16_TO_BE(stmp); - } - return length / 2; -} - -/** - * xmms_convert_get_channel_func: - * @fmt: The format of the data. - * @output: The number of channels to output as. - * @input: The number of channels inbound. - * - * Looks up the proper conversion method to use. - * - * Return value: A function pointer to the desired conversion function. - **/ -convert_channel_func_t -xmms_convert_get_channel_func(AFormat fmt, int output, int input) -{ - fmt = unnativize(fmt); - - if (output == input) - return NULL; - - if (input == 1 && output == 2) - switch (fmt) { - case FMT_U8: - case FMT_S8: - return convert_mono_to_stereo_8; - case FMT_U16_LE: - case FMT_U16_BE: - case FMT_S16_LE: - case FMT_S16_BE: - return convert_mono_to_stereo_16; - default: - g_warning("Unknown format: %d" "No conversion available.", fmt); - return NULL; - } - if (input == 2 && output == 1) - switch (fmt) { - case FMT_U8: - return convert_stereo_to_mono_u8; - case FMT_S8: - return convert_stereo_to_mono_s8; - case FMT_U16_LE: - return convert_stereo_to_mono_u16le; - case FMT_U16_BE: - return convert_stereo_to_mono_u16be; - case FMT_S16_LE: - return convert_stereo_to_mono_s16le; - case FMT_S16_BE: - return convert_stereo_to_mono_s16be; - default: - g_warning("Unknown format: %d. " - "No conversion available.", fmt); - return NULL; - - } - - g_warning("Input has %d channels, soundcard uses %d channels\n" - "No conversion is available", input, output); - return NULL; -} - - -#define RESAMPLE_STEREO(sample_type, bswap) \ - const int shift = sizeof (sample_type); \ - int i, in_samples, out_samples, x, delta; \ - sample_type *inptr = *data, *outptr; \ - guint nlen = (((length >> shift) * ofreq) / ifreq); \ - void *nbuf; \ - if (nlen == 0) \ - return 0; \ - nlen <<= shift; \ - if (bswap) \ - convert_swap_endian(NULL, data, length); \ - nbuf = convert_get_buffer(&buf->freq_buffer, nlen); \ - outptr = nbuf; \ - in_samples = length >> shift; \ - out_samples = nlen >> shift; \ - delta = (in_samples << 12) / out_samples; \ - for (x = 0, i = 0; i < out_samples; i++) \ - { \ - int x1, frac; \ - x1 = (x >> 12) << 12; \ - frac = x - x1; \ - *outptr++ = \ - ((inptr[(x1 >> 12) << 1] * \ - ((1<<12) - frac) + \ - inptr[((x1 >> 12) + 1) << 1] * \ - frac) >> 12); \ - *outptr++ = \ - ((inptr[((x1 >> 12) << 1) + 1] * \ - ((1<<12) - frac) + \ - inptr[(((x1 >> 12) + 1) << 1) + 1] * \ - frac) >> 12); \ - x += delta; \ - } \ - if (bswap) \ - convert_swap_endian(NULL, &nbuf, nlen); \ - *data = nbuf; \ - return nlen; \ - - -#define RESAMPLE_MONO(sample_type, bswap) \ - const int shift = sizeof (sample_type) - 1; \ - int i, x, delta, in_samples, out_samples; \ - sample_type *inptr = *data, *outptr; \ - guint nlen = (((length >> shift) * ofreq) / ifreq); \ - void *nbuf; \ - if (nlen == 0) \ - return 0; \ - nlen <<= shift; \ - if (bswap) \ - convert_swap_endian(NULL, data, length); \ - nbuf = convert_get_buffer(&buf->freq_buffer, nlen); \ - outptr = nbuf; \ - in_samples = length >> shift; \ - out_samples = nlen >> shift; \ - delta = ((length >> shift) << 12) / out_samples; \ - for (x = 0, i = 0; i < out_samples; i++) \ - { \ - int x1, frac; \ - x1 = (x >> 12) << 12; \ - frac = x - x1; \ - *outptr++ = \ - ((inptr[x1 >> 12] * ((1<<12) - frac) + \ - inptr[(x1 >> 12) + 1] * frac) >> 12); \ - x += delta; \ - } \ - if (bswap) \ - convert_swap_endian(NULL, &nbuf, nlen); \ - *data = nbuf; \ - return nlen; \ - -static int -convert_resample_stereo_s16ne(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_STEREO(gint16, FALSE); -} - -static int -convert_resample_stereo_s16ae(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_STEREO(gint16, TRUE); -} - -static int -convert_resample_stereo_u16ne(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_STEREO(guint16, FALSE); -} - -static int -convert_resample_stereo_u16ae(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_STEREO(guint16, TRUE); -} - -static int -convert_resample_mono_s16ne(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_MONO(gint16, FALSE); -} - -static int -convert_resample_mono_s16ae(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_MONO(gint16, TRUE); -} - -static int -convert_resample_mono_u16ne(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_MONO(guint16, FALSE); -} - -static int -convert_resample_mono_u16ae(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_MONO(guint16, TRUE); -} - -static int -convert_resample_stereo_u8(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_STEREO(guint8, FALSE); -} - -static int -convert_resample_mono_u8(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_MONO(guint8, FALSE); -} - -static int -convert_resample_stereo_s8(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_STEREO(gint8, FALSE); -} - -static int -convert_resample_mono_s8(struct xmms_convert_buffers *buf, - void **data, int length, int ifreq, int ofreq) -{ - RESAMPLE_MONO(gint8, FALSE); -} - - -/** - * xmms_convert_get_frequency_func: - * @fmt: The format of the data. - * @channels: The number of channels inbound. - * - * Looks up the proper conversion method to use. - * - * Return value: A function pointer to the desired conversion function. - **/ -convert_freq_func_t -xmms_convert_get_frequency_func(AFormat fmt, int channels) -{ - fmt = unnativize(fmt); - g_message("fmt %d, channels: %d", fmt, channels); - - if (channels < 1 || channels > 2) { - g_warning("Unsupported number of channels: %d. " - "Resample function not available", channels); - return NULL; - } - if ((IS_BIG_ENDIAN && fmt == FMT_U16_BE) || - (!IS_BIG_ENDIAN && fmt == FMT_U16_LE)) { - if (channels == 1) - return convert_resample_mono_u16ne; - else - return convert_resample_stereo_u16ne; - } - if ((IS_BIG_ENDIAN && fmt == FMT_S16_BE) || - (!IS_BIG_ENDIAN && fmt == FMT_S16_LE)) { - if (channels == 1) - return convert_resample_mono_s16ne; - else - return convert_resample_stereo_s16ne; - } - if ((!IS_BIG_ENDIAN && fmt == FMT_U16_BE) || - (IS_BIG_ENDIAN && fmt == FMT_U16_LE)) { - if (channels == 1) - return convert_resample_mono_u16ae; - else - return convert_resample_stereo_u16ae; - } - if ((!IS_BIG_ENDIAN && fmt == FMT_S16_BE) || - (IS_BIG_ENDIAN && fmt == FMT_S16_LE)) { - if (channels == 1) - return convert_resample_mono_s16ae; - else - return convert_resample_stereo_s16ae; - } - if (fmt == FMT_U8) { - if (channels == 1) - return convert_resample_mono_u8; - else - return convert_resample_stereo_u8; - } - if (fmt == FMT_S8) { - if (channels == 1) - return convert_resample_mono_s8; - else - return convert_resample_stereo_s8; - } - g_warning("Resample function not available" "Format %d.", fmt); - return NULL; -}
--- a/src/audacious/xconvert.h Mon Feb 11 04:05:26 2008 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2003 Haavard Kvaalen <havardk@xmms.org> - * - * Licensed under GNU GPL version 3. - */ - -#ifndef _AUDACIOUS_XCONVERT_H -#define _AUDACIOUS_XCONVERT_H - -#include <audacious/plugin.h> - -struct xmms_convert_buffers; - -struct xmms_convert_buffers *xmms_convert_buffers_new(void); -/* - * Free the data assosiated with the buffers, without destroying the - * context. The context can be reused. - */ -void xmms_convert_buffers_free(struct xmms_convert_buffers *buf); -void xmms_convert_buffers_destroy(struct xmms_convert_buffers *buf); - - -typedef int (*convert_func_t) (struct xmms_convert_buffers * buf, - void **data, int length); -typedef int (*convert_channel_func_t) (struct xmms_convert_buffers * buf, - void **data, int length); -typedef int (*convert_freq_func_t) (struct xmms_convert_buffers * buf, - void **data, int length, int ifreq, - int ofreq); - - -convert_func_t xmms_convert_get_func(AFormat output, AFormat input); -convert_channel_func_t xmms_convert_get_channel_func(AFormat fmt, - int output, - int input); -convert_freq_func_t xmms_convert_get_frequency_func(AFormat fmt, - int channels); - -#endif