Mercurial > SDL_sound_CoreAudio
annotate decoders/voc.c @ 468:cd46c97e58bc
Fixed broken VOC decoder...would always dereference NULL during VOC_open().
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 25 Oct 2003 12:38:57 +0000 |
| parents | daeb71a3f1ed |
| children | c66080364dff 3f03af31e246 |
| rev | line source |
|---|---|
| 14 | 1 /* |
| 2 * SDL_sound -- An abstract sound format decoding API. | |
| 3 * Copyright (C) 2001 Ryan C. Gordon. | |
| 4 * | |
| 5 * This library is free software; you can redistribute it and/or | |
| 6 * modify it under the terms of the GNU Lesser General Public | |
| 7 * License as published by the Free Software Foundation; either | |
| 8 * version 2.1 of the License, or (at your option) any later version. | |
| 9 * | |
| 10 * This library is distributed in the hope that it will be useful, | |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 * Lesser General Public License for more details. | |
| 14 * | |
| 15 * You should have received a copy of the GNU Lesser General Public | |
| 16 * License along with this library; if not, write to the Free Software | |
| 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 */ | |
| 19 | |
| 20 /* | |
| 21 * VOC decoder for SDL_sound. | |
| 22 * | |
| 23 * This driver handles Creative Labs VOC audio data...this is a legacy format, | |
| 24 * but there's some game ports that could make use of such a decoder. Plus, | |
| 25 * VOC is fairly straightforward to decode, so this is a more complex, but | |
| 26 * still palatable example of an SDL_sound decoder. Y'know, in case the | |
| 27 * RAW decoder didn't do it for you. :) | |
| 28 * | |
| 29 * This code was ripped from a decoder I had written for SDL_mixer, which was | |
| 30 * largely ripped from sox v12.17.1's voc.c. | |
| 31 * | |
| 32 * SDL_mixer: http://www.libsdl.org/projects/SDL_mixer/ | |
| 33 * sox: http://www.freshmeat.net/projects/sox/ | |
| 34 * | |
|
184
47cc2de2ae36
Changed reference to "LICENSE" file to "COPYING".
Ryan C. Gordon <icculus@icculus.org>
parents:
149
diff
changeset
|
35 * Please see the file COPYING in the source's root directory. |
| 14 | 36 * |
| 37 * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) | |
| 38 */ | |
| 39 | |
|
106
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
40 #if HAVE_CONFIG_H |
|
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
41 # include <config.h> |
|
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
42 #endif |
|
100
6d9fdec2f708
added config.h, added --enable-debug flag, various other changes to the build system
fingolfin
parents:
64
diff
changeset
|
43 |
|
114
dd95a12539fd
Changed an #if defined to #ifdef, for consistency with the other
Ryan C. Gordon <icculus@icculus.org>
parents:
106
diff
changeset
|
44 #ifdef SOUND_SUPPORTS_VOC |
|
104
103cfcb3c014
Updated to fix build system problem.
Ryan C. Gordon <icculus@icculus.org>
parents:
100
diff
changeset
|
45 |
| 14 | 46 #include <stdio.h> |
| 47 #include <stdlib.h> | |
| 48 #include <string.h> | |
| 49 | |
|
106
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
50 #include "SDL_sound.h" |
|
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
51 |
|
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
52 #define __SDL_SOUND_INTERNAL__ |
|
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
53 #include "SDL_sound_internal.h" |
|
40de367eb59e
Changing my include structure to do this right.
Ryan C. Gordon <icculus@icculus.org>
parents:
104
diff
changeset
|
54 |
|
47
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
55 static int VOC_init(void); |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
56 static void VOC_quit(void); |
| 14 | 57 static int VOC_open(Sound_Sample *sample, const char *ext); |
| 58 static void VOC_close(Sound_Sample *sample); | |
| 59 static Uint32 VOC_read(Sound_Sample *sample); | |
|
221
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
60 static int VOC_rewind(Sound_Sample *sample); |
|
306
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
61 static int VOC_seek(Sound_Sample *sample, Uint32 ms); |
| 14 | 62 |
|
149
1df5c106504e
Decoders can now list multiple file extensions.
Ryan C. Gordon <icculus@icculus.org>
parents:
114
diff
changeset
|
63 static const char *extensions_voc[] = { "VOC", NULL }; |
| 14 | 64 const Sound_DecoderFunctions __Sound_DecoderFunctions_VOC = |
| 65 { | |
| 66 { | |
|
149
1df5c106504e
Decoders can now list multiple file extensions.
Ryan C. Gordon <icculus@icculus.org>
parents:
114
diff
changeset
|
67 extensions_voc, |
| 14 | 68 "Creative Labs Voice format", |
| 69 "Ryan C. Gordon <icculus@clutteredmind.org>", | |
| 70 "http://www.icculus.org/SDL_sound/" | |
| 71 }, | |
| 72 | |
|
221
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
73 VOC_init, /* init() method */ |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
74 VOC_quit, /* quit() method */ |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
75 VOC_open, /* open() method */ |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
76 VOC_close, /* close() method */ |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
77 VOC_read, /* read() method */ |
|
306
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
78 VOC_rewind, /* rewind() method */ |
|
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
79 VOC_seek /* seek() method */ |
| 14 | 80 }; |
| 81 | |
| 82 | |
| 83 /* Private data for VOC file */ | |
| 84 typedef struct vocstuff { | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
85 Uint32 rest; /* bytes remaining in current block */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
86 Uint32 rate; /* rate code (byte) of this chunk */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
87 int silent; /* sound or silence? */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
88 Uint32 srate; /* rate code (byte) of silence */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
89 Uint32 blockseek; /* start of current output block */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
90 Uint32 samples; /* number of samples output */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
91 Uint32 size; /* word length of data */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
92 Uint8 channels; /* number of sound channels */ |
| 14 | 93 int extended; /* Has an extended block been read? */ |
| 94 Uint32 bufpos; /* byte position in internal->buffer. */ | |
|
224
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
95 Uint32 start_pos; /* offset to seek to in stream when rewinding. */ |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
96 int error; /* error condition (as opposed to EOF). */ |
| 14 | 97 } vs_t; |
| 98 | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
99 |
|
62
b13fafb976be
Changed _D macro to DBGSND.
Ryan C. Gordon <icculus@icculus.org>
parents:
47
diff
changeset
|
100 /* Size field */ |
| 14 | 101 /* SJB: note that the 1st 3 are sometimes used as sizeof(type) */ |
| 102 #define ST_SIZE_BYTE 1 | |
| 103 #define ST_SIZE_8BIT 1 | |
| 104 #define ST_SIZE_WORD 2 | |
| 105 #define ST_SIZE_16BIT 2 | |
| 106 #define ST_SIZE_DWORD 4 | |
| 107 #define ST_SIZE_32BIT 4 | |
| 108 #define ST_SIZE_FLOAT 5 | |
| 109 #define ST_SIZE_DOUBLE 6 | |
| 110 #define ST_SIZE_IEEE 7 /* IEEE 80-bit floats. */ | |
| 111 | |
| 112 /* Style field */ | |
| 113 #define ST_ENCODING_UNSIGNED 1 /* unsigned linear: Sound Blaster */ | |
| 114 #define ST_ENCODING_SIGN2 2 /* signed linear 2's comp: Mac */ | |
| 115 #define ST_ENCODING_ULAW 3 /* U-law signed logs: US telephony, SPARC */ | |
| 116 #define ST_ENCODING_ALAW 4 /* A-law signed logs: non-US telephony */ | |
| 117 #define ST_ENCODING_ADPCM 5 /* Compressed PCM */ | |
| 118 #define ST_ENCODING_IMA_ADPCM 6 /* Compressed PCM */ | |
| 119 #define ST_ENCODING_GSM 7 /* GSM 6.10 33-byte frame lossy compression */ | |
| 120 | |
| 121 #define VOC_TERM 0 | |
| 122 #define VOC_DATA 1 | |
| 123 #define VOC_CONT 2 | |
| 124 #define VOC_SILENCE 3 | |
| 125 #define VOC_MARKER 4 | |
| 126 #define VOC_TEXT 5 | |
| 127 #define VOC_LOOP 6 | |
| 128 #define VOC_LOOPEND 7 | |
| 129 #define VOC_EXTENDED 8 | |
| 130 #define VOC_DATA_16 9 | |
| 131 | |
| 132 | |
|
47
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
133 static int VOC_init(void) |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
134 { |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
135 return(1); /* always succeeds. */ |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
136 } /* VOC_init */ |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
137 |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
138 |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
139 static void VOC_quit(void) |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
140 { |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
141 /* it's a no-op. */ |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
142 } /* VOC_quit */ |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
143 |
|
ea58bc3b15d7
Added init() and quit() methods.
Ryan C. Gordon <icculus@icculus.org>
parents:
32
diff
changeset
|
144 |
|
401
c42ac9ee2ce4
Fixed "inline" keyword to compile.
Ryan C. Gordon <icculus@icculus.org>
parents:
387
diff
changeset
|
145 static __inline__ int voc_readbytes(SDL_RWops *src, vs_t *v, void *p, int size) |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
146 { |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
147 if (SDL_RWread(src, p, size, 1) != 1) |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
148 { |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
149 v->error = 1; |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
150 BAIL_MACRO("VOC: i/o error", 0); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
151 } /* if */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
152 |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
153 return(1); |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
154 } /* voc_readbytes */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
155 |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
156 |
|
401
c42ac9ee2ce4
Fixed "inline" keyword to compile.
Ryan C. Gordon <icculus@icculus.org>
parents:
387
diff
changeset
|
157 static __inline__ int voc_check_header(SDL_RWops *src) |
| 14 | 158 { |
| 159 /* VOC magic header */ | |
| 160 Uint8 signature[20]; /* "Creative Voice File\032" */ | |
| 161 Uint16 datablockofs; | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
162 vs_t v; /* dummy struct for voc_readbytes */ |
| 14 | 163 |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
164 if (!voc_readbytes(src, &v, signature, sizeof (signature))) |
| 14 | 165 return(0); |
| 166 | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
167 if (memcmp(signature, "Creative Voice File\032", sizeof (signature)) != 0) |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
168 { |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
169 BAIL_MACRO("VOC: Wrong signature; not a VOC file.", 0); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
170 } /* if */ |
| 14 | 171 |
| 172 /* get the offset where the first datablock is located */ | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
173 if (!voc_readbytes(src, &v, &datablockofs, sizeof (Uint16))) |
| 14 | 174 return(0); |
| 175 | |
| 176 datablockofs = SDL_SwapLE16(datablockofs); | |
| 177 | |
| 178 if (SDL_RWseek(src, datablockofs, SEEK_SET) != datablockofs) | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
179 { |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
180 BAIL_MACRO("VOC: Failed to seek to data block.", 0); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
181 } /* if */ |
| 14 | 182 |
| 183 return(1); /* success! */ | |
| 184 } /* voc_check_header */ | |
| 185 | |
| 186 | |
| 187 /* Read next block header, save info, leave position at start of data */ | |
|
468
cd46c97e58bc
Fixed broken VOC decoder...would always dereference NULL during VOC_open().
Ryan C. Gordon <icculus@icculus.org>
parents:
449
diff
changeset
|
188 static int voc_get_block(Sound_Sample *sample, vs_t *v) |
| 14 | 189 { |
| 190 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; | |
| 191 SDL_RWops *src = internal->rw; | |
| 192 Uint8 bits24[3]; | |
| 193 Uint8 uc, block; | |
| 194 Uint32 sblen; | |
| 195 Uint16 new_rate_short; | |
| 196 Uint32 new_rate_long; | |
| 197 Uint8 trash[6]; | |
| 198 Uint16 period; | |
| 199 int i; | |
| 200 | |
| 201 v->silent = 0; | |
| 202 while (v->rest == 0) | |
| 203 { | |
| 204 if (SDL_RWread(src, &block, sizeof (block), 1) != 1) | |
| 205 return 1; /* assume that's the end of the file. */ | |
| 206 | |
| 207 if (block == VOC_TERM) | |
| 208 return 1; | |
| 209 | |
| 210 if (SDL_RWread(src, bits24, sizeof (bits24), 1) != 1) | |
| 211 return 1; /* assume that's the end of the file. */ | |
|
62
b13fafb976be
Changed _D macro to DBGSND.
Ryan C. Gordon <icculus@icculus.org>
parents:
47
diff
changeset
|
212 |
| 14 | 213 /* Size is an 24-bit value. Ugh. */ |
| 214 sblen = ( (bits24[0]) | (bits24[1] << 8) | (bits24[2] << 16) ); | |
| 215 | |
| 216 switch(block) | |
| 217 { | |
| 218 case VOC_DATA: | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
219 if (!voc_readbytes(src, v, &uc, sizeof (uc))) |
| 14 | 220 return 0; |
| 221 | |
| 222 /* When DATA block preceeded by an EXTENDED */ | |
| 223 /* block, the DATA blocks rate value is invalid */ | |
| 224 if (!v->extended) | |
| 225 { | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
226 BAIL_IF_MACRO(uc == 0, "VOC: Sample rate is zero?", 0); |
| 14 | 227 |
| 228 if ((v->rate != -1) && (uc != v->rate)) | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
229 BAIL_MACRO("VOC sample rate codes differ", 0); |
| 14 | 230 |
| 231 v->rate = uc; | |
| 232 sample->actual.rate = 1000000.0/(256 - v->rate); | |
| 233 v->channels = 1; | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
234 } /* if */ |
| 14 | 235 |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
236 if (!voc_readbytes(src, v, &uc, sizeof (uc))) |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
237 return(0); |
| 14 | 238 |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
239 BAIL_IF_MACRO(uc != 0, "VOC: only supports 8-bit data", 0); |
| 14 | 240 |
| 241 v->extended = 0; | |
| 242 v->rest = sblen - 2; | |
| 243 v->size = ST_SIZE_BYTE; | |
| 244 return 1; | |
| 245 | |
| 246 case VOC_DATA_16: | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
247 if (!voc_readbytes(src, v, &new_rate_long, sizeof (Uint32))) |
| 14 | 248 return 0; |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
249 |
| 14 | 250 new_rate_long = SDL_SwapLE32(new_rate_long); |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
251 BAIL_IF_MACRO(!new_rate_long, "VOC: Sample rate is zero?", 0); |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
252 |
| 14 | 253 if ((v->rate != -1) && (new_rate_long != v->rate)) |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
254 BAIL_MACRO("VOC: sample rate codes differ", 0); |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
255 |
| 14 | 256 v->rate = new_rate_long; |
| 257 sample->actual.rate = new_rate_long; | |
| 258 | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
259 if (!voc_readbytes(src, v, &uc, sizeof (uc))) |
| 14 | 260 return 0; |
| 261 | |
| 262 switch (uc) | |
| 263 { | |
| 264 case 8: v->size = ST_SIZE_BYTE; break; | |
| 265 case 16: v->size = ST_SIZE_WORD; break; | |
| 266 default: | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
267 BAIL_MACRO("VOC: unknown data size", 0); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
268 } /* switch */ |
| 14 | 269 |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
270 if (!voc_readbytes(src, v, &v->channels, sizeof (Uint8))) |
| 14 | 271 return 0; |
| 272 | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
273 if (!voc_readbytes(src, v, trash, sizeof (Uint8) * 6)) |
| 14 | 274 return 0; |
| 275 | |
| 276 v->rest = sblen - 12; | |
| 277 return 1; | |
| 278 | |
| 279 case VOC_CONT: | |
| 280 v->rest = sblen; | |
| 281 return 1; | |
| 282 | |
| 283 case VOC_SILENCE: | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
284 if (!voc_readbytes(src, v, &period, sizeof (period))) |
| 14 | 285 return 0; |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
286 |
| 14 | 287 period = SDL_SwapLE16(period); |
| 288 | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
289 if (!voc_readbytes(src, v, &uc, sizeof (uc))) |
| 14 | 290 return 0; |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
291 |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
292 BAIL_IF_MACRO(uc == 0, "VOC: silence sample rate is zero", 0); |
| 14 | 293 |
| 294 /* | |
| 295 * Some silence-packed files have gratuitously | |
| 296 * different sample rate codes in silence. | |
| 297 * Adjust period. | |
| 298 */ | |
| 299 if ((v->rate != -1) && (uc != v->rate)) | |
| 300 period = (period * (256 - uc))/(256 - v->rate); | |
| 301 else | |
| 302 v->rate = uc; | |
| 303 v->rest = period; | |
| 304 v->silent = 1; | |
| 305 return 1; | |
| 306 | |
| 307 case VOC_LOOP: | |
| 308 case VOC_LOOPEND: | |
| 309 for(i = 0; i < sblen; i++) /* skip repeat loops. */ | |
| 310 { | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
311 if (!voc_readbytes(src, v, trash, sizeof (Uint8))) |
| 14 | 312 return 0; |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
313 } /* for */ |
| 14 | 314 break; |
| 315 | |
| 316 case VOC_EXTENDED: | |
| 317 /* An Extended block is followed by a data block */ | |
| 318 /* Set this byte so we know to use the rate */ | |
| 319 /* value from the extended block and not the */ | |
| 320 /* data block. */ | |
| 321 v->extended = 1; | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
322 if (!voc_readbytes(src, v, &new_rate_short, sizeof (Uint16))) |
| 14 | 323 return 0; |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
324 |
| 14 | 325 new_rate_short = SDL_SwapLE16(new_rate_short); |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
326 BAIL_IF_MACRO(!new_rate_short, "VOC: sample rate is zero", 0); |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
327 |
| 14 | 328 if ((v->rate != -1) && (new_rate_short != v->rate)) |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
329 BAIL_MACRO("VOC: sample rate codes differ", 0); |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
330 |
| 14 | 331 v->rate = new_rate_short; |
| 332 | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
333 if (!voc_readbytes(src, v, &uc, sizeof (uc))) |
| 14 | 334 return 0; |
| 335 | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
336 BAIL_IF_MACRO(uc != 0, "VOC: only supports 8-bit data", 0); |
| 14 | 337 |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
338 if (!voc_readbytes(src, v, &uc, sizeof (uc))) |
| 14 | 339 return 0; |
| 340 | |
| 341 if (uc) | |
| 342 sample->actual.channels = 2; /* Stereo */ | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
343 |
| 14 | 344 /* Needed number of channels before finishing |
| 345 compute for rate */ | |
| 346 sample->actual.rate = | |
| 347 (256000000L/(65536L - v->rate)) / sample->actual.channels; | |
| 348 /* An extended block must be followed by a data */ | |
| 349 /* block to be valid so loop back to top so it */ | |
| 350 /* can be grabed. */ | |
| 351 continue; | |
| 352 | |
| 353 case VOC_MARKER: | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
354 if (!voc_readbytes(src, v, trash, sizeof (Uint8) * 2)) |
| 14 | 355 return 0; |
| 356 | |
| 357 /* Falling! Falling! */ | |
| 358 | |
| 359 default: /* text block or other krapola. */ | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
360 for(i = 0; i < sblen; i++) /* skip repeat loops. */ |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
361 { |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
362 if (!voc_readbytes(src, v, trash, sizeof (Uint8))) |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
363 return 0; |
|
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
364 } /* for */ |
| 14 | 365 |
| 366 if (block == VOC_TEXT) | |
| 367 continue; /* get next block */ | |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
368 } /* switch */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
369 } /* while */ |
| 14 | 370 |
| 371 return 1; | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
372 } /* voc_get_block */ |
| 14 | 373 |
| 374 | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
375 static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max) |
| 14 | 376 { |
| 377 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; | |
| 378 SDL_RWops *src = internal->rw; | |
| 379 vs_t *v = (vs_t *) internal->decoder_private; | |
| 380 int done = 0; | |
| 381 Uint8 silence = 0x80; | |
| 382 Uint8 *buf = internal->buffer; | |
| 383 | |
| 384 if (v->rest == 0) | |
| 385 { | |
|
468
cd46c97e58bc
Fixed broken VOC decoder...would always dereference NULL during VOC_open().
Ryan C. Gordon <icculus@icculus.org>
parents:
449
diff
changeset
|
386 if (!voc_get_block(sample, v)) |
| 14 | 387 return 0; |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
388 } /* if */ |
| 14 | 389 |
| 390 if (v->rest == 0) | |
| 391 return 0; | |
| 392 | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
393 max = (v->rest < max) ? v->rest : max; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
394 |
| 14 | 395 if (v->silent) |
| 396 { | |
| 397 if (v->size == ST_SIZE_WORD) | |
| 398 silence = 0x00; | |
| 399 | |
| 400 /* Fill in silence */ | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
401 if (fill_buf) |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
402 memset(buf + v->bufpos, silence, max); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
403 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
404 done = max; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
405 v->rest -= done; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
406 } /* if */ |
| 14 | 407 |
| 408 else | |
| 409 { | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
410 if (fill_buf) |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
411 { |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
412 done = SDL_RWread(src, buf + v->bufpos, 1, max); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
413 if (done < max) |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
414 { |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
415 __Sound_SetError("VOC: i/o error"); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
416 sample->flags |= SOUND_SAMPLEFLAG_ERROR; |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
417 } /* if */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
418 } /* if */ |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
419 |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
420 else |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
421 { |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
422 int cur, rc; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
423 cur = SDL_RWtell(src); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
424 if (cur >= 0) |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
425 { |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
426 rc = SDL_RWseek(src, max, SEEK_CUR); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
427 if (rc >= 0) |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
428 done = rc - cur; |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
429 else |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
430 { |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
431 __Sound_SetError("VOC: seek error"); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
432 sample->flags |= SOUND_SAMPLEFLAG_ERROR; |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
433 } /* else */ |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
434 } /* if */ |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
435 } /* else */ |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
436 |
| 14 | 437 v->rest -= done; |
| 438 v->bufpos += done; | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
439 } /* else */ |
| 14 | 440 |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
441 return(done); |
|
22
f6e679afe88b
Byte ordering fix, changed voc_read to voc_read_waveform, and cleaned up
Ryan C. Gordon <icculus@icculus.org>
parents:
14
diff
changeset
|
442 } /* voc_read_waveform */ |
| 14 | 443 |
| 444 | |
| 445 static int VOC_open(Sound_Sample *sample, const char *ext) | |
| 446 { | |
| 447 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; | |
| 448 vs_t *v = NULL; | |
| 449 | |
| 450 if (!voc_check_header(internal->rw)) | |
| 451 return(0); | |
| 452 | |
| 453 v = (vs_t *) malloc(sizeof (vs_t)); | |
| 454 BAIL_IF_MACRO(v == NULL, ERR_OUT_OF_MEMORY, 0); | |
| 455 memset(v, '\0', sizeof (vs_t)); | |
| 456 | |
|
224
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
457 v->start_pos = SDL_RWtell(internal->rw); |
| 14 | 458 v->rate = -1; |
|
468
cd46c97e58bc
Fixed broken VOC decoder...would always dereference NULL during VOC_open().
Ryan C. Gordon <icculus@icculus.org>
parents:
449
diff
changeset
|
459 if (!voc_get_block(sample, v)) |
| 14 | 460 { |
| 461 free(v); | |
| 462 return(0); | |
| 463 } /* if */ | |
| 464 | |
| 465 if (v->rate == -1) | |
| 466 { | |
| 467 free(v); | |
|
387
fb519e6028e3
Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL*_MACRO)
Ryan C. Gordon <icculus@icculus.org>
parents:
385
diff
changeset
|
468 BAIL_MACRO("VOC: data had no sound!", 0); |
| 14 | 469 } /* if */ |
| 470 | |
|
62
b13fafb976be
Changed _D macro to DBGSND.
Ryan C. Gordon <icculus@icculus.org>
parents:
47
diff
changeset
|
471 SNDDBG(("VOC: Accepting data stream.\n")); |
| 14 | 472 sample->actual.format = (v->size == ST_SIZE_WORD) ? AUDIO_S16LSB:AUDIO_U8; |
| 473 sample->actual.channels = v->channels; | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
474 sample->flags = SOUND_SAMPLEFLAG_CANSEEK; |
|
449
daeb71a3f1ed
Extremely minor cleanup.
Ryan C. Gordon <icculus@icculus.org>
parents:
401
diff
changeset
|
475 internal->decoder_private = v; |
| 14 | 476 return(1); |
| 477 } /* VOC_open */ | |
| 478 | |
| 479 | |
| 480 static void VOC_close(Sound_Sample *sample) | |
| 481 { | |
| 482 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; | |
| 483 free(internal->decoder_private); | |
| 484 } /* VOC_close */ | |
| 485 | |
| 486 | |
| 487 static Uint32 VOC_read(Sound_Sample *sample) | |
| 488 { | |
| 489 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; | |
| 490 vs_t *v = (vs_t *) internal->decoder_private; | |
| 491 | |
| 492 v->bufpos = 0; | |
| 493 while (v->bufpos < internal->buffer_size) | |
| 494 { | |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
495 Uint32 rc = voc_read_waveform(sample, 1, internal->buffer_size); |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
496 if (rc == 0) |
| 14 | 497 { |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
498 sample->flags |= (v->error) ? |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
499 SOUND_SAMPLEFLAG_ERROR : |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
500 SOUND_SAMPLEFLAG_EOF; |
| 14 | 501 break; |
| 502 } /* if */ | |
| 503 | |
|
468
cd46c97e58bc
Fixed broken VOC decoder...would always dereference NULL during VOC_open().
Ryan C. Gordon <icculus@icculus.org>
parents:
449
diff
changeset
|
504 if (!voc_get_block(sample, v)) |
| 14 | 505 { |
|
385
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
506 sample->flags |= (v->error) ? |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
507 SOUND_SAMPLEFLAG_ERROR : |
|
9efb760c4a6b
FIXME removal and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
377
diff
changeset
|
508 SOUND_SAMPLEFLAG_EOF; |
| 14 | 509 break; |
| 510 } /* if */ | |
| 511 } /* while */ | |
| 512 | |
| 513 return(v->bufpos); | |
| 514 } /* VOC_read */ | |
| 515 | |
|
221
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
516 |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
517 static int VOC_rewind(Sound_Sample *sample) |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
518 { |
|
224
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
519 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; |
|
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
520 vs_t *v = (vs_t *) internal->decoder_private; |
|
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
521 int rc = SDL_RWseek(internal->rw, v->start_pos, SEEK_SET); |
|
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
522 BAIL_IF_MACRO(rc != v->start_pos, ERR_IO_ERROR, 0); |
|
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
523 v->rest = 0; |
|
1bafef18dabf
Implemented rewind method.
Ryan C. Gordon <icculus@icculus.org>
parents:
221
diff
changeset
|
524 return(1); |
|
221
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
525 } /* VOC_rewind */ |
|
c9772a9f5271
Initial implementation or stubs for rewind method. Other cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
184
diff
changeset
|
526 |
|
306
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
527 |
|
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
528 static int VOC_seek(Sound_Sample *sample, Uint32 ms) |
|
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
529 { |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
530 /* |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
531 * VOCs don't lend themselves well to seeking, since you have to |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
532 * parse each section, which is an arbitrary size. The best we can do |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
533 * is rewind, set a flag saying not to write the waveforms to a buffer, |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
534 * and decode to the point that we want. Ugh. Fortunately, there's |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
535 * really no such thing as a large VOC, due to the era and hardware that |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
536 * spawned them, so even though this is inefficient, this is still a |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
537 * relatively fast operation in most cases. |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
538 */ |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
539 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
540 Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
541 vs_t *v = (vs_t *) internal->decoder_private; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
542 int offset = __Sound_convertMsToBytePos(&sample->actual, ms); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
543 int origpos = SDL_RWtell(internal->rw); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
544 int origrest = v->rest; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
545 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
546 BAIL_IF_MACRO(!VOC_rewind(sample), NULL, 0); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
547 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
548 v->bufpos = 0; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
549 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
550 while (offset > 0) |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
551 { |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
552 Uint32 rc = voc_read_waveform(sample, 0, offset); |
|
468
cd46c97e58bc
Fixed broken VOC decoder...would always dereference NULL during VOC_open().
Ryan C. Gordon <icculus@icculus.org>
parents:
449
diff
changeset
|
553 if ( (rc == 0) || (!voc_get_block(sample, v)) ) |
|
335
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
554 { |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
555 SDL_RWseek(internal->rw, origpos, SEEK_SET); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
556 v->rest = origrest; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
557 return(0); |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
558 } /* if */ |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
559 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
560 offset -= rc; |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
561 } /* while */ |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
562 |
|
f6475949cd59
Implemented seek method.
Ryan C. Gordon <icculus@icculus.org>
parents:
306
diff
changeset
|
563 return(1); |
|
306
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
564 } /* VOC_seek */ |
|
c97be6e1bd27
Added framework for Sound_Seek() support.
Ryan C. Gordon <icculus@icculus.org>
parents:
301
diff
changeset
|
565 |
|
64
40006625142a
Changes in preparation of autoconf support.
Ryan C. Gordon <icculus@icculus.org>
parents:
62
diff
changeset
|
566 #endif /* SOUND_SUPPORTS_VOC */ |
| 14 | 567 |
| 568 /* end of voc.c ... */ |