sdl-ios-xcode: src/audio/SDL_audiocvt.c annotate

annotate src/audio/SDL_audiocvt.c @ 3012:7e30c2dc7783

Fixed Visual C++ release build for Visual C++ 2005 * Some math functions become intrinsic in release mode, so we need to convert all the math functions into SDL math functions, like we did with the stdlib functions. * Constant initializers of 8-bit values become calls to memset() in release mode, but memset() itself is an intrinsic when explicitly called. So we'll just explicitly call memset() in those cases.

author	Sam Lantinga <slouken@libsdl.org>
date	Sat, 10 Jan 2009 18:32:24 +0000
parents	11626a53e7bc
children	f3dcf04412cf

rev	line source
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2768 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	6 modify it under the terms of the GNU Lesser General Public
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	8 version 2.1 of the License, or (at your option) any later version.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	13 Lesser General Public License for more details.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	15 You should have received a copy of the GNU Lesser General Public
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	16 License along with this library; if not, write to the Free Software
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	19 Sam Lantinga
252 e8157fcb3114 Updated the source with the correct e-mail address Sam Lantinga <slouken@libsdl.org> parents: 0 diff changeset	20 slouken@libsdl.org
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	22 #include "SDL_config.h"
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	23
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	24 /* Functions for audio drivers to perform runtime conversion of audio format */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	25
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 #include "SDL_audio.h"
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	27 #include "SDL_audio_c.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	28
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	29 //#define DEBUG_CONVERT
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	30
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	31 /* These are fractional multiplication routines. That is, their inputs
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	32 are two numbers in the range [-1, 1) and the result falls in that
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	33 same range. The output is the same size as the inputs, i.e.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	34 32-bit x 32-bit = 32-bit.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	35 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	36
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	37 /* We hope here that the right shift includes sign extension */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	38 #ifdef SDL_HAS_64BIT_Type
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	39 #define SDL_FixMpy32(a, b) ((((Sint64)a * (Sint64)b) >> 31) & 0xffffffff)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	40 #else
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	41 /* If we don't have the 64-bit type, do something more complicated. See http://www.8052.com/mul16.phtml or http://www.cs.uaf.edu/~cs301/notes/Chapter5/node5.html */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	42 #define SDL_FixMpy32(a, b) ((((Sint64)a * (Sint64)b) >> 31) & 0xffffffff)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	43 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	44 #define SDL_FixMpy16(a, b) ((((Sint32)a * (Sint32)b) >> 14) & 0xffff)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	45 #define SDL_FixMpy8(a, b) ((((Sint16)a * (Sint16)b) >> 7) & 0xff)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	46 /* This macro just makes the floating point filtering code not have to be a special case. */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	47 #define SDL_FloatMpy(a, b) (a * b)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	48
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	49 /* These macros take floating point numbers in the range [-1.0f, 1.0f) and
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	50 represent them as fixed-point numbers in that same range. There's no
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	51 checking that the floating point argument is inside the appropriate range.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	52 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	53
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	54 #define SDL_Make_1_7(a) (Sint8)(a * 128.0f)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	55 #define SDL_Make_1_15(a) (Sint16)(a * 32768.0f)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	56 #define SDL_Make_1_31(a) (Sint32)(a * 2147483648.0f)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	57 #define SDL_Make_2_6(a) (Sint8)(a * 64.0f)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	58 #define SDL_Make_2_14(a) (Sint16)(a * 16384.0f)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	59 #define SDL_Make_2_30(a) (Sint32)(a * 1073741824.0f)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	60
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	61 /* Effectively mix right and left channels into a single channel */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	62 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	63 SDL_ConvertMono(SDL_AudioCVT * cvt, SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	64 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	65 int i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	66 Sint32 sample;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	67
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	68 #ifdef DEBUG_CONVERT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	69 fprintf(stderr, "Converting to mono\n");
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	70 #endif
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	71 switch (format & (SDL_AUDIO_MASK_SIGNED \| SDL_AUDIO_MASK_BITSIZE)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	72 case AUDIO_U8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	73 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	74 Uint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	75
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	76 src = cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	77 dst = cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	78 for (i = cvt->len_cvt / 2; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	79 sample = src[0] + src[1];
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	80 *dst = (Uint8) (sample / 2);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	81 src += 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	82 dst += 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	83 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	84 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	85 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	86
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	87 case AUDIO_S8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	88 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	89 Sint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	90
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	91 src = (Sint8 *) cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	92 dst = (Sint8 *) cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	93 for (i = cvt->len_cvt / 2; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	94 sample = src[0] + src[1];
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	95 *dst = (Sint8) (sample / 2);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	96 src += 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	97 dst += 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	98 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	99 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	100 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	101
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	102 case AUDIO_U16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	103 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	104 Uint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	105
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	106 src = cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	107 dst = cvt->buf;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	108 if (SDL_AUDIO_ISBIGENDIAN(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	109 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	110 sample = (Uint16) ((src[0] << 8) \| src[1]) +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	111 (Uint16) ((src[2] << 8) \| src[3]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	112 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	113 dst[1] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	114 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	115 dst[0] = (sample & 0xFF);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	116 src += 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	117 dst += 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	118 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	119 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	120 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	121 sample = (Uint16) ((src[1] << 8) \| src[0]) +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	122 (Uint16) ((src[3] << 8) \| src[2]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	123 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	124 dst[0] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	125 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	126 dst[1] = (sample & 0xFF);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	127 src += 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	128 dst += 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	129 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	130 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	131 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	132 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	133
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	134 case AUDIO_S16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	135 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	136 Uint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	137
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	138 src = cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	139 dst = cvt->buf;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	140 if (SDL_AUDIO_ISBIGENDIAN(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	141 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	142 sample = (Sint16) ((src[0] << 8) \| src[1]) +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	143 (Sint16) ((src[2] << 8) \| src[3]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	144 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	145 dst[1] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	146 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	147 dst[0] = (sample & 0xFF);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	148 src += 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	149 dst += 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	150 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	151 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	152 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	153 sample = (Sint16) ((src[1] << 8) \| src[0]) +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	154 (Sint16) ((src[3] << 8) \| src[2]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	155 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	156 dst[0] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	157 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	158 dst[1] = (sample & 0xFF);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	159 src += 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	160 dst += 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	161 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	162 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	163 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	164 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	165
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	166 case AUDIO_S32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	167 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	168 const Uint32 src = (const Uint32 ) cvt->buf;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	169 Uint32 dst = (Uint32 ) cvt->buf;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	170 if (SDL_AUDIO_ISBIGENDIAN(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	171 for (i = cvt->len_cvt / 8; i; --i, src += 2) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	172 const Sint64 added =
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	173 (((Sint64) (Sint32) SDL_SwapBE32(src[0])) +
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	174 ((Sint64) (Sint32) SDL_SwapBE32(src[1])));
2078 f932ac47a331 Apparently it's possible that MSVC will want to call a built-in function to Ryan C. Gordon <icculus@icculus.org> parents: 2049 diff changeset	175 *(dst++) = SDL_SwapBE32((Uint32) ((Sint32) (added / 2)));
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	176 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	177 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	178 for (i = cvt->len_cvt / 8; i; --i, src += 2) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	179 const Sint64 added =
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	180 (((Sint64) (Sint32) SDL_SwapLE32(src[0])) +
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	181 ((Sint64) (Sint32) SDL_SwapLE32(src[1])));
2078 f932ac47a331 Apparently it's possible that MSVC will want to call a built-in function to Ryan C. Gordon <icculus@icculus.org> parents: 2049 diff changeset	182 *(dst++) = SDL_SwapLE32((Uint32) ((Sint32) (added / 2)));
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	183 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	184 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	185 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	186 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	187
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	188 case AUDIO_F32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	189 {
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	190 const float src = (const float ) cvt->buf;
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	191 float dst = (float ) cvt->buf;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	192 if (SDL_AUDIO_ISBIGENDIAN(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	193 for (i = cvt->len_cvt / 8; i; --i, src += 2) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	194 const float src1 = SDL_SwapFloatBE(src[0]);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	195 const float src2 = SDL_SwapFloatBE(src[1]);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	196 const double added = ((double) src1) + ((double) src2);
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	197 const float halved = (float) (added * 0.5);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	198 *(dst++) = SDL_SwapFloatBE(halved);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	199 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	200 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	201 for (i = cvt->len_cvt / 8; i; --i, src += 2) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	202 const float src1 = SDL_SwapFloatLE(src[0]);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	203 const float src2 = SDL_SwapFloatLE(src[1]);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	204 const double added = ((double) src1) + ((double) src2);
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	205 const float halved = (float) (added * 0.5);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2042 diff changeset	206 *(dst++) = SDL_SwapFloatLE(halved);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	207 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	208 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	209 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	210 break;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	211 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	212
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	213 cvt->len_cvt /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	214 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	215 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	216 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	217 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	218
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	219
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	220 /* Discard top 4 channels */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	221 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	222 SDL_ConvertStrip(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	223 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	224 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	225
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	226 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	227 fprintf(stderr, "Converting down from 6 channels to stereo\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	228 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	229
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	230 #define strip_chans_6_to_2(type) \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	231 { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	232 const type src = (const type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	233 type dst = (type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	234 for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	235 dst[0] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	236 dst[1] = src[1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	237 src += 6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	238 dst += 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	239 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	240 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	241
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	242 /* this function only cares about typesize, and data as a block of bits. */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	243 switch (SDL_AUDIO_BITSIZE(format)) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	244 case 8:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	245 strip_chans_6_to_2(Uint8);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	246 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	247 case 16:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	248 strip_chans_6_to_2(Uint16);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	249 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	250 case 32:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	251 strip_chans_6_to_2(Uint32);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	252 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	253 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	254
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	255 #undef strip_chans_6_to_2
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	256
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	257 cvt->len_cvt /= 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	258 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	259 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	260 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	261 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	262
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	263
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	264 /* Discard top 2 channels of 6 */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	265 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	266 SDL_ConvertStrip_2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	267 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	268 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	269
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	270 #ifdef DEBUG_CONVERT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	271 fprintf(stderr, "Converting 6 down to quad\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	272 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	273
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	274 #define strip_chans_6_to_4(type) \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	275 { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	276 const type src = (const type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	277 type dst = (type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	278 for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	279 dst[0] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	280 dst[1] = src[1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	281 dst[2] = src[2]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	282 dst[3] = src[3]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	283 src += 6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	284 dst += 4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	285 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	286 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	287
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	288 /* this function only cares about typesize, and data as a block of bits. */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	289 switch (SDL_AUDIO_BITSIZE(format)) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	290 case 8:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	291 strip_chans_6_to_4(Uint8);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	292 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	293 case 16:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	294 strip_chans_6_to_4(Uint16);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	295 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	296 case 32:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	297 strip_chans_6_to_4(Uint32);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	298 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	299 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	300
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	301 #undef strip_chans_6_to_4
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	302
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	303 cvt->len_cvt /= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	304 cvt->len_cvt *= 4;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	305 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	306 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	307 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	308 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	309
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	310 /* Duplicate a mono channel to both stereo channels */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	311 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	312 SDL_ConvertStereo(SDL_AudioCVT * cvt, SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	313 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	314 int i;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	315
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	316 #ifdef DEBUG_CONVERT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	317 fprintf(stderr, "Converting to stereo\n");
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	318 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	319
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	320 #define dup_chans_1_to_2(type) \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	321 { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	322 const type src = (const type ) (cvt->buf + cvt->len_cvt); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	323 type dst = (type ) (cvt->buf + cvt->len_cvt * 2); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	324 for (i = cvt->len_cvt / 2; i; --i, --src) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	325 const type val = *src; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	326 dst -= 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	327 dst[0] = dst[1] = val; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	328 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	329 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	330
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	331 /* this function only cares about typesize, and data as a block of bits. */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	332 switch (SDL_AUDIO_BITSIZE(format)) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	333 case 8:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	334 dup_chans_1_to_2(Uint8);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	335 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	336 case 16:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	337 dup_chans_1_to_2(Uint16);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	338 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	339 case 32:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	340 dup_chans_1_to_2(Uint32);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	341 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	342 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	343
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	344 #undef dup_chans_1_to_2
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	345
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	346 cvt->len_cvt *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	347 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	348 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	349 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	350 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	351
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	352
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	353 /* Duplicate a stereo channel to a pseudo-5.1 stream */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	354 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	355 SDL_ConvertSurround(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	356 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	357 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	358
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	359 #ifdef DEBUG_CONVERT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	360 fprintf(stderr, "Converting stereo to surround\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	361 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	362
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	363 switch (format & (SDL_AUDIO_MASK_SIGNED \| SDL_AUDIO_MASK_BITSIZE)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	364 case AUDIO_U8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	365 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	366 Uint8 src, dst, lf, rf, ce;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	367
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	368 src = (Uint8 *) (cvt->buf + cvt->len_cvt);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	369 dst = (Uint8 ) (cvt->buf + cvt->len_cvt 3);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	370 for (i = cvt->len_cvt; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	371 dst -= 6;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	372 src -= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	373 lf = src[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	374 rf = src[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	375 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	376 dst[0] = lf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	377 dst[1] = rf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	378 dst[2] = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	379 dst[3] = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	380 dst[4] = ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	381 dst[5] = ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	382 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	383 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	384 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	385
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	386 case AUDIO_S8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	387 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	388 Sint8 src, dst, lf, rf, ce;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	389
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	390 src = (Sint8 *) cvt->buf + cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	391 dst = (Sint8 ) cvt->buf + cvt->len_cvt 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	392 for (i = cvt->len_cvt; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	393 dst -= 6;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	394 src -= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	395 lf = src[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	396 rf = src[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	397 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	398 dst[0] = lf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	399 dst[1] = rf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	400 dst[2] = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	401 dst[3] = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	402 dst[4] = ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	403 dst[5] = ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	404 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	405 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	406 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	407
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	408 case AUDIO_U16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	409 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	410 Uint8 src, dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	411 Uint16 lf, rf, ce, lr, rr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	412
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	413 src = cvt->buf + cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	414 dst = cvt->buf + cvt->len_cvt * 3;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	415
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	416 if (SDL_AUDIO_ISBIGENDIAN(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	417 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	418 dst -= 12;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	419 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	420 lf = (Uint16) ((src[0] << 8) \| src[1]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	421 rf = (Uint16) ((src[2] << 8) \| src[3]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	422 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	423 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	424 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	425 dst[1] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	426 dst[0] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	427 dst[3] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	428 dst[2] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	429
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	430 dst[1 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	431 dst[0 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	432 dst[3 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	433 dst[2 + 4] = ((rr >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	434
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	435 dst[1 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	436 dst[0 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	437 dst[3 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	438 dst[2 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	439 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	440 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	441 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	442 dst -= 12;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	443 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	444 lf = (Uint16) ((src[1] << 8) \| src[0]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	445 rf = (Uint16) ((src[3] << 8) \| src[2]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	446 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	447 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	448 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	449 dst[0] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	450 dst[1] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	451 dst[2] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	452 dst[3] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	453
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	454 dst[0 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	455 dst[1 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	456 dst[2 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	457 dst[3 + 4] = ((rr >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	458
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	459 dst[0 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	460 dst[1 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	461 dst[2 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	462 dst[3 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	463 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	464 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	465 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	466 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	467
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	468 case AUDIO_S16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	469 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	470 Uint8 src, dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	471 Sint16 lf, rf, ce, lr, rr;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	472
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	473 src = cvt->buf + cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	474 dst = cvt->buf + cvt->len_cvt * 3;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	475
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	476 if (SDL_AUDIO_ISBIGENDIAN(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	477 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	478 dst -= 12;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	479 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	480 lf = (Sint16) ((src[0] << 8) \| src[1]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	481 rf = (Sint16) ((src[2] << 8) \| src[3]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	482 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	483 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	484 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	485 dst[1] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	486 dst[0] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	487 dst[3] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	488 dst[2] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	489
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	490 dst[1 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	491 dst[0 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	492 dst[3 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	493 dst[2 + 4] = ((rr >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	494
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	495 dst[1 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	496 dst[0 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	497 dst[3 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	498 dst[2 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	499 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	500 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	501 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	502 dst -= 12;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	503 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	504 lf = (Sint16) ((src[1] << 8) \| src[0]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	505 rf = (Sint16) ((src[3] << 8) \| src[2]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	506 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	507 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	508 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	509 dst[0] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	510 dst[1] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	511 dst[2] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	512 dst[3] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	513
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	514 dst[0 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	515 dst[1 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	516 dst[2 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	517 dst[3 + 4] = ((rr >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	518
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	519 dst[0 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	520 dst[1 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	521 dst[2 + 8] = (ce & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	522 dst[3 + 8] = ((ce >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	523 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	524 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	525 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	526 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	527
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	528 case AUDIO_S32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	529 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	530 Sint32 lf, rf, ce;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	531 const Uint32 src = (const Uint32 ) cvt->buf + cvt->len_cvt;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	532 Uint32 dst = (Uint32 ) cvt->buf + cvt->len_cvt * 3;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	533
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	534 if (SDL_AUDIO_ISBIGENDIAN(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	535 for (i = cvt->len_cvt / 8; i; --i) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	536 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	537 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	538 lf = (Sint32) SDL_SwapBE32(src[0]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	539 rf = (Sint32) SDL_SwapBE32(src[1]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	540 ce = (lf / 2) + (rf / 2);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	541 dst[0] = SDL_SwapBE32((Uint32) lf);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	542 dst[1] = SDL_SwapBE32((Uint32) rf);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	543 dst[2] = SDL_SwapBE32((Uint32) (lf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	544 dst[3] = SDL_SwapBE32((Uint32) (rf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	545 dst[4] = SDL_SwapBE32((Uint32) ce);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	546 dst[5] = SDL_SwapBE32((Uint32) ce);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	547 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	548 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	549 for (i = cvt->len_cvt / 8; i; --i) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	550 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	551 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	552 lf = (Sint32) SDL_SwapLE32(src[0]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	553 rf = (Sint32) SDL_SwapLE32(src[1]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	554 ce = (lf / 2) + (rf / 2);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	555 dst[0] = src[0];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	556 dst[1] = src[1];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	557 dst[2] = SDL_SwapLE32((Uint32) (lf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	558 dst[3] = SDL_SwapLE32((Uint32) (rf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	559 dst[4] = SDL_SwapLE32((Uint32) ce);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	560 dst[5] = SDL_SwapLE32((Uint32) ce);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	561 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	562 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	563 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	564 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	565
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	566 case AUDIO_F32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	567 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	568 float lf, rf, ce;
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	569 const float src = (const float ) cvt->buf + cvt->len_cvt;
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	570 float dst = (float ) cvt->buf + cvt->len_cvt * 3;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	571
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	572 if (SDL_AUDIO_ISBIGENDIAN(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	573 for (i = cvt->len_cvt / 8; i; --i) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	574 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	575 src -= 2;
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	576 lf = SDL_SwapFloatBE(src[0]);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	577 rf = SDL_SwapFloatBE(src[1]);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	578 ce = (lf * 0.5f) + (rf * 0.5f);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	579 dst[0] = src[0];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	580 dst[1] = src[1];
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	581 dst[2] = SDL_SwapFloatBE(lf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	582 dst[3] = SDL_SwapFloatBE(rf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	583 dst[4] = dst[5] = SDL_SwapFloatBE(ce);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	584 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	585 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	586 for (i = cvt->len_cvt / 8; i; --i) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	587 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	588 src -= 2;
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	589 lf = SDL_SwapFloatLE(src[0]);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	590 rf = SDL_SwapFloatLE(src[1]);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	591 ce = (lf * 0.5f) + (rf * 0.5f);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	592 dst[0] = src[0];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	593 dst[1] = src[1];
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	594 dst[2] = SDL_SwapFloatLE(lf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	595 dst[3] = SDL_SwapFloatLE(rf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	596 dst[4] = dst[5] = SDL_SwapFloatLE(ce);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	597 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	598 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	599 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	600 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	601
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	602 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	603 cvt->len_cvt *= 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	604 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	605 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	606 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	607 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	608
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	609
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	610 /* Duplicate a stereo channel to a pseudo-4.0 stream */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	611 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	612 SDL_ConvertSurround_4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	613 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	614 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	615
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	616 #ifdef DEBUG_CONVERT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	617 fprintf(stderr, "Converting stereo to quad\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	618 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	619
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	620 switch (format & (SDL_AUDIO_MASK_SIGNED \| SDL_AUDIO_MASK_BITSIZE)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	621 case AUDIO_U8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	622 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	623 Uint8 src, dst, lf, rf, ce;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	624
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	625 src = (Uint8 *) (cvt->buf + cvt->len_cvt);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	626 dst = (Uint8 ) (cvt->buf + cvt->len_cvt 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	627 for (i = cvt->len_cvt; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	628 dst -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	629 src -= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	630 lf = src[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	631 rf = src[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	632 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	633 dst[0] = lf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	634 dst[1] = rf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	635 dst[2] = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	636 dst[3] = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	637 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	638 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	639 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	640
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	641 case AUDIO_S8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	642 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	643 Sint8 src, dst, lf, rf, ce;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	644
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	645 src = (Sint8 *) cvt->buf + cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	646 dst = (Sint8 ) cvt->buf + cvt->len_cvt 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	647 for (i = cvt->len_cvt; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	648 dst -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	649 src -= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	650 lf = src[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	651 rf = src[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	652 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	653 dst[0] = lf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	654 dst[1] = rf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	655 dst[2] = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	656 dst[3] = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	657 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	658 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	659 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	660
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	661 case AUDIO_U16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	662 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	663 Uint8 src, dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	664 Uint16 lf, rf, ce, lr, rr;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	665
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	666 src = cvt->buf + cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	667 dst = cvt->buf + cvt->len_cvt * 2;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	668
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	669 if (SDL_AUDIO_ISBIGENDIAN(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	670 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	671 dst -= 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	672 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	673 lf = (Uint16) ((src[0] << 8) \| src[1]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	674 rf = (Uint16) ((src[2] << 8) \| src[3]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	675 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	676 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	677 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	678 dst[1] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	679 dst[0] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	680 dst[3] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	681 dst[2] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	682
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	683 dst[1 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	684 dst[0 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	685 dst[3 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	686 dst[2 + 4] = ((rr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	687 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	688 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	689 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	690 dst -= 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	691 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	692 lf = (Uint16) ((src[1] << 8) \| src[0]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	693 rf = (Uint16) ((src[3] << 8) \| src[2]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	694 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	695 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	696 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	697 dst[0] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	698 dst[1] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	699 dst[2] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	700 dst[3] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	701
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	702 dst[0 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	703 dst[1 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	704 dst[2 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	705 dst[3 + 4] = ((rr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	706 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	707 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	708 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	709 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	710
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	711 case AUDIO_S16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	712 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	713 Uint8 src, dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	714 Sint16 lf, rf, ce, lr, rr;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	715
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	716 src = cvt->buf + cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	717 dst = cvt->buf + cvt->len_cvt * 2;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	718
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	719 if (SDL_AUDIO_ISBIGENDIAN(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	720 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	721 dst -= 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	722 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	723 lf = (Sint16) ((src[0] << 8) \| src[1]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	724 rf = (Sint16) ((src[2] << 8) \| src[3]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	725 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	726 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	727 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	728 dst[1] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	729 dst[0] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	730 dst[3] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	731 dst[2] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	732
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	733 dst[1 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	734 dst[0 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	735 dst[3 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	736 dst[2 + 4] = ((rr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	737 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	738 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	739 for (i = cvt->len_cvt / 4; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	740 dst -= 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	741 src -= 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	742 lf = (Sint16) ((src[1] << 8) \| src[0]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	743 rf = (Sint16) ((src[3] << 8) \| src[2]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	744 ce = (lf / 2) + (rf / 2);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	745 rr = lf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	746 lr = rf - ce;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	747 dst[0] = (lf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	748 dst[1] = ((lf >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	749 dst[2] = (rf & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	750 dst[3] = ((rf >> 8) & 0xFF);
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	751
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	752 dst[0 + 4] = (lr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	753 dst[1 + 4] = ((lr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	754 dst[2 + 4] = (rr & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	755 dst[3 + 4] = ((rr >> 8) & 0xFF);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	756 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	757 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	758 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	759 break;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	760
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	761 case AUDIO_S32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	762 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	763 const Uint32 src = (const Uint32 ) (cvt->buf + cvt->len_cvt);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	764 Uint32 dst = (Uint32 ) (cvt->buf + cvt->len_cvt * 2);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	765 Sint32 lf, rf, ce;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	766
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	767 if (SDL_AUDIO_ISBIGENDIAN(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	768 for (i = cvt->len_cvt / 8; i; --i) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	769 dst -= 4;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	770 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	771 lf = (Sint32) SDL_SwapBE32(src[0]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	772 rf = (Sint32) SDL_SwapBE32(src[1]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	773 ce = (lf / 2) + (rf / 2);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	774 dst[0] = src[0];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	775 dst[1] = src[1];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	776 dst[2] = SDL_SwapBE32((Uint32) (lf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	777 dst[3] = SDL_SwapBE32((Uint32) (rf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	778 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	779 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	780 for (i = cvt->len_cvt / 8; i; --i) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	781 dst -= 4;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	782 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	783 lf = (Sint32) SDL_SwapLE32(src[0]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	784 rf = (Sint32) SDL_SwapLE32(src[1]);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	785 ce = (lf / 2) + (rf / 2);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	786 dst[0] = src[0];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	787 dst[1] = src[1];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	788 dst[2] = SDL_SwapLE32((Uint32) (lf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	789 dst[3] = SDL_SwapLE32((Uint32) (rf - ce));
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	790 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	791 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	792 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	793 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	794 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	795 cvt->len_cvt *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	796 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	797 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	798 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	799 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	800
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	801 /* Convert rate up by multiple of 2 */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	802 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	803 SDL_RateMUL2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	804 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	805 int i;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	806
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	807 #ifdef DEBUG_CONVERT
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	808 fprintf(stderr, "Converting audio rate * 2 (mono)\n");
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	809 #endif
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	810
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	811 #define mul2_mono(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	812 const type src = (const type ) (cvt->buf + cvt->len_cvt); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	813 type dst = (type ) (cvt->buf + (cvt->len_cvt * 2)); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	814 for (i = cvt->len_cvt / sizeof (type); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	815 src--; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	816 dst[-1] = dst[-2] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	817 dst -= 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	818 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	819 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	820
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	821 switch (SDL_AUDIO_BITSIZE(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	822 case 8:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	823 mul2_mono(Uint8);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	824 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	825 case 16:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	826 mul2_mono(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	827 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	828 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	829 mul2_mono(Uint32);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	830 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	831 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	832
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	833 #undef mul2_mono
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	834
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	835 cvt->len_cvt *= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	836 if (cvt->filters[++cvt->filter_index]) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	837 cvt->filters[cvt->filter_index] (cvt, format);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	838 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	839 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	840
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	841
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	842 /* Convert rate up by multiple of 2, for stereo */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	843 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	844 SDL_RateMUL2_c2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	845 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	846 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	847
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	848 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	849 fprintf(stderr, "Converting audio rate * 2 (stereo)\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	850 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	851
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	852 #define mul2_stereo(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	853 const type src = (const type ) (cvt->buf + cvt->len_cvt); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	854 type dst = (type ) (cvt->buf + (cvt->len_cvt * 2)); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	855 for (i = cvt->len_cvt / (sizeof (type) * 2); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	856 const type r = src[-1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	857 const type l = src[-2]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	858 src -= 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	859 dst[-1] = r; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	860 dst[-2] = l; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	861 dst[-3] = r; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	862 dst[-4] = l; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	863 dst -= 4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	864 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	865 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	866
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	867 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	868 case 8:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	869 mul2_stereo(Uint8);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	870 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	871 case 16:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	872 mul2_stereo(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	873 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	874 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	875 mul2_stereo(Uint32);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	876 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	877 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	878
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	879 #undef mul2_stereo
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	880
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	881 cvt->len_cvt *= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	882 if (cvt->filters[++cvt->filter_index]) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	883 cvt->filters[cvt->filter_index] (cvt, format);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	884 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	885 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	886
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	887 /* Convert rate up by multiple of 2, for quad */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	888 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	889 SDL_RateMUL2_c4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	890 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	891 int i;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	892
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	893 #ifdef DEBUG_CONVERT
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	894 fprintf(stderr, "Converting audio rate * 2 (quad)\n");
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	895 #endif
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	896
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	897 #define mul2_quad(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	898 const type src = (const type ) (cvt->buf + cvt->len_cvt); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	899 type dst = (type ) (cvt->buf + (cvt->len_cvt * 2)); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	900 for (i = cvt->len_cvt / (sizeof (type) * 4); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	901 const type c1 = src[-1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	902 const type c2 = src[-2]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	903 const type c3 = src[-3]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	904 const type c4 = src[-4]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	905 src -= 4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	906 dst[-1] = c1; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	907 dst[-2] = c2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	908 dst[-3] = c3; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	909 dst[-4] = c4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	910 dst[-5] = c1; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	911 dst[-6] = c2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	912 dst[-7] = c3; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	913 dst[-8] = c4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	914 dst -= 8; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	915 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	916 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	917
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	918 switch (SDL_AUDIO_BITSIZE(format)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	919 case 8:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	920 mul2_quad(Uint8);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	921 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	922 case 16:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	923 mul2_quad(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	924 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	925 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	926 mul2_quad(Uint32);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	927 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	928 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	929
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	930 #undef mul2_quad
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	931
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	932 cvt->len_cvt *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	933 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	934 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	935 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	936 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	937
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	938
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	939 /* Convert rate up by multiple of 2, for 5.1 */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	940 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	941 SDL_RateMUL2_c6(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	942 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	943 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	944
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	945 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	946 fprintf(stderr, "Converting audio rate * 2 (six channels)\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	947 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	948
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	949 #define mul2_chansix(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	950 const type src = (const type ) (cvt->buf + cvt->len_cvt); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	951 type dst = (type ) (cvt->buf + (cvt->len_cvt * 2)); \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	952 for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	953 const type c1 = src[-1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	954 const type c2 = src[-2]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	955 const type c3 = src[-3]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	956 const type c4 = src[-4]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	957 const type c5 = src[-5]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	958 const type c6 = src[-6]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	959 src -= 6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	960 dst[-1] = c1; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	961 dst[-2] = c2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	962 dst[-3] = c3; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	963 dst[-4] = c4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	964 dst[-5] = c5; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	965 dst[-6] = c6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	966 dst[-7] = c1; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	967 dst[-8] = c2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	968 dst[-9] = c3; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	969 dst[-10] = c4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	970 dst[-11] = c5; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	971 dst[-12] = c6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	972 dst -= 12; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	973 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	974 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	975
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	976 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	977 case 8:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	978 mul2_chansix(Uint8);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	979 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	980 case 16:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	981 mul2_chansix(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	982 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	983 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	984 mul2_chansix(Uint32);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	985 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	986 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	987
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	988 #undef mul2_chansix
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	989
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	990 cvt->len_cvt *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	991 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	992 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	993 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	994 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	995
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	996 /* Convert rate down by multiple of 2 */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	997 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	998 SDL_RateDIV2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	999 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1000 int i;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1001
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1002 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1003 fprintf(stderr, "Converting audio rate / 2 (mono)\n");
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1004 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1005
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1006 #define div2_mono(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1007 const type src = (const type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1008 type dst = (type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1009 for (i = cvt->len_cvt / (sizeof (type) * 2); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1010 dst[0] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1011 src += 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1012 dst++; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1013 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1014 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1015
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1016 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1017 case 8:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1018 div2_mono(Uint8);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1019 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1020 case 16:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1021 div2_mono(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1022 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1023 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1024 div2_mono(Uint32);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1025 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1026 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1027
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1028 #undef div2_mono
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1029
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1030 cvt->len_cvt /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1031 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1032 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1033 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1034 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1035
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1036
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1037 /* Convert rate down by multiple of 2, for stereo */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1038 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1039 SDL_RateDIV2_c2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1040 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1041 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1042
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1043 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1044 fprintf(stderr, "Converting audio rate / 2 (stereo)\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1045 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1046
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1047 #define div2_stereo(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1048 const type src = (const type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1049 type dst = (type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1050 for (i = cvt->len_cvt / (sizeof (type) * 4); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1051 dst[0] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1052 dst[1] = src[1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1053 src += 4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1054 dst += 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1055 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1056 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1057
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1058 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1059 case 8:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1060 div2_stereo(Uint8);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1061 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1062 case 16:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1063 div2_stereo(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1064 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1065 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1066 div2_stereo(Uint32);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1067 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1068 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1069
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1070 #undef div2_stereo
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1071
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1072 cvt->len_cvt /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1073 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1074 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1075 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1076 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1077
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1078
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1079 /* Convert rate down by multiple of 2, for quad */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1080 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1081 SDL_RateDIV2_c4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1082 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1083 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1084
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1085 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1086 fprintf(stderr, "Converting audio rate / 2 (quad)\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1087 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1088
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1089 #define div2_quad(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1090 const type src = (const type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1091 type dst = (type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1092 for (i = cvt->len_cvt / (sizeof (type) * 8); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1093 dst[0] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1094 dst[1] = src[1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1095 dst[2] = src[2]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1096 dst[3] = src[3]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1097 src += 8; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1098 dst += 4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1099 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1100 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1101
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1102 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1103 case 8:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1104 div2_quad(Uint8);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1105 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1106 case 16:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1107 div2_quad(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1108 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1109 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1110 div2_quad(Uint32);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1111 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1112 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1113
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1114 #undef div2_quad
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1115
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1116 cvt->len_cvt /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1117 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1118 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1119 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1120 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1121
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1122 /* Convert rate down by multiple of 2, for 5.1 */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1123 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1124 SDL_RateDIV2_c6(SDL_AudioCVT * cvt, SDL_AudioFormat format)
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1125 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1126 int i;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1127
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1128 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1129 fprintf(stderr, "Converting audio rate / 2 (six channels)\n");
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1130 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1131
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1132 #define div2_chansix(type) { \
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1133 const type src = (const type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1134 type dst = (type ) cvt->buf; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1135 for (i = cvt->len_cvt / (sizeof (type) * 12); i; --i) { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1136 dst[0] = src[0]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1137 dst[1] = src[1]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1138 dst[2] = src[2]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1139 dst[3] = src[3]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1140 dst[4] = src[4]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1141 dst[5] = src[5]; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1142 src += 12; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1143 dst += 6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1144 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1145 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1146
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1147 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1148 case 8:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1149 div2_chansix(Uint8);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1150 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1151 case 16:
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1152 div2_chansix(Uint16);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1153 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1154 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1155 div2_chansix(Uint32);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1156 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1157 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1158
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1159 #undef div_chansix
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1160
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1161 cvt->len_cvt /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1162 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1163 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1164 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1165 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1166
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1167 /* Very slow rate conversion routine */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1168 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1169 SDL_RateSLOW(SDL_AudioCVT * cvt, SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1170 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1171 double ipos;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1172 int i, clen;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1173
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1174 #ifdef DEBUG_CONVERT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1175 fprintf(stderr, "Converting audio rate * %4.4f\n", 1.0 / cvt->rate_incr);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1176 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1177 clen = (int) ((double) cvt->len_cvt / cvt->rate_incr);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1178 if (cvt->rate_incr > 1.0) {
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1179 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1180 case 8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1181 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1182 Uint8 *output;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1183
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1184 output = cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1185 ipos = 0.0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1186 for (i = clen; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1187 *output = cvt->buf[(int) ipos];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1188 ipos += cvt->rate_incr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1189 output += 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1190 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1191 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1192 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1193
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1194 case 16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1195 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1196 Uint16 *output;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1197
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1198 clen &= ~1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1199 output = (Uint16 *) cvt->buf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1200 ipos = 0.0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1201 for (i = clen / 2; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1202 output = ((Uint16 ) cvt->buf)[(int) ipos];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1203 ipos += cvt->rate_incr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1204 output += 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1205 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1206 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1207 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1208
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1209 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1210 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1211 /* !!! FIXME: need 32-bit converter here! */
2130 3ee59c43d784 Fixes for compiling with Visual C++ 8.0 Express Edition Sam Lantinga <slouken@libsdl.org> parents: 2078 diff changeset	1212 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1213 fprintf(stderr, "FIXME: need 32-bit converter here!\n");
2130 3ee59c43d784 Fixes for compiling with Visual C++ 8.0 Express Edition Sam Lantinga <slouken@libsdl.org> parents: 2078 diff changeset	1214 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1215 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1216 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1217 } else {
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1218 switch (SDL_AUDIO_BITSIZE(format)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1219 case 8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1220 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1221 Uint8 *output;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1222
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1223 output = cvt->buf + clen;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1224 ipos = (double) cvt->len_cvt;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1225 for (i = clen; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1226 ipos -= cvt->rate_incr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1227 output -= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1228 *output = cvt->buf[(int) ipos];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1229 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1230 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1231 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1232
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1233 case 16:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1234 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1235 Uint16 *output;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1236
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1237 clen &= ~1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1238 output = (Uint16 *) (cvt->buf + clen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1239 ipos = (double) cvt->len_cvt / 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1240 for (i = clen / 2; i; --i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1241 ipos -= cvt->rate_incr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1242 output -= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1243 output = ((Uint16 ) cvt->buf)[(int) ipos];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1244 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1245 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1246 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1247
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1248 case 32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1249 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1250 /* !!! FIXME: need 32-bit converter here! */
2130 3ee59c43d784 Fixes for compiling with Visual C++ 8.0 Express Edition Sam Lantinga <slouken@libsdl.org> parents: 2078 diff changeset	1251 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1252 fprintf(stderr, "FIXME: need 32-bit converter here!\n");
2130 3ee59c43d784 Fixes for compiling with Visual C++ 8.0 Express Edition Sam Lantinga <slouken@libsdl.org> parents: 2078 diff changeset	1253 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1254 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1255 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1256 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1257
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1258 cvt->len_cvt = clen;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1259 if (cvt->filters[++cvt->filter_index]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1260 cvt->filters[cvt->filter_index] (cvt, format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1261 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1262 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1263
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1264 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1265 SDL_ConvertAudio(SDL_AudioCVT * cvt)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1266 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1267 /* Make sure there's data to convert */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1268 if (cvt->buf == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1269 SDL_SetError("No buffer allocated for conversion");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1270 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1271 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1272 /* Return okay if no conversion is necessary */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1273 cvt->len_cvt = cvt->len;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1274 if (cvt->filters[0] == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1275 return (0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1276 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1277
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1278 /* Set up the conversion and go! */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1279 cvt->filter_index = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1280 cvt->filters[0] (cvt, cvt->src_format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1281 return (0);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1282 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1283
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1284
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1285 static SDL_AudioFilter
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1286 SDL_HandTunedTypeCVT(SDL_AudioFormat src_fmt, SDL_AudioFormat dst_fmt)
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1287 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1288 /*
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1289 * Fill in any future conversions that are specialized to a
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1290 * processor, platform, compiler, or library here.
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1291 */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1292
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1293 return NULL; /* no specialized converter code available. */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1294 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1295
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1296
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1297 /*
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1298 * Find a converter between two data types. We try to select a hand-tuned
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1299 * asm/vectorized/optimized function first, and then fallback to an
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1300 * autogenerated function that is customized to convert between two
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1301 * specific data types.
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1302 */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1303 static int
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1304 SDL_BuildAudioTypeCVT(SDL_AudioCVT * cvt,
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1305 SDL_AudioFormat src_fmt, SDL_AudioFormat dst_fmt)
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1306 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1307 if (src_fmt != dst_fmt) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1308 const Uint16 src_bitsize = SDL_AUDIO_BITSIZE(src_fmt);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1309 const Uint16 dst_bitsize = SDL_AUDIO_BITSIZE(dst_fmt);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1310 SDL_AudioFilter filter = SDL_HandTunedTypeCVT(src_fmt, dst_fmt);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1311
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1312 /* No hand-tuned converter? Try the autogenerated ones. */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1313 if (filter == NULL) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1314 int i;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1315 for (i = 0; sdl_audio_type_filters[i].filter != NULL; i++) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1316 const SDL_AudioTypeFilters *filt = &sdl_audio_type_filters[i];
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1317 if ((filt->src_fmt == src_fmt) && (filt->dst_fmt == dst_fmt)) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1318 filter = filt->filter;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1319 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1320 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1321 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1322
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1323 if (filter == NULL) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1324 return -1; /* Still no matching converter?! */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1325 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1326 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1327
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1328 /* Update (cvt) with filter details... */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1329 cvt->filters[cvt->filter_index++] = filter;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1330 if (src_bitsize < dst_bitsize) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1331 const int mult = (dst_bitsize / src_bitsize);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1332 cvt->len_mult *= mult;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1333 cvt->len_ratio *= mult;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1334 } else if (src_bitsize > dst_bitsize) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1335 cvt->len_ratio /= (src_bitsize / dst_bitsize);
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1336 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1337
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1338 return 1; /* added a converter. */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1339 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1340
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1341 return 0; /* no conversion necessary. */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1342 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1343
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1344 /* Generate the necessary IIR lowpass coefficients for resampling.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1345 Assume that the SDL_AudioCVT struct is already set up with
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1346 the correct values for len_mult and len_div, and use the
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1347 type of dst_format. Also assume the buffer is allocated.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1348 Note the buffer needs to be 6 units long.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1349 For now, use RBJ's cookbook coefficients. It might be more
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1350 optimal to create a Butterworth filter, but this is more difficult.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1351 */
2760 02aa80d7905f Updated Visual C++ build Sam Lantinga <slouken@libsdl.org> parents: 2738 diff changeset	1352 #if 0
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1353 int
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1354 SDL_BuildIIRLowpass(SDL_AudioCVT * cvt, SDL_AudioFormat format)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1355 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1356 float fc; /* cutoff frequency */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1357 float coeff[6]; /* floating point iir coefficients b0, b1, b2, a0, a1, a2 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1358 float scale;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1359 float w0, alpha, cosw0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1360 int i;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1361
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1362 /* The higher Q is, the higher CUTOFF can be. Need to find a good balance to avoid aliasing */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1363 static const float Q = 5.0f;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1364 static const float CUTOFF = 0.4f;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1365
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1366 fc = (cvt->len_mult >
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1367 cvt->len_div) ? CUTOFF / (float) cvt->len_mult : CUTOFF /
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1368 (float) cvt->len_div;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1369
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1370 w0 = 2.0f * M_PI * fc;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1371 cosw0 = cosf(w0);
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1372 alpha = sinf(w0) / (2.0f * Q);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1373
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1374 /* Compute coefficients, normalizing by a0 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1375 scale = 1.0f / (1.0f + alpha);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1376
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1377 coeff[0] = (1.0f - cosw0) / 2.0f * scale;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1378 coeff[1] = (1.0f - cosw0) * scale;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1379 coeff[2] = coeff[0];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1380
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1381 coeff[3] = 1.0f; /* a0 is normalized to 1 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1382 coeff[4] = -2.0f * cosw0 * scale;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1383 coeff[5] = (1.0f - alpha) * scale;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1384
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1385 /* Copy the coefficients to the struct. If necessary, convert coefficients to fixed point, using the range (-2.0, 2.0) */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1386 #define convert_fixed(type, fix) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1387 type cvt_coeff = (type )cvt->coeff; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1388 for(i = 0; i < 6; ++i) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1389 cvt_coeff[i] = fix(coeff[i]); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1390 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1391 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1392
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1393 if (SDL_AUDIO_ISFLOAT(format) && SDL_AUDIO_BITSIZE(format) == 32) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1394 float cvt_coeff = (float ) cvt->coeff;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1395 for (i = 0; i < 6; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1396 cvt_coeff[i] = coeff[i];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1397 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1398 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1399 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1400 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1401 convert_fixed(Uint8, SDL_Make_2_6);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1402 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1403 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1404 convert_fixed(Uint16, SDL_Make_2_14);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1405 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1406 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1407 convert_fixed(Uint32, SDL_Make_2_30);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1408 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1409 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1410 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1411
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1412 #ifdef DEBUG_CONVERT
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1413 #define debug_iir(type) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1414 type cvt_coeff = (type )cvt->coeff; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1415 for(i = 0; i < 6; ++i) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1416 printf("coeff[%u] = %f = 0x%x\n", i, coeff[i], cvt_coeff[i]); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1417 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1418 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1419 if (SDL_AUDIO_ISFLOAT(format) && SDL_AUDIO_BITSIZE(format) == 32) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1420 float cvt_coeff = (float ) cvt->coeff;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1421 for (i = 0; i < 6; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1422 printf("coeff[%u] = %f = %f\n", i, coeff[i], cvt_coeff[i]);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1423 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1424 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1425 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1426 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1427 debug_iir(Uint8);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1428 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1429 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1430 debug_iir(Uint16);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1431 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1432 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1433 debug_iir(Uint32);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1434 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1435 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1436 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1437 #undef debug_iir
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1438 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1439
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1440 /* Initialize the state buffer to all zeroes, and set initial position */
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1441 SDL_memset(cvt->state_buf, 0, 4 * SDL_AUDIO_BITSIZE(format) / 4);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1442 cvt->state_pos = 0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1443 #undef convert_fixed
2760 02aa80d7905f Updated Visual C++ build Sam Lantinga <slouken@libsdl.org> parents: 2738 diff changeset	1444
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2760 diff changeset	1445 return 0;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1446 }
2760 02aa80d7905f Updated Visual C++ build Sam Lantinga <slouken@libsdl.org> parents: 2738 diff changeset	1447 #endif
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1448
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1449 /* Apply the lowpass IIR filter to the given SDL_AudioCVT struct */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1450 /* This was implemented because it would be much faster than the fir filter,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1451 but it doesn't seem to have a steep enough cutoff so we'd need several
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1452 cascaded biquads, which probably isn't a great idea. Therefore, this
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1453 function can probably be discarded.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1454 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1455 static void
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1456 SDL_FilterIIR(SDL_AudioCVT * cvt, SDL_AudioFormat format)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1457 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1458 Uint32 i, n;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1459
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1460 /* TODO: Check that n is calculated right */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1461 n = 8 * cvt->len_cvt / SDL_AUDIO_BITSIZE(format);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1462
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1463 /* Note that the coefficients are 2_x and the input is 1_x. Do we need to shift left at the end here? The right shift temp = buf[n] >> 1 needs to depend on whether the type is signed or not for sign extension. */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1464 /* cvt->state_pos = 1: state[0] = x_n-1, state[1] = x_n-2, state[2] = y_n-1, state[3] - y_n-2 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1465 #define iir_fix(type, mult) {\
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1466 type coeff = (type )cvt->coeff; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1467 type state = (type )cvt->state_buf; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1468 type buf = (type )cvt->buf; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1469 type temp; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1470 for(i = 0; i < n; ++i) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1471 temp = buf[i] >> 1; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1472 if(cvt->state_pos) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1473 buf[i] = mult(coeff[0], temp) + mult(coeff[1], state[0]) + mult(coeff[2], state[1]) - mult(coeff[4], state[2]) - mult(coeff[5], state[3]); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1474 state[1] = temp; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1475 state[3] = buf[i]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1476 cvt->state_pos = 0; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1477 } else { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1478 buf[i] = mult(coeff[0], temp) + mult(coeff[1], state[1]) + mult(coeff[2], state[0]) - mult(coeff[4], state[3]) - mult(coeff[5], state[2]); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1479 state[0] = temp; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1480 state[2] = buf[i]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1481 cvt->state_pos = 1; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1482 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1483 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1484 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1485 /* Need to test to see if the previous method or this one is faster */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1486 /*#define iir_fix(type, mult) {\
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1487 type coeff = (type )cvt->coeff; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1488 type state = (type )cvt->state_buf; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1489 type buf = (type )cvt->buf; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1490 type temp; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1491 for(i = 0; i < n; ++i) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1492 temp = buf[i] >> 1; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1493 buf[i] = mult(coeff[0], temp) + mult(coeff[1], state[0]) + mult(coeff[2], state[1]) - mult(coeff[4], state[2]) - mult(coeff[5], state[3]); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1494 state[1] = state[0]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1495 state[0] = temp; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1496 state[3] = state[2]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1497 state[2] = buf[i]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1498 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1499 }*/
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1500
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1501 if (SDL_AUDIO_ISFLOAT(format) && SDL_AUDIO_BITSIZE(format) == 32) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1502 float coeff = (float ) cvt->coeff;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1503 float state = (float ) cvt->state_buf;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1504 float buf = (float ) cvt->buf;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1505 float temp;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1506
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1507 for (i = 0; i < n; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1508 /* y[n] = b0 * x[n] + b1 * x[n-1] + b2 * x[n-2] - a1 * y[n-1] - a[2] * y[n-2] */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1509 temp = buf[i];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1510 if (cvt->state_pos) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1511 buf[i] =
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1512 coeff[0] * buf[n] + coeff[1] * state[0] +
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1513 coeff[2] * state[1] - coeff[4] * state[2] -
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1514 coeff[5] * state[3];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1515 state[1] = temp;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1516 state[3] = buf[i];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1517 cvt->state_pos = 0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1518 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1519 buf[i] =
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1520 coeff[0] * buf[n] + coeff[1] * state[1] +
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1521 coeff[2] * state[0] - coeff[4] * state[3] -
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1522 coeff[5] * state[2];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1523 state[0] = temp;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1524 state[2] = buf[i];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1525 cvt->state_pos = 1;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1526 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1527 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1528 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1529 /* Treat everything as signed! */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1530 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1531 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1532 iir_fix(Sint8, SDL_FixMpy8);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1533 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1534 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1535 iir_fix(Sint16, SDL_FixMpy16);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1536 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1537 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1538 iir_fix(Sint32, SDL_FixMpy32);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1539 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1540 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1541 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1542 #undef iir_fix
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1543 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1544
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1545 /* Apply the windowed sinc FIR filter to the given SDL_AudioCVT struct.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1546 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1547 static void
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1548 SDL_FilterFIR(SDL_AudioCVT * cvt, SDL_AudioFormat format)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1549 {
2881 c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1550 /* !!! FIXME: (n) is incorrect, or my allocation of state_buf is wrong. */
c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1551 const int n = 8 * cvt->len_cvt / SDL_AUDIO_BITSIZE(format);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1552 int m = cvt->len_sinc;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1553 int i, j;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1554
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1555 /*
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1556 Note: We can make a big optimization here by taking advantage
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1557 of the fact that the signal is zero stuffed, so we can do
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1558 significantly fewer multiplications and additions. However, this
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1559 depends on the zero stuffing ratio, so it may not pay off. This would
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1560 basically be a polyphase filter.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1561 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1562 /* One other way to do this fast is to look at the fir filter from a different angle:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1563 After we zero stuff, we have input of all zeroes, except for every len_mult
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1564 sample. If we choose a sinc length equal to len_mult, then the fir filter becomes
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1565 much more simple: we're just taking a windowed sinc, shifting it to start at each
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1566 len_mult sample, and scaling it by the value of that sample. If we do this, then
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1567 we don't even need to worry about the sample histories, and the inner loop here is
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1568 unnecessary. This probably sacrifices some quality but could really speed things up as well.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1569 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1570 /* We only calculate the values of samples which are 0 (mod len_div) because
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1571 those are the only ones used. All the other ones are discarded in the
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1572 third step of resampling. This is a huge speedup. As a warning, though,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1573 if for some reason this is used elsewhere where there are no samples discarded,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1574 the output will not be corrrect if len_div is not 1. To make this filter a
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1575 generic FIR filter, simply remove the if statement "if(i % cvt->len_div == 0)"
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1576 around the inner loop so that every sample is processed.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1577 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1578 /* This is basically just a FIR filter. i.e. for input x_n and m coefficients,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1579 y_n = x_nsinc_0 + x_(n-1)sinc_1 + x_(n-2)sinc_2 + ... + x_(n-m+1)sinc_(m-1)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1580 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1581 #define filter_sinc(type, mult) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1582 type sinc = (type )cvt->coeff; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1583 type state = (type )cvt->state_buf; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1584 type buf = (type )cvt->buf; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1585 for(i = 0; i < n; ++i) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1586 state[cvt->state_pos] = buf[i]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1587 buf[i] = 0; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1588 if( i % cvt->len_div == 0 ) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1589 for(j = 0; j < m; ++j) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1590 buf[i] += mult(sinc[j], state[(cvt->state_pos + j) % m]); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1591 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1592 }\
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1593 cvt->state_pos = (cvt->state_pos + 1) % m; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1594 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1595 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1596
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1597 if (SDL_AUDIO_ISFLOAT(format) && SDL_AUDIO_BITSIZE(format) == 32) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1598 filter_sinc(float, SDL_FloatMpy);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1599 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1600 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1601 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1602 filter_sinc(Sint8, SDL_FixMpy8);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1603 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1604 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1605 filter_sinc(Sint16, SDL_FixMpy16);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1606 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1607 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1608 filter_sinc(Sint32, SDL_FixMpy32);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1609 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1610 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1611 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1612
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1613 #undef filter_sinc
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1614
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1615 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1616
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1617 /* Generate the necessary windowed sinc filter for resampling.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1618 Assume that the SDL_AudioCVT struct is already set up with
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1619 the correct values for len_mult and len_div, and use the
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1620 type of dst_format. Also assume the buffer is allocated.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1621 Note the buffer needs to be m+1 units long.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1622 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1623 int
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1624 SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1625 unsigned int m)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1626 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1627 float fSinc; / floating point sinc buffer, to be converted to fixed point */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1628 float fc; /* cutoff frequency */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1629 float two_pi_fc, two_pi_over_m, four_pi_over_m, m_over_two;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1630 float norm_sum, norm_fact;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1631 unsigned int i;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1632
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1633 /* Set the length */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1634 cvt->len_sinc = m + 1;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1635
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1636 /* Allocate the floating point windowed sinc. */
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1637 fSinc = SDL_stack_alloc(float, (m + 1));
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1638 if (fSinc == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1639 return -1;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1640 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1641
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1642 /* Set up the filter parameters */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1643 fc = (cvt->len_mult >
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1644 cvt->len_div) ? 0.5f / (float) cvt->len_mult : 0.5f /
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1645 (float) cvt->len_div;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1646 #ifdef DEBUG_CONVERT
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1647 printf("Lowpass cutoff frequency = %f\n", fc);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1648 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1649 two_pi_fc = 2.0f * M_PI * fc;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1650 two_pi_over_m = 2.0f * M_PI / (float) m;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1651 four_pi_over_m = 2.0f * two_pi_over_m;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1652 m_over_two = (float) m / 2.0f;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1653 norm_sum = 0.0f;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1654
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1655 for (i = 0; i <= m; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1656 if (i == m / 2) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1657 fSinc[i] = two_pi_fc;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1658 } else {
3012 7e30c2dc7783 Fixed Visual C++ release build for Visual C++ 2005 Sam Lantinga <slouken@libsdl.org> parents: 2883 diff changeset	1659 fSinc[i] = SDL_sinf(two_pi_fc * ((float) i - m_over_two)) / ((float) i - m_over_two);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1660 /* Apply blackman window */
3012 7e30c2dc7783 Fixed Visual C++ release build for Visual C++ 2005 Sam Lantinga <slouken@libsdl.org> parents: 2883 diff changeset	1661 fSinc[i] = 0.42f - 0.5f SDL_cosf(two_pi_over_m * (float) i) + 0.08f * SDL_cosf(four_pi_over_m * (float) i);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1662 }
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2760 diff changeset	1663 norm_sum += fSinc[i] < 0 ? -fSinc[i] : fSinc[i]; /* fabs(fSinc[i]); */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1664 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1665
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1666 norm_fact = 1.0f / norm_sum;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1667
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1668 #define convert_fixed(type, fix) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1669 type dst = (type )cvt->coeff; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1670 for( i = 0; i <= m; ++i ) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1671 dst[i] = fix(fSinc[i] * norm_fact); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1672 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1673 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1674
2880 3c2f56e433a8 Allocate SDL_AudioCVT::coeff before using it. Ryan C. Gordon <icculus@icculus.org> parents: 2879 diff changeset	1675 /* !!! FIXME: this memory leaks. */
2883 11626a53e7bc indent Sam Lantinga <slouken@libsdl.org> parents: 2881 diff changeset	1676 cvt->coeff =
11626a53e7bc indent Sam Lantinga <slouken@libsdl.org> parents: 2881 diff changeset	1677 (Uint8 ) SDL_malloc((SDL_AUDIO_BITSIZE(format) / 8) (m + 1));
2880 3c2f56e433a8 Allocate SDL_AudioCVT::coeff before using it. Ryan C. Gordon <icculus@icculus.org> parents: 2879 diff changeset	1678 if (cvt->coeff == NULL) {
3c2f56e433a8 Allocate SDL_AudioCVT::coeff before using it. Ryan C. Gordon <icculus@icculus.org> parents: 2879 diff changeset	1679 return -1;
3c2f56e433a8 Allocate SDL_AudioCVT::coeff before using it. Ryan C. Gordon <icculus@icculus.org> parents: 2879 diff changeset	1680 }
3c2f56e433a8 Allocate SDL_AudioCVT::coeff before using it. Ryan C. Gordon <icculus@icculus.org> parents: 2879 diff changeset	1681
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1682 /* If we're using floating point, we only need to normalize */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1683 if (SDL_AUDIO_ISFLOAT(format) && SDL_AUDIO_BITSIZE(format) == 32) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1684 float fDest = (float ) cvt->coeff;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1685 for (i = 0; i <= m; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1686 fDest[i] = fSinc[i] * norm_fact;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1687 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1688 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1689 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1690 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1691 convert_fixed(Uint8, SDL_Make_1_7);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1692 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1693 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1694 convert_fixed(Uint16, SDL_Make_1_15);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1695 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1696 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1697 convert_fixed(Uint32, SDL_Make_1_31);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1698 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1699 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1700 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1701
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1702 /* Initialize the state buffer to all zeroes, and set initial position */
2881 c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1703 /* !!! FIXME: this memory leaks. */
2883 11626a53e7bc indent Sam Lantinga <slouken@libsdl.org> parents: 2881 diff changeset	1704 cvt->state_buf =
11626a53e7bc indent Sam Lantinga <slouken@libsdl.org> parents: 2881 diff changeset	1705 (Uint8 ) SDL_malloc(cvt->len_sinc SDL_AUDIO_BITSIZE(format) / 4);
2881 c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1706 if (cvt->state_buf == NULL) {
c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1707 return -1;
c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1708 }
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1709 SDL_memset(cvt->state_buf, 0,
2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1710 cvt->len_sinc * SDL_AUDIO_BITSIZE(format) / 4);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1711 cvt->state_pos = 0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1712
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1713 /* Clean up */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1714 #undef convert_fixed
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1715 SDL_stack_free(fSinc);
2738 79c1bd651f04 Fixed a bunch of compile warnings on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	1716
79c1bd651f04 Fixed a bunch of compile warnings on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	1717 return 0;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1718 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1719
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1720 /* This is used to reduce the resampling ratio */
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	1721 static __inline__ int
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1722 SDL_GCD(int a, int b)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1723 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1724 int temp;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1725 while (b != 0) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1726 temp = a % b;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1727 a = b;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1728 b = temp;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1729 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1730 return a;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1731 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1732
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1733 /* Perform proper resampling. This is pretty slow but it's the best-sounding method. */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1734 static void SDLCALL
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1735 SDL_Resample(SDL_AudioCVT * cvt, SDL_AudioFormat format)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1736 {
3012 7e30c2dc7783 Fixed Visual C++ release build for Visual C++ 2005 Sam Lantinga <slouken@libsdl.org> parents: 2883 diff changeset	1737 int i;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1738
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1739 #ifdef DEBUG_CONVERT
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1740 printf("Converting audio rate via proper resampling (mono)\n");
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1741 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1742
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1743 #define zerostuff_mono(type) { \
2881 c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1744 const type src = (const type ) (cvt->buf + cvt->len); \
c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1745 type dst = (type ) (cvt->buf + (cvt->len * cvt->len_mult)); \
c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1746 for (i = cvt->len / sizeof (type); i; --i) { \
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1747 src--; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1748 dst[-1] = src[0]; \
3012 7e30c2dc7783 Fixed Visual C++ release build for Visual C++ 2005 Sam Lantinga <slouken@libsdl.org> parents: 2883 diff changeset	1749 if (cvt->len_mult > 1) { \
7e30c2dc7783 Fixed Visual C++ release build for Visual C++ 2005 Sam Lantinga <slouken@libsdl.org> parents: 2883 diff changeset	1750 SDL_memset(dst-cvt->len_mult, 0, cvt->len_mult-1); \
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1751 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1752 dst -= cvt->len_mult; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1753 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1754 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1755
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1756 #define discard_mono(type) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1757 const type src = (const type ) (cvt->buf); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1758 type dst = (type ) (cvt->buf); \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1759 for (i = 0; i < (cvt->len_cvt / sizeof(type)) / cvt->len_div; ++i) { \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1760 dst[0] = src[0]; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1761 src += cvt->len_div; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1762 ++dst; \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1763 } \
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1764 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1765
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1766 /* Step 1: Zero stuff the conversion buffer. This upsamples by a factor of len_mult,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1767 creating aliasing at frequencies above the original nyquist frequency.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1768 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1769 #ifdef DEBUG_CONVERT
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1770 printf("Zero-stuffing by a factor of %u\n", cvt->len_mult);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1771 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1772 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1773 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1774 zerostuff_mono(Uint8);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1775 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1776 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1777 zerostuff_mono(Uint16);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1778 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1779 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1780 zerostuff_mono(Uint32);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1781 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1782 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1783
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1784 cvt->len_cvt *= cvt->len_mult;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1785
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1786 /* Step 2: Use a windowed sinc FIR filter (lowpass filter) to remove the alias
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1787 frequencies. This is the slow part.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1788 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1789 SDL_FilterFIR(cvt, format);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1790
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1791 /* Step 3: Now downsample by discarding samples. */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1792
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1793 #ifdef DEBUG_CONVERT
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1794 printf("Discarding samples by a factor of %u\n", cvt->len_div);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1795 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1796 switch (SDL_AUDIO_BITSIZE(format)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1797 case 8:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1798 discard_mono(Uint8);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1799 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1800 case 16:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1801 discard_mono(Uint16);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1802 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1803 case 32:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1804 discard_mono(Uint32);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1805 break;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1806 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1807
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1808 #undef zerostuff_mono
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1809 #undef discard_mono
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1810
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1811 cvt->len_cvt /= cvt->len_div;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1812
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1813 if (cvt->filters[++cvt->filter_index]) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1814 cvt->filters[cvt->filter_index] (cvt, format);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1815 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1816 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1817
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1818
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1819 /* Creates a set of audio filters to convert from one format to another.
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1820 Returns -1 if the format conversion is not supported, 0 if there's
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1821 no conversion needed, or 1 if the audio filter is set up.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1822 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1823
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1824 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1825 SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1826 SDL_AudioFormat src_fmt, Uint8 src_channels, int src_rate,
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1827 SDL_AudioFormat dst_fmt, Uint8 dst_channels, int dst_rate)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1828 {
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1829 /* there are no unsigned types over 16 bits, so catch this upfront. */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1830 if ((SDL_AUDIO_BITSIZE(src_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(src_fmt))) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1831 return -1;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1832 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1833 if ((SDL_AUDIO_BITSIZE(dst_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(dst_fmt))) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1834 return -1;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1835 }
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1836 #ifdef DEBUG_CONVERT
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1837 printf("Build format %04x->%04x, channels %u->%u, rate %d->%d\n",
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1838 src_fmt, dst_fmt, src_channels, dst_channels, src_rate, dst_rate);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1839 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1840
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1841 /* Start off with no conversion necessary */
2879 3ff86c46d324 Use SDL_zerop instead of SDL_memset. Ryan C. Gordon <icculus@icculus.org> parents: 2878 diff changeset	1842 SDL_zerop(cvt);
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1843 cvt->src_format = src_fmt;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1844 cvt->dst_format = dst_fmt;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1845 cvt->needed = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1846 cvt->filter_index = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1847 cvt->filters[0] = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1848 cvt->len_mult = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1849 cvt->len_ratio = 1.0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1850
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1851 /* Convert data types, if necessary. Updates (cvt). */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1852 if (SDL_BuildAudioTypeCVT(cvt, src_fmt, dst_fmt) == -1)
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	1853 return -1; /* shouldn't happen, but just in case... */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1854
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1855 /* Channel conversion */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1856 if (src_channels != dst_channels) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1857 if ((src_channels == 1) && (dst_channels > 1)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1858 cvt->filters[cvt->filter_index++] = SDL_ConvertStereo;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1859 cvt->len_mult *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1860 src_channels = 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1861 cvt->len_ratio *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1862 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1863 if ((src_channels == 2) && (dst_channels == 6)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1864 cvt->filters[cvt->filter_index++] = SDL_ConvertSurround;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1865 src_channels = 6;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1866 cvt->len_mult *= 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1867 cvt->len_ratio *= 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1868 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1869 if ((src_channels == 2) && (dst_channels == 4)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1870 cvt->filters[cvt->filter_index++] = SDL_ConvertSurround_4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1871 src_channels = 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1872 cvt->len_mult *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1873 cvt->len_ratio *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1874 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1875 while ((src_channels * 2) <= dst_channels) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1876 cvt->filters[cvt->filter_index++] = SDL_ConvertStereo;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1877 cvt->len_mult *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1878 src_channels *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1879 cvt->len_ratio *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1880 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1881 if ((src_channels == 6) && (dst_channels <= 2)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1882 cvt->filters[cvt->filter_index++] = SDL_ConvertStrip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1883 src_channels = 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1884 cvt->len_ratio /= 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1885 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1886 if ((src_channels == 6) && (dst_channels == 4)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1887 cvt->filters[cvt->filter_index++] = SDL_ConvertStrip_2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1888 src_channels = 4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1889 cvt->len_ratio /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1890 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1891 /* This assumes that 4 channel audio is in the format:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1892 Left {front/back} + Right {front/back}
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1893 so converting to L/R stereo works properly.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1894 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1895 while (((src_channels % 2) == 0) &&
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1896 ((src_channels / 2) >= dst_channels)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1897 cvt->filters[cvt->filter_index++] = SDL_ConvertMono;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1898 src_channels /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1899 cvt->len_ratio /= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1900 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1901 if (src_channels != dst_channels) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1902 /* Uh oh.. */ ;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1903 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1904 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1905
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1906 /* Do rate conversion */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1907 if (src_rate != dst_rate) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1908 int rate_gcd;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1909 rate_gcd = SDL_GCD(src_rate, dst_rate);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1910 cvt->len_mult = dst_rate / rate_gcd;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1911 cvt->len_div = src_rate / rate_gcd;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1912 cvt->len_ratio = (double) cvt->len_mult / (double) cvt->len_div;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1913 cvt->filters[cvt->filter_index++] = SDL_Resample;
2881 c8d203ef4335 More resampling fixes. Ryan C. Gordon <icculus@icculus.org> parents: 2880 diff changeset	1914 /* !!! FIXME: check return value. */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1915 SDL_BuildWindowedSinc(cvt, dst_fmt, 768);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1916 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1917
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1918 /*
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1919 cvt->rate_incr = 0.0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1920 if ((src_rate / 100) != (dst_rate / 100)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1921 Uint32 hi_rate, lo_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1922 int len_mult;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1923 double len_ratio;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1924 SDL_AudioFilter rate_cvt = NULL;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1925
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1926 if (src_rate > dst_rate) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1927 hi_rate = src_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1928 lo_rate = dst_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1929 switch (src_channels) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1930 case 1:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1931 rate_cvt = SDL_RateDIV2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1932 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1933 case 2:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1934 rate_cvt = SDL_RateDIV2_c2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1935 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1936 case 4:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1937 rate_cvt = SDL_RateDIV2_c4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1938 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1939 case 6:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1940 rate_cvt = SDL_RateDIV2_c6;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1941 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1942 default:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1943 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1944 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1945 len_mult = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1946 len_ratio = 0.5;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1947 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1948 hi_rate = dst_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1949 lo_rate = src_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1950 switch (src_channels) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1951 case 1:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1952 rate_cvt = SDL_RateMUL2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1953 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1954 case 2:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1955 rate_cvt = SDL_RateMUL2_c2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1956 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1957 case 4:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1958 rate_cvt = SDL_RateMUL2_c4;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1959 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1960 case 6:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1961 rate_cvt = SDL_RateMUL2_c6;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1962 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1963 default:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1964 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1965 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1966 len_mult = 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1967 len_ratio = 2.0;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1968 }*/
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1969 /* If hi_rate = lo_rate2^x then conversion is easy /
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1970 /* while (((lo_rate * 2) / 100) <= (hi_rate / 100)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1971 cvt->filters[cvt->filter_index++] = rate_cvt;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1972 cvt->len_mult *= len_mult;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1973 lo_rate *= 2;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1974 cvt->len_ratio *= len_ratio;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1975 } */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1976 /* We may need a slow conversion here to finish up */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1977 /* if ((lo_rate / 100) != (hi_rate / 100)) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1978 #if 1 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1979 /* The problem with this is that if the input buffer is
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1980 say 1K, and the conversion rate is say 1.1, then the
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1981 output buffer is 1.1K, which may not be an acceptable
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1982 buffer size for the audio driver (not a power of 2)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1983 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1984 /* For now, punt and hope the rate distortion isn't great.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1985 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1986 /*#else
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1987 if (src_rate < dst_rate) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1988 cvt->rate_incr = (double) lo_rate / hi_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1989 cvt->len_mult *= 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1990 cvt->len_ratio /= cvt->rate_incr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1991 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1992 cvt->rate_incr = (double) hi_rate / lo_rate;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1993 cvt->len_ratio *= cvt->rate_incr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1994 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1995 cvt->filters[cvt->filter_index++] = SDL_RateSLOW;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1996 #endif
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1997 }
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1998 }*/
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1999
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2000 /* Set up the filter information */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2001 if (cvt->filter_index != 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2002 cvt->needed = 1;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	2003 cvt->src_format = src_fmt;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	2004 cvt->dst_format = dst_fmt;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2005 cvt->len = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2006 cvt->buf = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2007 cvt->filters[cvt->filter_index] = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2008 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2009 return (cvt->needed);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2010 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2011
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2012 #undef SDL_FixMpy8
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2013 #undef SDL_FixMpy16
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2014 #undef SDL_FixMpy32
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2015 #undef SDL_FloatMpy
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2016 #undef SDL_Make_1_7
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2017 #undef SDL_Make_1_15
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2018 #undef SDL_Make_1_31
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2019 #undef SDL_Make_2_6
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2020 #undef SDL_Make_2_14
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2021 #undef SDL_Make_2_30
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	2022
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	2023 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/audio/SDL_audiocvt.c @ 3012:7e30c2dc7783