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

annotate src/audio/SDL_audiocvt.c @ 5053:b5b42be9333c

Fixed bug #1026 Vittorio Giovara 2010-07-16 19:09:28 PDT i was reading SDL_renderer_gles and i noticed that every time we there is some gl call the gl state is modified with a couple of glEnableClientState()/glDisableClientState. While this is completely fine for desktops systems, this is a major performace kill on mobile devices, right where opengles is implemented. Normal practice in this case is to update the glstate once, keep it always the same and disable/enable other states only in very special occasions. On the web there's plenty of documentation (on the top of my head http://developer.apple.com/iphone/library/documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/Performance/Performance.html#//apple_ref/doc/uid/TP40008793-CH105-SW5 ) and i personally tried this. I modified my code and got a 10 fps boost, then modified SDL_render_gles and shifted from 40 fps to 50 fps alone -- considering that i started from ~30fps i got an 80% performance increase with this technique. I have attached a dif of my changes, hope that it will be included in mainstream.

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 19 Jan 2011 23:56:16 -0800
parents	f7b03b6838cb
children	b530ef003506

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
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3491 diff changeset	3 Copyright (C) 1997-2010 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
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 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
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	31 /* !!! FIXME */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	32 #ifndef assert
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	33 #define assert(x)
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	34 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	35
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	36 /* 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	37 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	38 SDL_ConvertMono(SDL_AudioCVT * cvt, SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	39 {
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	40 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	41 Sint32 sample;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	42
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	43 #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	44 fprintf(stderr, "Converting to mono\n");
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	45 #endif
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	46 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	47 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	48 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	49 Uint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	50
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	51 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	52 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	53 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	54 sample = src[0] + src[1];
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	55 *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	56 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	57 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	58 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	59 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	60 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	61
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	62 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	63 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	64 Sint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	65
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	66 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	67 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	68 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	69 sample = src[0] + src[1];
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	70 *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	71 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	72 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	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 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	75 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	76
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	77 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	78 {
c121d94672cb SDL 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 Uint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	80
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 = 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	82 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	83 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	84 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	85 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	86 (Uint16) ((src[2] << 8) \| src[3]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	87 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	88 dst[1] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	89 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	90 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	91 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	92 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	93 }
c121d94672cb SDL 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 } 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	95 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	96 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	97 (Uint16) ((src[3] << 8) \| src[2]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	98 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	99 dst[0] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	100 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	101 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	102 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	103 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	104 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	105 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 break;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	108
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 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	110 {
c121d94672cb SDL 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 Uint8 src, dst;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	112
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	113 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	114 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	115 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	116 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	117 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	118 (Sint16) ((src[2] << 8) \| src[3]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	119 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	120 dst[1] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	121 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	122 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	123 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	124 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	125 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	126 } 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	127 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	128 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	129 (Sint16) ((src[3] << 8) \| src[2]);
2042 3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	130 sample /= 2;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	131 dst[0] = (sample & 0xFF);
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	132 sample >>= 8;
3908e1f808e1 Fixed bug #292 Sam Lantinga <slouken@libsdl.org> parents: 2014 diff changeset	133 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	134 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	135 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	136 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	137 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	140
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	141 case AUDIO_S32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	142 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	143 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	144 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	145 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	146 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	147 const Sint64 added =
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	148 (((Sint64) (Sint32) SDL_SwapBE32(src[0])) +
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	149 ((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	150 *(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	151 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	152 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	153 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	154 const Sint64 added =
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	155 (((Sint64) (Sint32) SDL_SwapLE32(src[0])) +
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	156 ((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	157 *(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	158 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	159 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	160 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	161 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	162
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	163 case AUDIO_F32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	164 {
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	165 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	166 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	167 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	168 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	169 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	170 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	171 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	172 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	173 *(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	174 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	175 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	176 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	177 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	178 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	179 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	180 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	181 *(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	182 }
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 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	186 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	187
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	188 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	189 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	190 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	191 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	192 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	193
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	194
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	195 /* 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	196 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	197 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	198 {
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	199 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	200
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	201 #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	202 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	203 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	204
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	205 #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	206 { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	207 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	208 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	209 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	210 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	211 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	212 src += 6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	213 dst += 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	214 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	215 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	216
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	217 /* 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	218 switch (SDL_AUDIO_BITSIZE(format)) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	219 case 8:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	220 strip_chans_6_to_2(Uint8);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	221 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	222 case 16:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	223 strip_chans_6_to_2(Uint16);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	224 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	225 case 32:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	226 strip_chans_6_to_2(Uint32);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	227 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	228 }
942 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 #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	231
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	232 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	233 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	234 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	235 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	236 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	237
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	238
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	239 /* 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	240 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	241 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	242 {
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	243 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	244
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	245 #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	246 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	247 #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	248
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	249 #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	250 { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	251 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	252 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	253 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	254 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	255 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	256 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	257 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	258 src += 6; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	259 dst += 4; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	260 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	261 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	262
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	263 /* 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	264 switch (SDL_AUDIO_BITSIZE(format)) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	265 case 8:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	266 strip_chans_6_to_4(Uint8);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	267 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	268 case 16:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	269 strip_chans_6_to_4(Uint16);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	270 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	271 case 32:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	272 strip_chans_6_to_4(Uint32);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	273 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	274 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	275
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	276 #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	277
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	278 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	279 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	280 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	281 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	282 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	283 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	284
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	285 /* 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	286 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	287 SDL_ConvertStereo(SDL_AudioCVT * cvt, SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	288 {
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	289 int i;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	290
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	291 #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	292 fprintf(stderr, "Converting to stereo\n");
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	293 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	294
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	295 #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	296 { \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	297 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	298 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	299 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	300 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	301 dst -= 2; \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	302 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	303 } \
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	304 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	305
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	306 /* 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	307 switch (SDL_AUDIO_BITSIZE(format)) {
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	308 case 8:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	309 dup_chans_1_to_2(Uint8);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	310 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	311 case 16:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	312 dup_chans_1_to_2(Uint16);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	313 break;
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	314 case 32:
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	315 dup_chans_1_to_2(Uint32);
8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	316 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	317 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	318
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	319 #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	320
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	321 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	322 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	323 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	324 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	325 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	326
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	327
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	328 /* 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	329 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	330 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	331 {
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	332 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	333
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	334 #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	335 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	336 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	337
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	338 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	339 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	340 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	341 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	342
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	343 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	344 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	345 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	346 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	347 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	348 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	349 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	350 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	351 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	352 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	353 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	354 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	355 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	356 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	357 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	358 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	359 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	360
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	361 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	362 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	363 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	364
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	365 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	366 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	367 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	368 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	369 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	370 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	371 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	372 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	373 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	374 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	375 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	376 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	377 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	378 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	379 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 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	382
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	383 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	384 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	385 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	386 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	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 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	389 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	390
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	391 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	392 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	393 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	394 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	395 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	396 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	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 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	399 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	400 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	401 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	402 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	403 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	404
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	405 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	406 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	407 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	408 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	409
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	410 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	411 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	412 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	413 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	414 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	415 } 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	416 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	417 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	418 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	419 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	420 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	421 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	422 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	423 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	424 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	425 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	426 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	427 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	428
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	429 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	430 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	431 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	432 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	433
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	434 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	435 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	436 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	437 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	438 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 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	442
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	443 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	444 {
c121d94672cb SDL 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 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	446 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	447
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	448 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	449 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	450
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	451 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	452 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	453 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	454 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	455 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	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464
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	465 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	466 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	467 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	468 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	469
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	470 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	471 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	472 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	473 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	474 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	475 } 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	476 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	477 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	478 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	479 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	480 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	481 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	482 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	483 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	484 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	485 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	486 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	487 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	488
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	489 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	490 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	491 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	492 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	493
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	494 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	495 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	496 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	497 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	498 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 break;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	502
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	503 case AUDIO_S32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	504 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	505 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	506 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	507 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	508
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	509 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	510 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	511 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	512 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	513 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	514 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	515 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	516 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	517 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	518 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	519 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	520 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	521 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	522 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	523 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	524 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	525 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	526 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	527 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	528 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	529 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	530 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	531 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	532 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	533 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	534 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	535 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	536 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	537 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	538 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	539 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	540
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	541 case AUDIO_F32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	542 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	543 float lf, rf, ce;
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	544 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	545 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	546
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	547 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	548 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	549 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	550 src -= 2;
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	551 lf = SDL_SwapFloatBE(src[0]);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	552 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	553 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	554 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	555 dst[1] = src[1];
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	556 dst[2] = SDL_SwapFloatBE(lf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	557 dst[3] = SDL_SwapFloatBE(rf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	558 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	559 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	560 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	561 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	562 dst -= 6;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	563 src -= 2;
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	564 lf = SDL_SwapFloatLE(src[0]);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	565 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	566 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	567 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	568 dst[1] = src[1];
2014 7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	569 dst[2] = SDL_SwapFloatLE(lf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	570 dst[3] = SDL_SwapFloatLE(rf - ce);
7abe37467fa5 Replaced unions with calls to SDL_SwapFloat... Ryan C. Gordon <icculus@icculus.org> parents: 1985 diff changeset	571 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	572 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	573 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	574 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	575 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	576
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	577 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	578 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	579 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	580 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	581 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	582 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	583
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	584
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	585 /* 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	586 static void SDLCALL
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	587 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	588 {
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	589 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	590
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	591 #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	592 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	593 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	594
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	595 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	596 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	597 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	598 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	599
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	600 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	601 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	602 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	603 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	604 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	605 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	606 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	607 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	608 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	609 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	610 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	611 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	612 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	613 }
c121d94672cb SDL 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 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	615
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	616 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	617 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	618 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	619
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	620 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	621 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	622 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	623 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	624 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	625 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	626 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	627 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	628 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	629 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	630 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	631 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	632 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 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	635
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	636 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	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 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	639 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	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 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	642 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	643
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	644 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	645 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	646 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	647 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	648 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	649 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	650 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	651 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	652 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	653 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	654 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	655 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	656 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	657
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	658 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	659 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	660 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	661 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	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 } 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	664 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	665 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	666 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	667 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	668 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	669 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	670 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	671 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	672 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	673 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	674 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	675 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	676
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	677 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	678 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	679 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	680 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	681 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	682 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 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	685
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	686 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	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 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	689 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	690
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	691 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	692 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	693
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	694 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	695 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	696 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	697 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	698 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	699 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	700 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	701 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	702 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	703 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	704 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	705 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	706 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	707
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	708 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	709 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	710 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	711 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	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 } 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	714 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	715 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	716 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	717 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	718 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	719 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	720 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	721 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	722 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	723 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	724 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	725 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	726
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	727 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	728 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	729 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	730 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	731 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	732 }
c121d94672cb SDL 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 }
c121d94672cb SDL 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 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	735
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	736 case AUDIO_S32:
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	737 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	738 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	739 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	740 Sint32 lf, rf, ce;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	741
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	742 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	743 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	744 dst -= 4;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	745 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	746 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	747 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	748 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	749 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	750 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	751 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	752 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	753 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	754 } else {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	755 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	756 dst -= 4;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	757 src -= 2;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	758 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	759 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	760 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	761 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	762 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	763 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	764 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	765 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	766 }
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	767 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	768 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	769 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	770 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	771 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	772 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	773 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	774 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	775
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	776
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	777 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	778 SDL_ConvertAudio(SDL_AudioCVT * cvt)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	779 {
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	780 /* !!! FIXME: (cvt) should be const; stack-copy it here. */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	781 /* !!! FIXME: (actually, we can't...len_cvt needs to be updated. Grr.) */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	782
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	783 /* 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	784 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	785 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	786 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	787 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	788 /* 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	789 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	790 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	791 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	792 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	793
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	794 /* 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	795 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	796 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	797 return (0);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	798 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	799
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	800
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	801 static SDL_AudioFilter
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	802 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	803 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	804 /*
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	805 * 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	806 * 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	807 */
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	808
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	809 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	810 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	811
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	812
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	813 /*
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	814 * 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	815 * 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	816 * 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	817 * specific data types.
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 static int
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	820 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	821 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	822 {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	823 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	824 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	825 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	826 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	827
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	828 /* 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	829 if (filter == NULL) {
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	830 int i;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	831 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	832 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	833 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	834 filter = filt->filter;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	835 break;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	836 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	837 }
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 if (filter == NULL) {
3491 1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	840 SDL_SetError("No conversion available for these formats");
1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	841 return -1;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	842 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	843 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	844
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	845 /* 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	846 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	847 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	848 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	849 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	850 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	851 } 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	852 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	853 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	854
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	855 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	856 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	857
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	858 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	859 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	860
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	861
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	862 static SDL_AudioFilter
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	863 SDL_HandTunedResampleCVT(SDL_AudioCVT * cvt, int dst_channels,
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	864 int src_rate, int dst_rate)
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	865 {
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	866 /*
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	867 * Fill in any future conversions that are specialized to a
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	868 * processor, platform, compiler, or library here.
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	869 */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	870
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	871 return NULL; /* no specialized converter code available. */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	872 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	873
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	874 static int
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	875 SDL_FindFrequencyMultiple(const int src_rate, const int dst_rate)
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	876 {
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	877 int retval = 0;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	878
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	879 /* If we only built with the arbitrary resamplers, ignore multiples. */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	880 #if !LESS_RESAMPLERS
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	881 int lo, hi;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	882 int div;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	883
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	884 assert(src_rate != 0);
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	885 assert(dst_rate != 0);
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	886 assert(src_rate != dst_rate);
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	887
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	888 if (src_rate < dst_rate) {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	889 lo = src_rate;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	890 hi = dst_rate;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	891 } else {
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	892 lo = dst_rate;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	893 hi = src_rate;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	894 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	895
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	896 /* zero means "not a supported multiple" ... we only do 2x and 4x. */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	897 if ((hi % lo) != 0)
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	898 return 0; /* not a multiple. */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	899
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	900 div = hi / lo;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	901 retval = ((div == 2) \|\| (div == 4)) ? div : 0;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	902 #endif
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	903
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	904 return retval;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	905 }
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	906
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	907 static int
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	908 SDL_BuildAudioResampleCVT(SDL_AudioCVT * cvt, int dst_channels,
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	909 int src_rate, int dst_rate)
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	910 {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	911 if (src_rate != dst_rate) {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	912 SDL_AudioFilter filter = SDL_HandTunedResampleCVT(cvt, dst_channels,
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	913 src_rate, dst_rate);
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	914
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	915 /* No hand-tuned converter? Try the autogenerated ones. */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	916 if (filter == NULL) {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	917 int i;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	918 const int upsample = (src_rate < dst_rate) ? 1 : 0;
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	919 const int multiple =
62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	920 SDL_FindFrequencyMultiple(src_rate, dst_rate);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	921
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	922 for (i = 0; sdl_audio_rate_filters[i].filter != NULL; i++) {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	923 const SDL_AudioRateFilters *filt = &sdl_audio_rate_filters[i];
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	924 if ((filt->fmt == cvt->dst_format) &&
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	925 (filt->channels == dst_channels) &&
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	926 (filt->upsample == upsample) &&
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	927 (filt->multiple == multiple)) {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	928 filter = filt->filter;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	929 break;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	930 }
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	931 }
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	932
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	933 if (filter == NULL) {
3491 1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	934 SDL_SetError("No conversion available for these rates");
1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	935 return -1;
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	936 }
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	937 }
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	938
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	939 /* Update (cvt) with filter details... */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	940 cvt->filters[cvt->filter_index++] = filter;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	941 if (src_rate < dst_rate) {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	942 const double mult = ((double) dst_rate) / ((double) src_rate);
3032 77c3e67f0740 Fixed Visual C++ build Sam Lantinga <slouken@libsdl.org> parents: 3021 diff changeset	943 cvt->len_mult *= (int) SDL_ceil(mult);
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	944 cvt->len_ratio *= mult;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	945 } else {
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	946 cvt->len_ratio /= ((double) src_rate) / ((double) dst_rate);
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	947 }
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	948
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	949 return 1; /* added a converter. */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	950 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	951
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	952 return 0; /* no conversion necessary. */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	953 }
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	954
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	955
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	956 /* 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	957 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	958 no conversion needed, or 1 if the audio filter is set up.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	959 */
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	960
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	961 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	962 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	963 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	964 SDL_AudioFormat dst_fmt, Uint8 dst_channels, int dst_rate)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	965 {
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	966 /*
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	967 * !!! FIXME: reorder filters based on which grow/shrink the buffer.
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	968 * !!! FIXME: ideally, we should do everything that shrinks the buffer
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	969 * !!! FIXME: first, so we don't have to process as many bytes in a given
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	970 * !!! FIXME: filter and abuse the CPU cache less. This might not be as
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	971 * !!! FIXME: good in practice as it sounds in theory, though.
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	972 */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	973
3491 1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	974 /* there are no unsigned types over 16 bits, so catch this up front. */
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	975 if ((SDL_AUDIO_BITSIZE(src_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(src_fmt))) {
3491 1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	976 SDL_SetError("Invalid source format");
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	977 return -1;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	978 }
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	979 if ((SDL_AUDIO_BITSIZE(dst_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(dst_fmt))) {
3491 1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	980 SDL_SetError("Invalid destination format");
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	981 return -1;
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	982 }
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	983
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	984 /* prevent possible divisions by zero, etc. */
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	985 if ((src_rate == 0) \|\| (dst_rate == 0)) {
3491 1192adfc6d52 Add error messages for failure cases Sam Lantinga <slouken@libsdl.org> parents: 3040 diff changeset	986 SDL_SetError("Source or destination rate is zero");
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	987 return -1;
f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	988 }
1985 8055185ae4ed Added source color and alpha modulation support. Sam Lantinga <slouken@libsdl.org> parents: 1982 diff changeset	989 #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	990 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	991 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	992 #endif
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	993
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	994 /* 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	995 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	996 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	997 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	998 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	999 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	1000 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	1001 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	1002 cvt->len_ratio = 1.0;
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	1003 cvt->rate_incr = ((double) dst_rate) / ((double) src_rate);
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	1004
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1005 /* Convert data types, if necessary. Updates (cvt). */
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	1006 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	1007 return -1; /* shouldn't happen, but just in case... */
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	1008 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1009
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	1010 /* 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	1011 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	1012 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	1013 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	1014 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	1015 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	1016 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	1017 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1018 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	1019 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	1020 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	1021 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	1022 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	1023 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1024 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	1025 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	1026 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	1027 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	1028 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	1029 }
c121d94672cb SDL 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 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	1031 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	1032 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	1033 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	1034 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	1035 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1036 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	1037 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	1038 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	1039 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	1040 }
c121d94672cb SDL 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 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	1042 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	1043 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	1044 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	1045 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1046 /* 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	1047 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	1048 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	1049 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1050 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	1051 ((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	1052 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	1053 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	1054 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	1055 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1056 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	1057 /* 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	1058 }
c121d94672cb SDL 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 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1060
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	1061 /* Do rate conversion, if necessary. Updates (cvt). */
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	1062 if (SDL_BuildAudioResampleCVT(cvt, dst_channels, src_rate, dst_rate) ==
62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	1063 -1) {
3021 f3dcf04412cf First shot at new audio resampling code. Ryan C. Gordon <icculus@icculus.org> parents: 3012 diff changeset	1064 return -1; /* shouldn't happen, but just in case... */
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1065 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1066
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 /* 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	1068 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	1069 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	1070 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	1071 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	1072 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	1073 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	1074 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	1075 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	1076 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	1077 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1078
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	1079
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	1080 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/audio/SDL_audiocvt.c @ 5053:b5b42be9333c