SDL_sound_CoreAudio: alt_audio

annotate alt_audio_convert.c @ 368:84d6c604eaa9

Fixes to interface with SDL_sound correctly by Torbjorn.

author	Ryan C. Gordon <icculus@icculus.org>
date	Sat, 22 Jun 2002 23:19:41 +0000
parents	eda146d666d1
children	1b463ef9bcc2

rev	line source
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	2 * Extended Audio Converter for SDL (Simple DirectMedia Layer)
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	3 * Copyright (C) 2002 Frank Ranostaj
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	4 * Institute of Applied Physik
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	5 * Johann Wolfgang Goethe-Universität
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	6 * Frankfurt am Main, Germany
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	7 *
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	8 * This library is free software; you can redistribute it and/or
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	9 * modify it under the terms of the GNU Library General Public
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	10 * License as published by the Free Software Foundation; either
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	11 * version 2 of the License, or (at your option) any later version.
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	12 *
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	13 * This library is distributed in the hope that it will be useful,
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	16 * Library General Public License for more details.
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	17 *
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	18 * You should have received a copy of the GNU Library General Public
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	19 * License along with this library; if not, write to the Free
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	21 *
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	22 * Frank Ranostaj
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	23 * ranostaj@stud.uni-frankfurt.de
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	24 *
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	25 * (This code blatantly abducted for SDL_sound. Thanks, Frank! --ryan.)
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	26 */
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	27
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	28 #include "alt_audio_convert.h"
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	29 #include <math.h>
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	30
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	31 /* just to make sure this is defined... */
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	32
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	33 #ifndef min
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	34 #define min(x, y) ( ((x) < (y)) ? (x) : (y) )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	35 #endif
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	36
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	37 #ifndef abs
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	38 #define abs(x) ( ((x) > (0)) ? (x) : -(x) )
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	39 #endif
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	40
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	41
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	42 /* some macros for "parsing" format */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	43
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	44 #define IS_8BIT(x) ((x).format & 0x0008)
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	45 #define IS_16BIT(x) ((x).format & 0x0010)
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	46 #define IS_FLOAT(x) ((x).format & 0x0020)
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	47 #define IS_SIGNED(x) ((x).format & 0x8000)
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	48 #define IS_SYSENDIAN(x) ((~AUDIO_U16SYS ^ (x).format) & 0x1000)
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	50
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	51 /-------------------------------------------------------------------------/
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	52 /* the purpose of the RateConverterBuffer is to provide a continous storage
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	53 for head and tail of the (sample)-buffer. This allows a simple and
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	54 perfomant implemantation of the sample rate converters. Depending of the
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	55 operation mode, two layouts for the RateConverterBuffer.inbuffer are
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	56 possible:
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	57
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	58 in the Loop Mode:
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	59 ... T-4 T-3 T-2 T-1 H+0 H+1 H+2 H+3 H+4 ...
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	60 \|
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	61 linp, finp
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	62
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	63 in the Single Mode (non Loop):
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	64 ... T-4 T-3 T-2 T-1 0 0 0 ... 0 0 0 H+0 H+1 H+2 H+3 H+4 ...
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	65 \| \|
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	66 linp finp
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	67
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	68 The RateConverterBuffer allows an accurate attack and decay of the
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	69 filters in the rate Converters.
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	70
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	71 The pointer finp are actually shifted against the depicted position so
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	72 that on the first invocation of the rate converter the input of the
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	73 filter is nearly complete in the zero region, only one input value is
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	74 used. After the calculation of the first output value, the pointer are
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	75 incremented or decremented depending on down or up conversion and the
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	76 first two input value are taken into account. This procedure repeats
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	77 until the filter has processed all zeroes. The distance of the pointer
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	78 movement is stored in flength, always positive.
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	79
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	80 Further a pointer cinp to the sample buffer itself is stored. The pointer
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	81 to the sample buffer is shifted too, so that on the first use of this
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	82 pointer the filter is complete in the sample buffer. The pointer moves
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	83 over the sample buffer until it reaches the other end. The distance of
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	84 the movement is stored in clength.
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	85
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	86 Finally the decay of the filter is done by linp and llength like finp,
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	87 flength, but in reverse order.
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	88
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	89 buffer denotes the start or the end of the output buffer, depending
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	90 on direction of the rate conversion.
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	91
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	92 All pointer and length referring the buffer as Sint16. All length
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	93 are refering to the input buffer */
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	94
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	95 typedef struct
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	96 {
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	97 Sint16 inbuffer[24*_fsize];
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	98 Sint16 finp, cinp, *linp;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	99 Sint16 *buffer;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	100 int flength, clength, llength;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	101 } RateConverterBuffer;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	102
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	103
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	104 /* Mono (1 channel ) */
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	105 #define Suffix(x) x##1
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	106 #include "filter_templates.h"
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	107 #undef Suffix
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	108
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	109 /* Stereo (2 channel ) */
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	110 #define Suffix(x) x##2
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	111 #include "filter_templates.h"
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	112 #undef Suffix
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	113
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	114
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	115 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	116 static int ConvertAudio( Sound_AudioCVT *Data,
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	117 Uint8* buffer, int length, int mode )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	118 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	119 AdapterC Temp;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	120 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	121
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	122 /* Make sure there's a converter */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	123 if( Data == NULL ) {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	124 SDL_SetError("No converter given");
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	125 return(-1);
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	126 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	127
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	128 /* Make sure there's data to convert */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	129 if( buffer == NULL ) {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	130 SDL_SetError("No buffer allocated for conversion");
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	131 return(-1);
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	132 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	133
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	134 /* Set up the conversion and go! */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	135 Temp.buffer = buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	136 Temp.mode = mode;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	137 Temp.filter = &Data->filter;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	138
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	139 for( i = 0; Data->adapter[i] != NULL; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	140 length = (*Data->adapter[i])( Temp, length);
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	141
368 84d6c604eaa9 Fixes to interface with SDL_sound correctly by Torbjorn. Ryan C. Gordon <icculus@icculus.org> parents: 366 diff changeset	142 Data->len_cvt = length;
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	143 return length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	144 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	145
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	146 int Sound_ConvertAudio( Sound_AudioCVT *Data )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	147 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	148 /* !!! FIXME: Try the looping stuff under certain circumstances? --ryan. */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	149 return ConvertAudio( Data, Data->buf, Data->len, 0 );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	150 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	151
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	152
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	153 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	154 static int expand8BitTo16BitSys( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	155 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	156 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	157 Uint8* inp = Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	158 Uint16* buffer = (Uint16*)Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	159 for( i = length; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	160 buffer[i] = inp[i]<<8;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	161 return 2*length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	162 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	163
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	164 static int expand8BitTo16BitWrong( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	165 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	166 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	167 Uint8* inp = Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	168 Uint16* buffer = (Uint16*)Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	169 for( i = length; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	170 buffer[i] = inp[i];
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	171 return 2*length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	172 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	173
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	174 /-------------------------------------------------------------------------/
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	175 static int expand16BitToFloat( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	176 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	177 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	178 Sint16* inp = (Sint16*)Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	179 float* buffer = (float*)Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	180 for( i = length>>1; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	181 buffer[i] = inp[i]*(1./32767);
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	182 return 2*length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	183 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	184
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	185 /-------------------------------------------------------------------------/
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	186 static int swapBytes( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	187 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	188 /*
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	189 * !!! FIXME !!!
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	190 *
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	191 *
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	192 * Use the faster SDL-Macros to swap
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	193 * - Frank
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	194 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	195
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	196 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	197 Uint16 a,b;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	198 Uint16* buffer = (Uint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	199 for( i = length>>1; i --; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	200 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	201 a = b = buffer[i];
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	202 buffer[i] = ( a << 8 ) \| ( b >> 8 );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	203 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	204 return length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	205 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	206
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	207 /-------------------------------------------------------------------------/
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	208 static int cutFloatTo16Bit( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	209 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	210 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	211 float* inp = (float*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	212 Sint16* buffer = (Sint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	213 length>>=2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	214 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	215 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	216 if( inp[i] > 1. )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	217 buffer[i] = 32767;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	218 else if( inp[i] < -1. )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	219 buffer[i] = -32768;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	220 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	221 buffer[i] = 32767 * inp[i];
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	222 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	223 return 2*length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	224 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	225
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	226 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	227 static int cut16BitSysTo8Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	228 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	229 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	230 Uint16* inp = (Uint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	231 Uint8* buffer = Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	232 length >>= 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	233 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	234 buffer[i] = inp[i]>>8;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	235 return length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	236 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	237
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	238 static int cut16BitWrongTo8Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	239 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	240 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	241 Uint16* inp = (Uint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	242 Uint8* buffer = Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	243 length >>= 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	244 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	245 buffer[i] = inp[i] & 0xff;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	246 return length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	247 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	248
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	249 /-------------------------------------------------------------------------/
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	250 static int changeSigned( AdapterC Data, int length, int XOR )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	251 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	252 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	253 Uint32* buffer = (Uint32*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	254 for( i = length>>2; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	255 buffer[i] ^= XOR;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	256 for( i = 4*(length>>2); i < length; i++)
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	257 ((Uint8)buffer)[i] ^= ((Uint8)&XOR)[i&3];
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	258 return length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	259 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	260
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	261 static int changeSigned16BitSys( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	262 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	263 return changeSigned( Data, length, 0x80008000 );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	264 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	265
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	266 static int changeSigned16BitWrong( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	267 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	268 return changeSigned( Data, length, 0x00800080 );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	269 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	270
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	271 static int changeSigned8Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	272 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	273 return changeSigned( Data, length, 0x80808080 );
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	274 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	275
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	276 /-------------------------------------------------------------------------/
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	277 static int convertStereoToMonoS16Bit( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	278 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	279 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	280 Sint16* buffer = (Sint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	281 Sint16* src = (Sint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	282 length >>= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	283 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	284 buffer[i] = ((int) (src++) + (src++) ) >> 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	285 return 2*length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	286 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	287
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	288 static int convertStereoToMonoU16Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	289 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	290 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	291 Uint16* buffer = (Uint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	292 Uint16* src = (Uint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	293 length >>= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	294 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	295 buffer[i] = ((int) (src++) + (src++) ) >> 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	296 return 2*length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	297 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	298
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	299 static int convertStereoToMonoS8Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	300 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	301 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	302 Sint8* buffer = (Sint8*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	303 Sint8* src = (Sint8*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	304 length >>= 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	305 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	306 buffer[i] = ((int) (src++) + (src++) ) >> 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	307 return length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	308 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	309
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	310 static int convertStereoToMonoU8Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	311 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	312 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	313 Uint8* buffer = (Uint8*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	314 Uint8* src = (Uint8*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	315 length >>= 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	316 for( i = 0; i < length; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	317 buffer[i] = ((int) (src++) + (src++) ) >> 1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	318 return length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	319 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	320
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	321 /-------------------------------------------------------------------------/
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	322 static int convertMonoToStereo16Bit( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	323 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	324 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	325 Uint16* buffer = (Uint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	326 Uint16* dst = (Uint16*)Data.buffer + length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	327 for( i = length>>1; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	328 (--dst) = (--dst) = buffer[i];
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	329 return 2*length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	330 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	331
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	332 static int convertMonoToStereo8Bit( AdapterC Data, int length )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	333 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	334 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	335 Uint8* buffer = Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	336 Uint8* dst = Data.buffer + 2*length;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	337 for( i = length; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	338 (--dst) = (--dst) = buffer[i];
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	339 return 2*length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	340 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	341
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	342 /-------------------------------------------------------------------------/
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	343 static int minus5dB( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	344 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	345 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	346 Sint16* buffer = (Sint16*) Data.buffer;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	347 for(i = length>>1; i--; )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	348 buffer[i]= 38084 * buffer[i] >> 16;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	349 return length;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	350 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	351
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	352 /-------------------------------------------------------------------------/
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	353 enum RateConverterType { varRate = 0, hlfRate = 1, dblRate = 2 };
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	354 static void initRateConverterBuffer( RateConverterBuffer *rcb,
368 84d6c604eaa9 Fixes to interface with SDL_sound correctly by Torbjorn. Ryan C. Gordon <icculus@icculus.org> parents: 366 diff changeset	355 AdapterC* Data, int length, enum RateConverterType r, int rel_size )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	356 {
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	357 int size, dir;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	358 int den[] = { 0, 1, 2};
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	359 int num[] = { 0, 2, 1};
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	360 int i;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	361
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	362 den[0] = Data->filter->denominator;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	363 num[0] = Data->filter->numerator;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	364
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	365 size = 2 * _fsize * abs(rel_size);
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	366 dir = rel_size > 0 ? 1 : 0;
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	367 length >>= 1;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	368
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	369 rcb->buffer = (Sint16*)( Data->buffer );
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	370
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	371 if( Data->mode & SDL_AI_Loop )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	372 {
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	373 // !!!FIXME: modulo length, take scale into account,
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	374 // check against the 'else' part
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	375 for( i = 0; i < size; i++ )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	376 {
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	377 rcb->inbuffer[i] = rcb->buffer[length-size+i];
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	378 rcb->inbuffer[i+size] = rcb->buffer[i];
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	379 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	380 rcb->finp = rcb->linp = rcb->inbuffer + size;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	381 if( size < 0 )
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	382 rcb->buffer += num[r] * ( length + 2 * size ) / den[r];
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	383 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	384 else
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	385 {
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	386 for( i = 0; i < size; i++ )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	387 {
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	388 int k;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	389 k = length-size+i;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	390 rcb->inbuffer[i] = k < 0 ? 0 : rcb->buffer[k];
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	391 rcb->inbuffer[i+size] = 0;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	392 rcb->inbuffer[i+2*size] = i < length ? rcb->buffer[i] : 0;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	393 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	394 // !!!FIXME: take lenght < size into account
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	395 rcb->flength = rcb->llength = size;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	396 rcb->clength = length - size;
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	397
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	398 if( dir )
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	399 {
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	400 rcb->finp = rcb->inbuffer + 5*size/2;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	401 rcb->cinp = rcb->buffer + length - size/2;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	402 rcb->linp = rcb->inbuffer + 3*size/2;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	403 rcb->buffer += den[r] * ( length + size ) / num[r];
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	404 }
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	405 else
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	406 {
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	407 rcb->finp = rcb->inbuffer + size/2;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	408 rcb->cinp = rcb->buffer + size/2;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	409 rcb->linp = rcb->inbuffer + 3*size/2;
eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	410 }
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	411 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	412 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	413
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	414 static void nextRateConverterBuffer( RateConverterBuffer *rcb )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	415 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	416 rcb->buffer++;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	417 rcb->finp++;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	418 rcb->cinp++;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	419 rcb->linp++;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	420 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	421
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	422 typedef Sint16* (RateConverter)( Sint16, Sint16, int, VarFilter, int*);
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	423 static int doRateConversion( RateConverterBuffer* rcb,
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	424 RateConverter ffp, VarFilter* filter )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	425 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	426 int pos = 0;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	427 Sint16 *outp;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	428 outp = rcb->buffer;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	429
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	430 outp = (*ffp)( outp, rcb->finp, rcb->flength, filter, &pos );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	431 outp = (*ffp)( outp, rcb->cinp, rcb->clength, filter, &pos );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	432 outp = (*ffp)( outp, rcb->linp, rcb->llength, filter, &pos );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	433 return 2 * abs( rcb->buffer - outp );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	434 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	435
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	436
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	437 /-------------------------------------------------------------------------/
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	438 static int doubleRateMono( AdapterC Data, int length )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	439 {
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	440 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	441 initRateConverterBuffer( &rcb, &Data, length, dblRate, 1 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	442 return doRateConversion( &rcb, doubleRate1, NULL );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	443 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	444
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	445 static int doubleRateStereo( AdapterC Data, int length )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	446 {
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	447 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	448 initRateConverterBuffer( &rcb, &Data, length, dblRate, 2 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	449 doRateConversion( &rcb, doubleRate2, NULL );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	450 nextRateConverterBuffer( &rcb );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	451 return 2 + doRateConversion( &rcb, doubleRate2, NULL );
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	452 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	453
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	454 /-------------------------------------------------------------------------/
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	455 static int halfRateMono( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	456 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	457 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	458 initRateConverterBuffer( &rcb, &Data, length, hlfRate, -1 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	459 return doRateConversion( &rcb, halfRate1, NULL );
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	460 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	461
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	462 static int halfRateStereo( AdapterC Data, int length )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	463 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	464 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	465 initRateConverterBuffer( &rcb, &Data, length, hlfRate, -2 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	466 doRateConversion( &rcb, halfRate2, NULL );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	467 nextRateConverterBuffer( &rcb );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	468 return 2 + doRateConversion( &rcb, halfRate2, NULL );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	469 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	470
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	471 /-------------------------------------------------------------------------/
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	472 static int increaseRateMono( AdapterC Data, int length )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	473 {
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	474 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	475 initRateConverterBuffer( &rcb, &Data, length, varRate, 2 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	476 return doRateConversion( &rcb, increaseRate1, Data.filter );
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	477 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	478
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	479 static int increaseRateStereo( AdapterC Data, int length )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	480 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	481 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	482 initRateConverterBuffer( &rcb, &Data, length, varRate, 4 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	483 doRateConversion( &rcb, increaseRate2, Data.filter );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	484 nextRateConverterBuffer( &rcb );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	485 return 2 + doRateConversion( &rcb, increaseRate2, Data.filter );
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	486 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	487
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	488 /-------------------------------------------------------------------------/
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	489 static int decreaseRateMono( AdapterC Data, int length )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	490 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	491 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	492 initRateConverterBuffer( &rcb, &Data, length, varRate, -2 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	493 return doRateConversion( &rcb, decreaseRate1, Data.filter );
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	494 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	495
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	496 static int decreaseRateStereo( AdapterC Data, int length )
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	497 {
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	498 RateConverterBuffer rcb;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	499 initRateConverterBuffer( &rcb, &Data, length, varRate, -4 );
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	500 doRateConversion( &rcb, decreaseRate2, Data.filter );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	501 nextRateConverterBuffer( &rcb );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	502 return doRateConversion( &rcb, decreaseRate2, Data.filter );
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	503 }
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	504
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	505
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	506 /-------------------------------------------------------------------------/
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	507 typedef struct{
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	508 Sint16 denominator;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	509 Sint16 numerator;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	510 } Fraction;
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	511
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	512 /* gives a maximal error of 3% and typical less than 0.2% */
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	513 static Fraction findFraction( float Value )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	514 {
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	515 const Sint8 frac[95]={
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	516 2, -1, /* /1 */
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	517 1, 3, -1, /* /2 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	518 2, 4, 5, -1, /* /3 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	519 3, 5, 7, -1, /* /4 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	520 3, 4, 6, 7, 8, 9, -1, /* /5 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	521 5, 7, 11, -1, /* /6 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	522 4, 5, 6, 8, 9, 10, 11, 12, 13, -1, /* /7 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	523 5, 7, 9, 11, 13, 15, -1, /* /8 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	524 5, 7, 8, 10, 11, 13, 14, 16, -1, /* /9 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	525 7, 9, 11, 13, -1, /* /10 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	526 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, -1, /* /11 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	527 7, 11, 13, -1, /* /12 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	528 7, 8, 9, 10, 11, 12, 14, 15, 16, -1, /* /13 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	529 9, 11, 13, 15, -1, /* /14 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	530 8, 11, 13, 14, 16, -1, /* /15 */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	531 9, 11, 13, 15 }; /* /16 */
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	532
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	533
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	534 Fraction Result = {0,0};
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	535 int n,num=1,den=1;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	536
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	537 float RelErr, BestErr = 0;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	538 if( Value < 31/64. \|\| Value > 64/31. ) return Result;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	539
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	540 for( n = 0; n < SDL_TABLESIZE(frac); num=frac[n++] )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	541 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	542 if( num < 0 ) den++;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	543 RelErr = Value * num / den;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	544 RelErr = min( RelErr, 1/RelErr );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	545 if( RelErr > BestErr )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	546 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	547 BestErr = RelErr;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	548 Result.denominator = den;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	549 Result.numerator = num;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	550 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	551 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	552 return Result;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	553 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	554
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	555 /-------------------------------------------------------------------------/
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	556 static float sinc( float x )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	557 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	558 if( x > -1e-24 && x < 1e-24 ) return 1.;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	559 else return sin(x)/x;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	560 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	561
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	562 static void calculateVarFilter( Sint16* dst,
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	563 float Ratio, float phase, float scale )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	564 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	565 const Uint16 KaiserWindow7[]= {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	566 22930, 16292, 14648, 14288, 14470, 14945, 15608, 16404,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	567 17304, 18289, 19347, 20467, 21644, 22872, 24145, 25460,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	568 26812, 28198, 29612, 31052, 32513, 33991, 35482, 36983,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	569 38487, 39993, 41494, 42986, 44466, 45928, 47368, 48782,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	570 50165, 51513, 52821, 54086, 55302, 56466, 57575, 58624,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	571 59610, 60529, 61379, 62156, 62858, 63483, 64027, 64490,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	572 64870, 65165, 65375, 65498, 65535, 65484, 65347, 65124,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	573 64815, 64422, 63946, 63389, 62753, 62039, 61251, 60391 };
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	574 int i;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	575 float w;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	576 const float fg = -.018 + .5 * Ratio;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	577 const float omega = 2 * M_PI * fg;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	578 phase -= 63;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	579 for( i = 0; i < 64; i++)
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	580 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	581 w = scale * ( KaiserWindow7[i] * ( i + 1 ));
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	582 dst[i] = w * sinc( omega * (i+phase) );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	583 dst[127-i] = w * sinc( omega * (127-i+phase) );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	584 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	585 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	586
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	587 typedef struct{
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	588 float scale;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	589 int incr;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	590 } VarFilterMode;
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	591
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	592 const VarFilterMode Up = { 0.0211952, -1 };
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	593 const VarFilterMode Down = { 0.0364733, 1 };
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	594
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	595 static void setupVarFilter( VarFilter* filter,
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	596 float Ratio, VarFilterMode Direction )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	597 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	598 int i,n,d;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	599 Fraction IRatio;
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	600 float phase = 0.;
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	601 IRatio = findFraction( Ratio );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	602 Ratio = min( Ratio, 1/Ratio );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	603
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	604 n = IRatio.numerator;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	605 d = IRatio.denominator;
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	606 filter->denominator = d;
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	607 filter->numerator = n;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	608
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	609 for( i = 0; i < d; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	610 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	611 if( phase >= n )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	612 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	613 phase -= d;
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	614 filter->incr[i] = abs(Direction.incr);
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	615 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	616 else
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	617 filter->incr[i] = abs(1+Direction.incr);
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	618
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	619 calculateVarFilter( filter->c[i], Ratio, phase/(float)n,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	620 Direction.scale );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	621 phase += d;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	622 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	623 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	624
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	625 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	626 static void createRateConverter( Sound_AudioCVT Data, int fip,
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	627 int SrcRate, int DestRate, int Channel )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	628 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	629 int filter_index = *fip;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	630
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	631 int VarPos = 0;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	632 int Mono = 2 - Channel;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	633 float Ratio = DestRate;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	634 *fip = -1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	635
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	636
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	637 if( SrcRate < 1 \|\| SrcRate > 1<<18 \|\|
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	638 DestRate < 1 \|\| DestRate > 1<<18 ) return;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	639 Ratio /= SrcRate;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	640
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	641 if( Ratio > 1.)
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	642 VarPos = filter_index++;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	643 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	644 Data->adapter[filter_index++] = minus5dB;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	645
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	646 while( Ratio > 64./31.)
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	647 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	648 Data->adapter[filter_index++] =
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	649 Mono ? doubleRateMono : doubleRateStereo;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	650 Ratio /= 2.;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	651 Data->len_mult *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	652 Data->add *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	653 Data->add += _fsize;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	654 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	655
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	656 while( Ratio < 31./64. )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	657 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	658 Data->adapter[filter_index++] =
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	659 Mono ? halfRateMono : halfRateStereo;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	660 Ratio *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	661 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	662
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	663 if( Ratio > 1. )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	664 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	665 setupVarFilter( &Data->filter, Ratio, Up );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	666 Data->adapter[VarPos] =
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	667 Mono ? increaseRateMono : increaseRateStereo;
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	668 Data->len_mult *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	669 Data->add *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	670 Data->add += _fsize;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	671 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	672 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	673 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	674 setupVarFilter( &Data->filter, Ratio, Down );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	675 Data->adapter[filter_index++] =
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	676 Mono ? decreaseRateMono : decreaseRateStereo;
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	677 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	678 *fip = filter_index;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	679 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	680
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	681 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	682 static void createFormatConverter16Bit(Sound_AudioCVT Data, int fip,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	683 SDL_AudioSpec src, SDL_AudioSpec dst )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	684 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	685 int filter_index = *fip;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	686
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	687 if( src.channels == 2 && dst.channels == 1 )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	688 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	689 Data->add /= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	690 Data->len_mult /= 2;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	691
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	692 if( !IS_SYSENDIAN(src) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	693 Data->adapter[filter_index++] = swapBytes;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	694
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	695 if( IS_SIGNED(src) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	696 Data->adapter[filter_index++] = convertStereoToMonoS16Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	697 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	698 Data->adapter[filter_index++] = convertStereoToMonoU16Bit;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	699
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	700 if( !IS_SYSENDIAN(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	701 Data->adapter[filter_index++] = swapBytes;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	702 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	703 else if( IS_SYSENDIAN(src) != IS_SYSENDIAN(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	704 Data->adapter[filter_index++] = swapBytes;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	705
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	706 if( IS_SIGNED(src) != IS_SIGNED(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	707 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	708 if( IS_SYSENDIAN(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	709 Data->adapter[filter_index++] = changeSigned16BitSys;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	710 else
368 84d6c604eaa9 Fixes to interface with SDL_sound correctly by Torbjorn. Ryan C. Gordon <icculus@icculus.org> parents: 366 diff changeset	711 Data->adapter[filter_index++] = changeSigned16BitWrong;
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	712 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	713
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	714 if( src.channels == 1 && dst.channels == 2 )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	715 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	716 Data->add *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	717 Data->len_mult *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	718 Data->adapter[filter_index++] = convertMonoToStereo16Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	719 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	720
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	721 *fip = filter_index;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	722 }
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	723
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	724 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	725 static void createFormatConverter8Bit(Sound_AudioCVT Data, int fip,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	726 SDL_AudioSpec src, SDL_AudioSpec dst )
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	727 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	728 int filter_index = *fip;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	729 if( IS_16BIT(src) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	730 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	731 Data->add /= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	732 Data->len_mult /= 2;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	733
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	734 if( IS_SYSENDIAN(src) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	735 Data->adapter[filter_index++] = cut16BitSysTo8Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	736 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	737 Data->adapter[filter_index++] = cut16BitWrongTo8Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	738 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	739
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	740 if( src.channels == 2 && dst.channels == 1 )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	741 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	742 Data->add /= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	743 Data->len_mult /= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	744
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	745 if( IS_SIGNED(src) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	746 Data->adapter[filter_index++] = convertStereoToMonoS8Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	747 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	748 Data->adapter[filter_index++] = convertStereoToMonoU8Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	749 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	750
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	751 if( IS_SIGNED(src) != IS_SIGNED(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	752 Data->adapter[filter_index++] = changeSigned8Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	753
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	754 if( src.channels == 1 && dst.channels == 2 )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	755 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	756 Data->add *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	757 Data->len_mult *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	758 Data->adapter[filter_index++] = convertMonoToStereo8Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	759 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	760
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	761 if( !IS_8BIT(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	762 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	763 Data->add *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	764 Data->len_mult *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	765 if( IS_SYSENDIAN(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	766 Data->adapter[filter_index++] = expand8BitTo16BitSys;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	767 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	768 Data->adapter[filter_index++] = expand8BitTo16BitWrong;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	769 }
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	770
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	771 *fip = filter_index;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	772 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	773
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	774 /-------------------------------------------------------------------------/
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	775 static void createFormatConverter(Sound_AudioCVT Data, int fip,
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	776 SDL_AudioSpec src, SDL_AudioSpec dst )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	777 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	778 int filter_index = *fip;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	779
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	780 if( IS_FLOAT(src) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	781 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	782 Data->adapter[filter_index++] = cutFloatTo16Bit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	783 Data->len_mult /= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	784 Data->add /= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	785 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	786
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	787 if( IS_8BIT(src) \|\| IS_8BIT(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	788 createFormatConverter8Bit( Data, &filter_index, src, dst);
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	789 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	790 createFormatConverter16Bit( Data, &filter_index, src, dst);
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	791
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	792 if( IS_FLOAT(dst) )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	793 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	794 Data->adapter[filter_index++] = expand16BitToFloat;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	795 Data->len_mult *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	796 Data->add *= 2;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	797 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	798
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	799 *fip = filter_index;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	800 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	801
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	802
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	803 /-------------------------------------------------------------------------/
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	804 int BuildAudioCVT( Sound_AudioCVT *Data,
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	805 SDL_AudioSpec src, SDL_AudioSpec dst )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	806 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	807 SDL_AudioSpec intrm;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	808 int filter_index = 0;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	809
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	810 if( Data == NULL ) return -1;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	811 Data->len_mult = 1.;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	812 Data->add = 0;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	813
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	814 /* Check channels */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	815 if( src.channels < 1 \|\| src.channels > 2 \|\|
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	816 dst.channels < 1 \|\| dst.channels > 2 ) goto error_exit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	817
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	818 /* If no frequency conversion is needed, go straight to dst format */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	819 if( src.freq == dst.freq )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	820 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	821 createFormatConverter( Data, &filter_index, src, dst );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	822 goto sucess_exit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	823 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	824
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	825 /* Convert to signed 16Bit System-Endian */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	826 intrm.format = AUDIO_S16SYS;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	827 intrm.channels = min( src.channels, dst.channels );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	828 createFormatConverter( Data, &filter_index, src, intrm );
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	829
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	830 /* Do rate conversion */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	831 if( src.channels == 2 && dst.channels == 2 )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	832 createRateConverter( Data, &filter_index, src.freq, dst.freq, 2 );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	833 else
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	834 createRateConverter( Data, &filter_index, src.freq, dst.freq, 1 );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	835 /* propagate error */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	836 if( filter_index < 0 ) goto error_exit;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	837
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	838 /* Convert to final format */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	839 createFormatConverter( Data, &filter_index, intrm, dst );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	840
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	841 /* Set up the filter information */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	842 sucess_exit:
368 84d6c604eaa9 Fixes to interface with SDL_sound correctly by Torbjorn. Ryan C. Gordon <icculus@icculus.org> parents: 366 diff changeset	843 if( filter_index > 0 )
84d6c604eaa9 Fixes to interface with SDL_sound correctly by Torbjorn. Ryan C. Gordon <icculus@icculus.org> parents: 366 diff changeset	844 Data->needed = 1;
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	845 /* !!! FIXME: Is it okay to assign NULL to a function pointer?
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	846 Borland says no. -frank */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	847 Data->adapter[filter_index] = NULL;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	848 return 0;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	849
7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	850 error_exit:
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	851 /* !!! FIXME: Is it okay to assign NULL to a function pointer?
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	852 Borland says no. -frank */
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	853 Data->adapter[0] = NULL;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	854 return -1;
338 7b9a0f3f030e Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	855 }
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	856
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	857 /-------------------------------------------------------------------------/
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	858 static char *fmt_to_str(Uint16 fmt)
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	859 {
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	860 switch (fmt)
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	861 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	862 case AUDIO_U8: return " U8";
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	863 case AUDIO_S8: return " S8";
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	864 case AUDIO_U16MSB: return "U16MSB";
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	865 case AUDIO_S16MSB: return "S16MSB";
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	866 case AUDIO_U16LSB: return "U16LSB";
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	867 case AUDIO_S16LSB: return "S16LSB";
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	868 }
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	869 return "??????";
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	870 }
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	871
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	872 #define AdapterDesc(x) { x, #x }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	873
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	874 static void show_AudioCVT( Sound_AudioCVT *Data )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	875 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	876 int i,j;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	877 const struct{ int (adapter) ( AdapterC, int); Sint8 name; }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	878 AdapterDescription[] = {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	879 AdapterDesc(expand8BitTo16BitSys),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	880 AdapterDesc(expand8BitTo16BitWrong),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	881 AdapterDesc(expand16BitToFloat),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	882 AdapterDesc(swapBytes),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	883 AdapterDesc(cut16BitSysTo8Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	884 AdapterDesc(cut16BitWrongTo8Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	885 AdapterDesc(cutFloatTo16Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	886 AdapterDesc(changeSigned16BitSys),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	887 AdapterDesc(changeSigned16BitWrong),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	888 AdapterDesc(changeSigned8Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	889 AdapterDesc(convertStereoToMonoS16Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	890 AdapterDesc(convertStereoToMonoU16Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	891 AdapterDesc(convertStereoToMonoS8Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	892 AdapterDesc(convertStereoToMonoU8Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	893 AdapterDesc(convertMonoToStereo16Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	894 AdapterDesc(convertMonoToStereo8Bit),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	895 AdapterDesc(minus5dB),
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	896 AdapterDesc(doubleRateMono),
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	897 AdapterDesc(doubleRateStereo),
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	898 AdapterDesc(halfRateMono),
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	899 AdapterDesc(halfRateStereo),
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	900 AdapterDesc(increaseRateMono),
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	901 AdapterDesc(increaseRateStereo),
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	902 AdapterDesc(decreaseRateMono),
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	903 AdapterDesc(decreaseRateStereo),
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	904 { NULL, "----------NULL-----------" }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	905 };
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	906
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	907 fprintf( stderr, "\nAdapter List: \n" );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	908 for( i = 0; i < 32; i++ )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	909 {
366 eda146d666d1 More patches from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 365 diff changeset	910 for( j = 0; j < SDL_TABLESIZE(AdapterDescription); j++ )
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	911 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	912 if( Data->adapter[i] == AdapterDescription[j].adapter )
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	913 {
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	914 fprintf( stderr, " %s\n", AdapterDescription[j].name );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	915 if( Data->adapter[i] == NULL ) return;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	916 goto cont;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	917 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	918 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	919 fprintf( stderr, " Error: unknown adapter\n" );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	920 cont:
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	921 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	922 fprintf( stderr, " Error: NULL adapter missing\n" );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	923 }
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	924
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	925
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	926 int Sound_BuildAudioCVT(Sound_AudioCVT *Data,
365 f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	927 Uint16 src_format, Uint8 src_channels, int src_rate,
f61eadea1f44 More revisions from Frank. Ryan C. Gordon <icculus@icculus.org> parents: 360 diff changeset	928 Uint16 dst_format, Uint8 dst_channels, int dst_rate)
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	929 {
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	930 SDL_AudioSpec src, dst;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	931 int ret;
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	932
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	933 fprintf (stderr,
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	934 "Sound_BuildAudioCVT() :\n"
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	935 "-----------------------\n"
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	936 "format: %s -> %s\n"
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	937 "channels: %6d -> %6d\n"
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	938 "rate: %6d -> %6d\n",
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	939 fmt_to_str (src_format), fmt_to_str (dst_format),
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	940 src_channels, dst_channels,
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	941 src_rate, dst_rate);
fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	942
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	943 src.format = src_format;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	944 src.channels = src_channels;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	945 src.freq = src_rate;
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	946
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	947 dst.format = dst_format;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	948 dst.channels = dst_channels;
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	949 dst.freq = dst_rate;
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	950
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	951 ret = BuildAudioCVT( Data, src, dst );
347 778cee61e1be Mono-to-stereo fixes, more fprintf debugging output. Ryan C. Gordon <icculus@icculus.org> parents: 342 diff changeset	952
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	953 show_AudioCVT( Data );
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	954 fprintf (stderr, "\n"
c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	955 "return value: %d \n", ret );
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	956
360 c984aa6990f7 Fixes and enhancements from Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 347 diff changeset	957 return ret;
342 fbbb1f25b944 Cleanups by Torbjï¿½rn. Ryan C. Gordon <icculus@icculus.org> parents: 338 diff changeset	958 }

Mercurial > SDL_sound_CoreAudio

annotate alt_audio_convert.c @ 368:84d6c604eaa9