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

annotate src/audio/SDL_audiocvt.c @ 1769:290b5baf2fca

Fixed bug #215 The current SVN trunk is missing the SDLCALL specifier at numerous locations. It has to be added for all (possibly user provided) callbacks. I stumbled over this while creating a makefile for the OpenWatcom compiler for Win32.

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 07 May 2006 03:40:06 +0000
parents	5f52867ba65c
children	782fd950bd46 c121d94672cb 4e23720e4278

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
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1011 diff changeset	3 Copyright (C) 1997-2006 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"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23
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"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	28
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	29 /* Effectively mix right and left channels into a single channel */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	30 void SDLCALL SDL_ConvertMono(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	31 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	32 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	33 Sint32 sample;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	34
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	35 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	36 fprintf(stderr, "Converting to mono\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	37 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	38 switch (format&0x8018) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	39
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	40 case AUDIO_U8: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	41 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	42
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	43 src = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	44 dst = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	45 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	46 sample = src[0] + src[1];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	47 if ( sample > 255 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	48 *dst = 255;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	49 } else {
1428 5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	50 *dst = (Uint8)sample;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	51 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	52 src += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	53 dst += 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	54 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	55 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	56 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	57
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	58 case AUDIO_S8: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	59 Sint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	60
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	61 src = (Sint8 *)cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	62 dst = (Sint8 *)cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	63 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	64 sample = src[0] + src[1];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	65 if ( sample > 127 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	66 *dst = 127;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	67 } else
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	68 if ( sample < -128 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	69 *dst = -128;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	70 } else {
1428 5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	71 *dst = (Sint8)sample;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	72 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	73 src += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	74 dst += 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	75 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	76 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	77 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	78
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	79 case AUDIO_U16: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	80 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	81
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	82 src = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	83 dst = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	84 if ( (format & 0x1000) == 0x1000 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	85 for ( i=cvt->len_cvt/4; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	86 sample = (Uint16)((src[0]<<8)\|src[1])+
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	87 (Uint16)((src[2]<<8)\|src[3]);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	88 if ( sample > 65535 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	89 dst[0] = 0xFF;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	90 dst[1] = 0xFF;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	91 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	92 dst[1] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	93 sample >>= 8;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	94 dst[0] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	95 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	96 src += 4;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	97 dst += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	98 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	99 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	100 for ( i=cvt->len_cvt/4; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	101 sample = (Uint16)((src[1]<<8)\|src[0])+
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	102 (Uint16)((src[3]<<8)\|src[2]);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	103 if ( sample > 65535 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	104 dst[0] = 0xFF;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	105 dst[1] = 0xFF;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	107 dst[0] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	108 sample >>= 8;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	109 dst[1] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	110 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	111 src += 4;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	112 dst += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	113 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	114 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	115 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	116 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	117
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	118 case AUDIO_S16: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	119 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	120
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	121 src = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	122 dst = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	123 if ( (format & 0x1000) == 0x1000 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	124 for ( i=cvt->len_cvt/4; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	125 sample = (Sint16)((src[0]<<8)\|src[1])+
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	126 (Sint16)((src[2]<<8)\|src[3]);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	127 if ( sample > 32767 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	128 dst[0] = 0x7F;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	129 dst[1] = 0xFF;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	130 } else
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	131 if ( sample < -32768 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	132 dst[0] = 0x80;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	133 dst[1] = 0x00;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	134 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	135 dst[1] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	136 sample >>= 8;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	137 dst[0] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	138 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	139 src += 4;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	140 dst += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	141 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	142 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	143 for ( i=cvt->len_cvt/4; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	144 sample = (Sint16)((src[1]<<8)\|src[0])+
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	145 (Sint16)((src[3]<<8)\|src[2]);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	146 if ( sample > 32767 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	147 dst[1] = 0x7F;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	148 dst[0] = 0xFF;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	149 } else
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	150 if ( sample < -32768 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	151 dst[1] = 0x80;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	152 dst[0] = 0x00;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	153 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	154 dst[0] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	155 sample >>= 8;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	156 dst[1] = (sample&0xFF);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	157 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	158 src += 4;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	159 dst += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	160 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	161 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	162 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	163 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	164 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	165 cvt->len_cvt /= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	166 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	167 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	168 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	169 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	170
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	171 /* Discard top 4 channels */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	172 void SDLCALL SDL_ConvertStrip(SDL_AudioCVT *cvt, Uint16 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	173 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	174 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	175 Sint32 lsample, rsample;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	176
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	177 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	178 fprintf(stderr, "Converting down to stereo\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	179 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	180 switch (format&0x8018) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	181
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	182 case AUDIO_U8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	183 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	184
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	185 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	186 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	187 for ( i=cvt->len_cvt/6; i; --i ) {
1428 5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	188 dst[0] = src[0];
5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	189 dst[1] = src[1];
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	190 src += 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	191 dst += 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	192 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	193 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	194 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	195
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	196 case AUDIO_S8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	197 Sint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	198
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	199 src = (Sint8 *)cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	200 dst = (Sint8 *)cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	201 for ( i=cvt->len_cvt/6; i; --i ) {
1428 5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	202 dst[0] = src[0];
5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	203 dst[1] = src[1];
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	204 src += 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	205 dst += 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	206 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	207 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	208 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	209
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	210 case AUDIO_U16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	211 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	212
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	213 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	214 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	215 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	216 for ( i=cvt->len_cvt/12; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	217 lsample = (Uint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	218 rsample = (Uint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	219 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	220 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	221 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	222 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	223 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	224 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	225 src += 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	226 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	227 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	228 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	229 for ( i=cvt->len_cvt/12; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	230 lsample = (Uint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	231 rsample = (Uint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	232 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	233 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	234 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	235 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	236 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	237 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	238 src += 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	239 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	240 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	241 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	242 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	243 break;
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 case AUDIO_S16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	246 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	247
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	248 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	249 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	250 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	251 for ( i=cvt->len_cvt/12; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	252 lsample = (Sint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	253 rsample = (Sint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	254 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	255 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	256 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	257 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	258 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	259 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	260 src += 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	261 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	262 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	263 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	264 for ( i=cvt->len_cvt/12; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	265 lsample = (Sint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	266 rsample = (Sint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	267 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	268 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	269 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	270 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	271 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	272 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	273 src += 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	274 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	275 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	276 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	277 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	278 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	279 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	280 cvt->len_cvt /= 3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	281 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	282 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	283 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	284 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	285
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	286
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	287 /* Discard top 2 channels of 6 */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	288 void SDLCALL SDL_ConvertStrip_2(SDL_AudioCVT *cvt, Uint16 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	289 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	290 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	291 Sint32 lsample, rsample;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	292
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	293 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	294 fprintf(stderr, "Converting 6 down to quad\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	295 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	296 switch (format&0x8018) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	297
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	298 case AUDIO_U8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	299 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	300
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	301 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	302 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	303 for ( i=cvt->len_cvt/4; i; --i ) {
1428 5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	304 dst[0] = src[0];
5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	305 dst[1] = src[1];
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	306 src += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	307 dst += 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	308 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	309 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	310 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	311
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	312 case AUDIO_S8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	313 Sint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	314
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	315 src = (Sint8 *)cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	316 dst = (Sint8 *)cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	317 for ( i=cvt->len_cvt/4; i; --i ) {
1428 5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	318 dst[0] = src[0];
5f52867ba65c Update for Visual C++ 6.0 Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	319 dst[1] = src[1];
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	320 src += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	321 dst += 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	322 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	323 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	324 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	325
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	326 case AUDIO_U16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	327 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	328
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	329 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	330 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	331 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	332 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	333 lsample = (Uint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	334 rsample = (Uint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	335 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	336 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	337 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	338 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	339 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	340 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	341 src += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	342 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	343 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	344 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	345 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	346 lsample = (Uint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	347 rsample = (Uint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	348 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	349 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	350 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	351 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	352 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	353 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	354 src += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	355 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	356 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	357 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	358 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	359 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	360
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	361 case AUDIO_S16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	362 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	363
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	364 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	365 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	366 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	367 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	368 lsample = (Sint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	369 rsample = (Sint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	370 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	371 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	372 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	373 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	374 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	375 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	376 src += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	377 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	378 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	379 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	380 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	381 lsample = (Sint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	382 rsample = (Sint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	383 dst[0] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	384 lsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	385 dst[1] = (lsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	386 dst[2] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	387 rsample >>= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	388 dst[3] = (rsample&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	389 src += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	390 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	391 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	392 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	393 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	394 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	395 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	396 cvt->len_cvt /= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	397 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	398 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	399 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	400 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	401
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	402 /* Duplicate a mono channel to both stereo channels */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	403 void SDLCALL SDL_ConvertStereo(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	404 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	405 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	406
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	407 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	408 fprintf(stderr, "Converting to stereo\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	409 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	410 if ( (format & 0xFF) == 16 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	411 Uint16 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	412
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	413 src = (Uint16 *)(cvt->buf+cvt->len_cvt);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	414 dst = (Uint16 )(cvt->buf+cvt->len_cvt2);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	415 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	416 dst -= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	417 src -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	418 dst[0] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	419 dst[1] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	420 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	421 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	422 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	423
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	424 src = cvt->buf+cvt->len_cvt;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	425 dst = cvt->buf+cvt->len_cvt*2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	426 for ( i=cvt->len_cvt; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	427 dst -= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	428 src -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	429 dst[0] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	430 dst[1] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	431 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	432 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	433 cvt->len_cvt *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	434 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	435 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	436 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	437 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	438
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	439
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	440 /* Duplicate a stereo channel to a pseudo-5.1 stream */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	441 void SDLCALL SDL_ConvertSurround(SDL_AudioCVT *cvt, Uint16 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	442 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	443 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	444
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	445 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	446 fprintf(stderr, "Converting stereo to surround\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	447 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	448 switch (format&0x8018) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	449
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	450 case AUDIO_U8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	451 Uint8 src, dst, lf, rf, ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	452
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	453 src = (Uint8 *)(cvt->buf+cvt->len_cvt);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	454 dst = (Uint8 )(cvt->buf+cvt->len_cvt3);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	455 for ( i=cvt->len_cvt; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	456 dst -= 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	457 src -= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	458 lf = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	459 rf = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	460 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	461 dst[0] = lf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	462 dst[1] = rf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	463 dst[2] = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	464 dst[3] = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	465 dst[4] = ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	466 dst[5] = ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	467 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	468 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	469 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	470
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	471 case AUDIO_S8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	472 Sint8 src, dst, lf, rf, ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	473
1011 4095d9ca23f2 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 942 diff changeset	474 src = (Sint8 *)cvt->buf+cvt->len_cvt;
4095d9ca23f2 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 942 diff changeset	475 dst = (Sint8 )cvt->buf+cvt->len_cvt3;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	476 for ( i=cvt->len_cvt; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	477 dst -= 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	478 src -= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	479 lf = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	480 rf = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	481 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	482 dst[0] = lf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	483 dst[1] = rf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	484 dst[2] = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	485 dst[3] = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	486 dst[4] = ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	487 dst[5] = ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	488 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	489 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	490 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	491
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	492 case AUDIO_U16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	493 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	494 Uint16 lf, rf, ce, lr, rr;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	495
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	496 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	497 dst = cvt->buf+cvt->len_cvt*3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	498
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	499 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	500 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	501 dst -= 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	502 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	503 lf = (Uint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	504 rf = (Uint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	505 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	506 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	507 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	508 dst[1] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	509 dst[0] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	510 dst[3] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	511 dst[2] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	512
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	513 dst[1+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	514 dst[0+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	515 dst[3+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	516 dst[2+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	517
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	518 dst[1+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	519 dst[0+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	520 dst[3+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	521 dst[2+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	522 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	523 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	524 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	525 dst -= 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	526 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	527 lf = (Uint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	528 rf = (Uint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	529 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	530 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	531 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	532 dst[0] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	533 dst[1] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	534 dst[2] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	535 dst[3] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	536
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	537 dst[0+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	538 dst[1+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	539 dst[2+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	540 dst[3+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	541
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	542 dst[0+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	543 dst[1+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	544 dst[2+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	545 dst[3+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	546 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	547 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	548 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	549 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	550
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	551 case AUDIO_S16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	552 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	553 Sint16 lf, rf, ce, lr, rr;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	554
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	555 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	556 dst = cvt->buf+cvt->len_cvt*3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	557
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	558 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	559 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	560 dst -= 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	561 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	562 lf = (Sint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	563 rf = (Sint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	564 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	565 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	566 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	567 dst[1] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	568 dst[0] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	569 dst[3] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	570 dst[2] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	571
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	572 dst[1+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	573 dst[0+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	574 dst[3+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	575 dst[2+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	576
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	577 dst[1+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	578 dst[0+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	579 dst[3+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	580 dst[2+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	581 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	582 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	583 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	584 dst -= 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	585 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	586 lf = (Sint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	587 rf = (Sint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	588 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	589 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	590 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	591 dst[0] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	592 dst[1] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	593 dst[2] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	594 dst[3] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	595
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	596 dst[0+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	597 dst[1+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	598 dst[2+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	599 dst[3+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	600
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	601 dst[0+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	602 dst[1+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	603 dst[2+8] = (ce&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	604 dst[3+8] = ((ce>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	605 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	606 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	607 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	608 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	609 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	610 cvt->len_cvt *= 3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	611 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	612 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	613 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	614 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	615
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	616
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	617 /* Duplicate a stereo channel to a pseudo-4.0 stream */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	618 void SDLCALL SDL_ConvertSurround_4(SDL_AudioCVT *cvt, Uint16 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	619 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	620 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	621
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	622 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	623 fprintf(stderr, "Converting stereo to quad\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	624 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	625 switch (format&0x8018) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	626
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	627 case AUDIO_U8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	628 Uint8 src, dst, lf, rf, ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	629
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	630 src = (Uint8 *)(cvt->buf+cvt->len_cvt);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	631 dst = (Uint8 )(cvt->buf+cvt->len_cvt2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	632 for ( i=cvt->len_cvt; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	633 dst -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	634 src -= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	635 lf = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	636 rf = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	637 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	638 dst[0] = lf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	639 dst[1] = rf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	640 dst[2] = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	641 dst[3] = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	642 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	643 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	644 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	645
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	646 case AUDIO_S8: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	647 Sint8 src, dst, lf, rf, ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	648
1011 4095d9ca23f2 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 942 diff changeset	649 src = (Sint8 *)cvt->buf+cvt->len_cvt;
4095d9ca23f2 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 942 diff changeset	650 dst = (Sint8 )cvt->buf+cvt->len_cvt2;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	651 for ( i=cvt->len_cvt; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	652 dst -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	653 src -= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	654 lf = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	655 rf = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	656 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	657 dst[0] = lf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	658 dst[1] = rf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	659 dst[2] = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	660 dst[3] = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	661 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	662 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	663 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	664
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	665 case AUDIO_U16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	666 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	667 Uint16 lf, rf, ce, lr, rr;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	668
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	669 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	670 dst = cvt->buf+cvt->len_cvt*2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	671
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	672 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	673 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	674 dst -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	675 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	676 lf = (Uint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	677 rf = (Uint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	678 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	679 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	680 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	681 dst[1] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	682 dst[0] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	683 dst[3] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	684 dst[2] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	685
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	686 dst[1+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	687 dst[0+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	688 dst[3+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	689 dst[2+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	690 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	691 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	692 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	693 dst -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	694 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	695 lf = (Uint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	696 rf = (Uint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	697 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	698 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	699 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	700 dst[0] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	701 dst[1] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	702 dst[2] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	703 dst[3] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	704
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	705 dst[0+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	706 dst[1+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	707 dst[2+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	708 dst[3+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	709 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	710 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	711 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	712 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	713
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	714 case AUDIO_S16: {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	715 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	716 Sint16 lf, rf, ce, lr, rr;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	717
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	718 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	719 dst = cvt->buf+cvt->len_cvt*2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	720
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	721 if ( (format & 0x1000) == 0x1000 ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	722 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	723 dst -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	724 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	725 lf = (Sint16)((src[0]<<8)\|src[1]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	726 rf = (Sint16)((src[2]<<8)\|src[3]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	727 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	728 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	729 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	730 dst[1] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	731 dst[0] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	732 dst[3] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	733 dst[2] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	734
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	735 dst[1+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	736 dst[0+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	737 dst[3+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	738 dst[2+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	739 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	740 } else {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	741 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	742 dst -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	743 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	744 lf = (Sint16)((src[1]<<8)\|src[0]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	745 rf = (Sint16)((src[3]<<8)\|src[2]);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	746 ce = (lf/2) + (rf/2);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	747 rr = lf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	748 lr = rf - ce;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	749 dst[0] = (lf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	750 dst[1] = ((lf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	751 dst[2] = (rf&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	752 dst[3] = ((rf>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	753
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	754 dst[0+4] = (lr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	755 dst[1+4] = ((lr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	756 dst[2+4] = (rr&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	757 dst[3+4] = ((rr>>8)&0xFF);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	758 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	759 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	760 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	761 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	762 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	763 cvt->len_cvt *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	764 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	765 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	766 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	767 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	768
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	769
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	770 /* Convert 8-bit to 16-bit - LSB */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	771 void SDLCALL SDL_Convert16LSB(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	772 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	773 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	774 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	775
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	776 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	777 fprintf(stderr, "Converting to 16-bit LSB\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	778 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	779 src = cvt->buf+cvt->len_cvt;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	780 dst = cvt->buf+cvt->len_cvt*2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	781 for ( i=cvt->len_cvt; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	782 src -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	783 dst -= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	784 dst[1] = *src;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	785 dst[0] = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	786 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	787 format = ((format & ~0x0008) \| AUDIO_U16LSB);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	788 cvt->len_cvt *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	789 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	790 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	791 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	792 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	793 /* Convert 8-bit to 16-bit - MSB */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	794 void SDLCALL SDL_Convert16MSB(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	795 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	796 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	797 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	798
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	799 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	800 fprintf(stderr, "Converting to 16-bit MSB\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	801 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	802 src = cvt->buf+cvt->len_cvt;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	803 dst = cvt->buf+cvt->len_cvt*2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	804 for ( i=cvt->len_cvt; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	805 src -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	806 dst -= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	807 dst[0] = *src;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	808 dst[1] = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	809 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	810 format = ((format & ~0x0008) \| AUDIO_U16MSB);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	811 cvt->len_cvt *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	812 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	813 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	814 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	815 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	816
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	817 /* Convert 16-bit to 8-bit */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	818 void SDLCALL SDL_Convert8(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	819 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	820 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	821 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	822
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	823 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	824 fprintf(stderr, "Converting to 8-bit\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	825 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	826 src = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	827 dst = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	828 if ( (format & 0x1000) != 0x1000 ) { /* Little endian */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	829 ++src;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	830 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	831 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	832 dst = src;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	833 src += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	834 dst += 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	835 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	836 format = ((format & ~0x9010) \| AUDIO_U8);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	837 cvt->len_cvt /= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	838 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	839 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	840 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	841 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	842
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	843 /* Toggle signed/unsigned */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	844 void SDLCALL SDL_ConvertSign(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	845 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	846 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	847 Uint8 *data;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	848
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	849 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	850 fprintf(stderr, "Converting audio signedness\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	851 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	852 data = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	853 if ( (format & 0xFF) == 16 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	854 if ( (format & 0x1000) != 0x1000 ) { /* Little endian */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	855 ++data;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	856 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	857 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	858 *data ^= 0x80;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	859 data += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	860 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	861 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	862 for ( i=cvt->len_cvt; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	863 *data++ ^= 0x80;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	864 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	865 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	866 format = (format ^ 0x8000);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	867 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	868 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	869 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	870 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	871
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	872 /* Toggle endianness */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	873 void SDLCALL SDL_ConvertEndian(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	874 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	875 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	876 Uint8 *data, tmp;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	877
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	878 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	879 fprintf(stderr, "Converting audio endianness\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	880 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	881 data = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	882 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	883 tmp = data[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	884 data[0] = data[1];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	885 data[1] = tmp;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	886 data += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	887 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	888 format = (format ^ 0x1000);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	889 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	890 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	891 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	892 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	893
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	894 /* Convert rate up by multiple of 2 */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	895 void SDLCALL SDL_RateMUL2(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	896 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	897 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	898 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	899
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	900 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	901 fprintf(stderr, "Converting audio rate * 2\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	902 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	903 src = cvt->buf+cvt->len_cvt;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	904 dst = cvt->buf+cvt->len_cvt*2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	905 switch (format & 0xFF) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	906 case 8:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	907 for ( i=cvt->len_cvt; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	908 src -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	909 dst -= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	910 dst[0] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	911 dst[1] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	912 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	913 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	914 case 16:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	915 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	916 src -= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	917 dst -= 4;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	918 dst[0] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	919 dst[1] = src[1];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	920 dst[2] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	921 dst[3] = src[1];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	922 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	923 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	924 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	925 cvt->len_cvt *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	926 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	927 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	928 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	929 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	930
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	931
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	932 /* Convert rate up by multiple of 2, for stereo */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	933 void SDLCALL SDL_RateMUL2_c2(SDL_AudioCVT *cvt, Uint16 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	934 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	935 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	936 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	937
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	938 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	939 fprintf(stderr, "Converting audio rate * 2\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	940 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	941 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	942 dst = cvt->buf+cvt->len_cvt*2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	943 switch (format & 0xFF) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	944 case 8:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	945 for ( i=cvt->len_cvt/2; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	946 src -= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	947 dst -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	948 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	949 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	950 dst[2] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	951 dst[3] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	952 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	953 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	954 case 16:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	955 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	956 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	957 dst -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	958 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	959 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	960 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	961 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	962 dst[4] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	963 dst[5] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	964 dst[6] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	965 dst[7] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	966 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	967 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	968 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	969 cvt->len_cvt *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	970 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	971 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	972 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	973 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	974
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	975 /* Convert rate up by multiple of 2, for quad */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	976 void SDLCALL SDL_RateMUL2_c4(SDL_AudioCVT *cvt, Uint16 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	977 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	978 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	979 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	980
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	981 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	982 fprintf(stderr, "Converting audio rate * 2\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	983 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	984 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	985 dst = cvt->buf+cvt->len_cvt*2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	986 switch (format & 0xFF) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	987 case 8:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	988 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	989 src -= 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	990 dst -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	991 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	992 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	993 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	994 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	995 dst[4] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	996 dst[5] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	997 dst[6] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	998 dst[7] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	999 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1000 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1001 case 16:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1002 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1003 src -= 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1004 dst -= 16;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1005 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1006 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1007 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1008 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1009 dst[4] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1010 dst[5] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1011 dst[6] = src[6];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1012 dst[7] = src[7];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1013 dst[8] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1014 dst[9] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1015 dst[10] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1016 dst[11] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1017 dst[12] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1018 dst[13] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1019 dst[14] = src[6];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1020 dst[15] = src[7];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1021 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1022 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1023 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1024 cvt->len_cvt *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1025 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1026 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1027 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1028 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1029
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1030
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1031 /* Convert rate up by multiple of 2, for 5.1 */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1032 void SDLCALL SDL_RateMUL2_c6(SDL_AudioCVT *cvt, Uint16 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	1033 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1034 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1035 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1036
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1037 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1038 fprintf(stderr, "Converting audio rate * 2\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1039 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1040 src = cvt->buf+cvt->len_cvt;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1041 dst = cvt->buf+cvt->len_cvt*2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1042 switch (format & 0xFF) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1043 case 8:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1044 for ( i=cvt->len_cvt/6; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1045 src -= 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1046 dst -= 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1047 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1048 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1049 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1050 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1051 dst[4] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1052 dst[5] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1053 dst[6] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1054 dst[7] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1055 dst[8] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1056 dst[9] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1057 dst[10] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1058 dst[11] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1059 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1060 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1061 case 16:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1062 for ( i=cvt->len_cvt/12; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1063 src -= 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1064 dst -= 24;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1065 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1066 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1067 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1068 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1069 dst[4] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1070 dst[5] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1071 dst[6] = src[6];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1072 dst[7] = src[7];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1073 dst[8] = src[8];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1074 dst[9] = src[9];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1075 dst[10] = src[10];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1076 dst[11] = src[11];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1077 dst[12] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1078 dst[13] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1079 dst[14] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1080 dst[15] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1081 dst[16] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1082 dst[17] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1083 dst[18] = src[6];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1084 dst[19] = src[7];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1085 dst[20] = src[8];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1086 dst[21] = src[9];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1087 dst[22] = src[10];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1088 dst[23] = src[11];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1089 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1090 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1091 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1092 cvt->len_cvt *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1093 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1094 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1095 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1096 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1097
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1098 /* Convert rate down by multiple of 2 */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1099 void SDLCALL SDL_RateDIV2(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1100 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1101 int i;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1102 Uint8 src, dst;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1103
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1104 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1105 fprintf(stderr, "Converting audio rate / 2\n");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1106 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1107 src = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1108 dst = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1109 switch (format & 0xFF) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1110 case 8:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1111 for ( i=cvt->len_cvt/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1112 dst[0] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1113 src += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1114 dst += 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1115 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1116 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1117 case 16:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1118 for ( i=cvt->len_cvt/4; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1119 dst[0] = src[0];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1120 dst[1] = src[1];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1121 src += 4;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1122 dst += 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1123 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1124 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1125 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1126 cvt->len_cvt /= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1127 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1128 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1129 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1130 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1131
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1132
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1133 /* Convert rate down by multiple of 2, for stereo */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1134 void SDLCALL SDL_RateDIV2_c2(SDL_AudioCVT *cvt, Uint16 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	1135 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1136 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1137 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1138
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1139 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1140 fprintf(stderr, "Converting audio rate / 2\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1141 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1142 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1143 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1144 switch (format & 0xFF) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1145 case 8:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1146 for ( i=cvt->len_cvt/4; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1147 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1148 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1149 src += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1150 dst += 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1151 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1152 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1153 case 16:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1154 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1155 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1156 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1157 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1158 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1159 src += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1160 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1161 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1162 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1163 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1164 cvt->len_cvt /= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1165 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1166 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1167 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1168 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1169
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1170
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1171 /* Convert rate down by multiple of 2, for quad */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1172 void SDLCALL SDL_RateDIV2_c4(SDL_AudioCVT *cvt, Uint16 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	1173 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1174 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1175 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1176
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1177 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1178 fprintf(stderr, "Converting audio rate / 2\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1179 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1180 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1181 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1182 switch (format & 0xFF) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1183 case 8:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1184 for ( i=cvt->len_cvt/8; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1185 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1186 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1187 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1188 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1189 src += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1190 dst += 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1191 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1192 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1193 case 16:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1194 for ( i=cvt->len_cvt/16; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1195 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1196 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1197 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1198 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1199 dst[4] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1200 dst[5] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1201 dst[6] = src[6];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1202 dst[7] = src[7];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1203 src += 16;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1204 dst += 8;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1205 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1206 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1207 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1208 cvt->len_cvt /= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1209 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1210 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1211 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1212 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1213
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1214 /* Convert rate down by multiple of 2, for 5.1 */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1215 void SDLCALL SDL_RateDIV2_c6(SDL_AudioCVT *cvt, Uint16 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	1216 {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1217 int i;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1218 Uint8 src, dst;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1219
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1220 #ifdef DEBUG_CONVERT
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1221 fprintf(stderr, "Converting audio rate / 2\n");
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1222 #endif
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1223 src = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1224 dst = cvt->buf;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1225 switch (format & 0xFF) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1226 case 8:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1227 for ( i=cvt->len_cvt/12; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1228 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1229 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1230 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1231 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1232 dst[4] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1233 dst[5] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1234 src += 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1235 dst += 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1236 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1237 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1238 case 16:
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1239 for ( i=cvt->len_cvt/24; i; --i ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1240 dst[0] = src[0];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1241 dst[1] = src[1];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1242 dst[2] = src[2];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1243 dst[3] = src[3];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1244 dst[4] = src[4];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1245 dst[5] = src[5];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1246 dst[6] = src[6];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1247 dst[7] = src[7];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1248 dst[8] = src[8];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1249 dst[9] = src[9];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1250 dst[10] = src[10];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1251 dst[11] = src[11];
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1252 src += 24;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1253 dst += 12;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1254 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1255 break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1256 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1257 cvt->len_cvt /= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1258 if ( cvt->filters[++cvt->filter_index] ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1259 cvt->filters[cvt->filter_index](cvt, format);
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1260 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1261 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1262
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1263 /* Very slow rate conversion routine */
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1264 void SDLCALL SDL_RateSLOW(SDL_AudioCVT *cvt, Uint16 format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1265 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1266 double ipos;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1267 int i, clen;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1268
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1269 #ifdef DEBUG_CONVERT
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1270 fprintf(stderr, "Converting audio rate * %4.4f\n", 1.0/cvt->rate_incr);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1271 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1272 clen = (int)((double)cvt->len_cvt / cvt->rate_incr);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1273 if ( cvt->rate_incr > 1.0 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1274 switch (format & 0xFF) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1275 case 8: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1276 Uint8 *output;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1277
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1278 output = cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1279 ipos = 0.0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1280 for ( i=clen; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1281 *output = cvt->buf[(int)ipos];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1282 ipos += cvt->rate_incr;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1283 output += 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1284 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1285 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1286 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1287
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1288 case 16: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1289 Uint16 *output;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1290
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1291 clen &= ~1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1292 output = (Uint16 *)cvt->buf;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1293 ipos = 0.0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1294 for ( i=clen/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1295 output=((Uint16 )cvt->buf)[(int)ipos];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1296 ipos += cvt->rate_incr;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1297 output += 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1298 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1299 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1300 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1301 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1302 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1303 switch (format & 0xFF) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1304 case 8: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1305 Uint8 *output;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1306
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1307 output = cvt->buf+clen;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1308 ipos = (double)cvt->len_cvt;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1309 for ( i=clen; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1310 ipos -= cvt->rate_incr;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1311 output -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1312 *output = cvt->buf[(int)ipos];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1313 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1314 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1315 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1316
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1317 case 16: {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1318 Uint16 *output;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1319
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1320 clen &= ~1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1321 output = (Uint16 *)(cvt->buf+clen);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1322 ipos = (double)cvt->len_cvt/2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1323 for ( i=clen/2; i; --i ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1324 ipos -= cvt->rate_incr;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1325 output -= 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1326 output=((Uint16 )cvt->buf)[(int)ipos];
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1327 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1328 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1329 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1330 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1331 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1332 cvt->len_cvt = clen;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1333 if ( cvt->filters[++cvt->filter_index] ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1334 cvt->filters[cvt->filter_index](cvt, format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1335 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1336 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1337
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1338 int SDL_ConvertAudio(SDL_AudioCVT *cvt)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1339 {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1340 /* Make sure there's data to convert */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1341 if ( cvt->buf == NULL ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1342 SDL_SetError("No buffer allocated for conversion");
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1343 return(-1);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1344 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1345 /* Return okay if no conversion is necessary */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1346 cvt->len_cvt = cvt->len;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1347 if ( cvt->filters[0] == NULL ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1348 return(0);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1349 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1350
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1351 /* Set up the conversion and go! */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1352 cvt->filter_index = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1353 cvt->filters[0](cvt, cvt->src_format);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1354 return(0);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1355 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1356
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1357 /* Creates a set of audio filters to convert from one format to another.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1358 Returns -1 if the format conversion is not supported, or 1 if the
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1359 audio filter is set up.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1360 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1361
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1362 int SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1363 Uint16 src_format, Uint8 src_channels, int src_rate,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1364 Uint16 dst_format, Uint8 dst_channels, int dst_rate)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1365 {
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1366 /*printf("Build format %04x->%04x, channels %u->%u, rate %d->%d\n",
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1367 src_format, dst_format, src_channels, dst_channels, src_rate, dst_rate);*/
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1368 /* Start off with no conversion necessary */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1369 cvt->needed = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1370 cvt->filter_index = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1371 cvt->filters[0] = NULL;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1372 cvt->len_mult = 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1373 cvt->len_ratio = 1.0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1374
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1375 /* First filter: Endian conversion from src to dst */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1376 if ( (src_format & 0x1000) != (dst_format & 0x1000)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1377 && ((src_format & 0xff) != 8) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1378 cvt->filters[cvt->filter_index++] = SDL_ConvertEndian;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1379 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1380
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1381 /* Second filter: Sign conversion -- signed/unsigned */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1382 if ( (src_format & 0x8000) != (dst_format & 0x8000) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1383 cvt->filters[cvt->filter_index++] = SDL_ConvertSign;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1384 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1385
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1386 /* Next filter: Convert 16 bit <--> 8 bit PCM */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1387 if ( (src_format & 0xFF) != (dst_format & 0xFF) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1388 switch (dst_format&0x10FF) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1389 case AUDIO_U8:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1390 cvt->filters[cvt->filter_index++] =
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1391 SDL_Convert8;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1392 cvt->len_ratio /= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1393 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1394 case AUDIO_U16LSB:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1395 cvt->filters[cvt->filter_index++] =
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1396 SDL_Convert16LSB;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1397 cvt->len_mult *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1398 cvt->len_ratio *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1399 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1400 case AUDIO_U16MSB:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1401 cvt->filters[cvt->filter_index++] =
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1402 SDL_Convert16MSB;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1403 cvt->len_mult *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1404 cvt->len_ratio *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1405 break;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1406 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1407 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1408
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1409 /* Last filter: Mono/Stereo conversion */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1410 if ( src_channels != dst_channels ) {
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1411 if ( (src_channels == 1) && (dst_channels > 1) ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1412 cvt->filters[cvt->filter_index++] =
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1413 SDL_ConvertStereo;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1414 cvt->len_mult *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1415 src_channels = 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1416 cvt->len_ratio *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1417 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1418 if ( (src_channels == 2) &&
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1419 (dst_channels == 6) ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1420 cvt->filters[cvt->filter_index++] =
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1421 SDL_ConvertSurround;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1422 src_channels = 6;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1423 cvt->len_mult *= 3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1424 cvt->len_ratio *= 3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1425 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1426 if ( (src_channels == 2) &&
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1427 (dst_channels == 4) ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1428 cvt->filters[cvt->filter_index++] =
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1429 SDL_ConvertSurround_4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1430 src_channels = 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1431 cvt->len_mult *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1432 cvt->len_ratio *= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1433 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1434 while ( (src_channels*2) <= dst_channels ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1435 cvt->filters[cvt->filter_index++] =
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1436 SDL_ConvertStereo;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1437 cvt->len_mult *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1438 src_channels *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1439 cvt->len_ratio *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1440 }
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1441 if ( (src_channels == 6) &&
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1442 (dst_channels <= 2) ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1443 cvt->filters[cvt->filter_index++] =
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1444 SDL_ConvertStrip;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1445 src_channels = 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1446 cvt->len_ratio /= 3;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1447 }
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1448 if ( (src_channels == 6) &&
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1449 (dst_channels == 4) ) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1450 cvt->filters[cvt->filter_index++] =
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1451 SDL_ConvertStrip_2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1452 src_channels = 4;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1453 cvt->len_ratio /= 2;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1454 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1455 /* This assumes that 4 channel audio is in the format:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1456 Left {front/back} + Right {front/back}
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1457 so converting to L/R stereo works properly.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1458 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1459 while ( ((src_channels%2) == 0) &&
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1460 ((src_channels/2) >= dst_channels) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1461 cvt->filters[cvt->filter_index++] =
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1462 SDL_ConvertMono;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1463 src_channels /= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1464 cvt->len_ratio /= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1465 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1466 if ( src_channels != dst_channels ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1467 /* Uh oh.. */;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1468 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1469 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1470
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1471 /* Do rate conversion */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1472 cvt->rate_incr = 0.0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1473 if ( (src_rate/100) != (dst_rate/100) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1474 Uint32 hi_rate, lo_rate;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1475 int len_mult;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1476 double len_ratio;
1769 290b5baf2fca Fixed bug #215 Sam Lantinga <slouken@libsdl.org> parents: 1428 diff changeset	1477 void (SDLCALL rate_cvt)(SDL_AudioCVT cvt, Uint16 format);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1478
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1479 if ( src_rate > dst_rate ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1480 hi_rate = src_rate;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1481 lo_rate = dst_rate;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1482 switch (src_channels) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1483 case 1: rate_cvt = SDL_RateDIV2; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1484 case 2: rate_cvt = SDL_RateDIV2_c2; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1485 case 4: rate_cvt = SDL_RateDIV2_c4; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1486 case 6: rate_cvt = SDL_RateDIV2_c6; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1487 default: return -1;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1488 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1489 len_mult = 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1490 len_ratio = 0.5;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1491 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1492 hi_rate = dst_rate;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1493 lo_rate = src_rate;
942 41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1494 switch (src_channels) {
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1495 case 1: rate_cvt = SDL_RateMUL2; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1496 case 2: rate_cvt = SDL_RateMUL2_c2; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1497 case 4: rate_cvt = SDL_RateMUL2_c4; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1498 case 6: rate_cvt = SDL_RateMUL2_c6; break;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1499 default: return -1;
41a59de7f2ed Here are patches for SDL12 and SDL_mixer for 4 or 6 channel Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	1500 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1501 len_mult = 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1502 len_ratio = 2.0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1503 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1504 /* If hi_rate = lo_rate2^x then conversion is easy /
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1505 while ( ((lo_rate*2)/100) <= (hi_rate/100) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1506 cvt->filters[cvt->filter_index++] = rate_cvt;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1507 cvt->len_mult *= len_mult;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1508 lo_rate *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1509 cvt->len_ratio *= len_ratio;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1510 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1511 /* We may need a slow conversion here to finish up */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1512 if ( (lo_rate/100) != (hi_rate/100) ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1513 #if 1
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1514 /* The problem with this is that if the input buffer is
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1515 say 1K, and the conversion rate is say 1.1, then the
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1516 output buffer is 1.1K, which may not be an acceptable
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1517 buffer size for the audio driver (not a power of 2)
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1518 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1519 /* For now, punt and hope the rate distortion isn't great.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1520 */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1521 #else
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1522 if ( src_rate < dst_rate ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1523 cvt->rate_incr = (double)lo_rate/hi_rate;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1524 cvt->len_mult *= 2;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1525 cvt->len_ratio /= cvt->rate_incr;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1526 } else {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1527 cvt->rate_incr = (double)hi_rate/lo_rate;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1528 cvt->len_ratio *= cvt->rate_incr;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1529 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1530 cvt->filters[cvt->filter_index++] = SDL_RateSLOW;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1531 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1532 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1533 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1534
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1535 /* Set up the filter information */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1536 if ( cvt->filter_index != 0 ) {
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1537 cvt->needed = 1;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1538 cvt->src_format = src_format;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1539 cvt->dst_format = dst_format;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1540 cvt->len = 0;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1541 cvt->buf = NULL;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1542 cvt->filters[cvt->filter_index] = NULL;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1543 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1544 return(cvt->needed);
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1545 }

Mercurial > sdl-ios-xcode

annotate src/audio/SDL_audiocvt.c @ 1769:290b5baf2fca