mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-07-05 22:50:23 +00:00
Updated Ogg Vorbis decoder and fixed some .ogg files not playing at correct speed.
This commit is contained in:
Luke Ceddia
parent
d70ed2d42e
commit
f2bd84b5c5
|
|
@ -1,30 +1,46 @@
|
|||
// Ogg Vorbis I audio decoder -- version 0.99996
|
||||
// Ogg Vorbis audio decoder - v1.05 - public domain
|
||||
// http://nothings.org/stb_vorbis/
|
||||
//
|
||||
// Written in April 2007 by Sean Barrett, sponsored by RAD Game Tools.
|
||||
// Written by Sean Barrett in 2007, last updated in 2014
|
||||
// Sponsored by RAD Game Tools.
|
||||
//
|
||||
// Placed in the public domain April 2007 by the author: no copyright is
|
||||
// claimed, and you may use it for any purpose you like.
|
||||
// Placed in the public domain April 2007 by the author: no copyright
|
||||
// is claimed, and you may use it for any purpose you like.
|
||||
//
|
||||
// No warranty for any purpose is expressed or implied by the author (nor
|
||||
// by RAD Game Tools). Report bugs and send enhancements to the author.
|
||||
//
|
||||
// Get the latest version and other information at:
|
||||
// http://nothings.org/stb_vorbis/
|
||||
|
||||
|
||||
// Todo:
|
||||
//
|
||||
// - seeking (note you can seek yourself using the pushdata API)
|
||||
//
|
||||
// Limitations:
|
||||
//
|
||||
// - floor 0 not supported (used in old ogg vorbis files)
|
||||
// - seeking not supported except manually via PUSHDATA api
|
||||
// - floor 0 not supported (used in old ogg vorbis files pre-2004)
|
||||
// - lossless sample-truncation at beginning ignored
|
||||
// - cannot concatenate multiple vorbis streams
|
||||
// - sample positions are 32-bit, limiting seekable 192Khz
|
||||
// files to around 6 hours (Ogg supports 64-bit)
|
||||
//
|
||||
// All of these limitations may be removed in future versions.
|
||||
// Bugfix/warning contributors:
|
||||
// Terje Mathisen Niklas Frykholm Andy Hill
|
||||
// Casey Muratori John Bolton Gargaj
|
||||
// Laurent Gomila Marc LeBlanc Ronny Chevalier
|
||||
// Bernhard Wodo Evan Balster "alxprd"@github
|
||||
// Tom Beaumont Ingo Leitgeb Nicolas Guillemot
|
||||
// (If you reported a bug but do not appear in this list, it is because
|
||||
// someone else reported the bug before you. There were too many of you to
|
||||
// list them all because I was lax about updating for a long time, sorry.)
|
||||
//
|
||||
// Partial history:
|
||||
// 1.05 - 2015/04/19 - don't define __forceinline if it's redundant
|
||||
// 1.04 - 2014/08/27 - fix missing const-correct case in API
|
||||
// 1.03 - 2014/08/07 - warning fixes
|
||||
// 1.02 - 2014/07/09 - declare qsort comparison as explicitly _cdecl in Windows
|
||||
// 1.01 - 2014/06/18 - fix stb_vorbis_get_samples_float (interleaved was correct)
|
||||
// 1.0 - 2014/05/26 - fix memory leaks; fix warnings; fix bugs in >2-channel;
|
||||
// (API change) report sample rate for decode-full-file funcs
|
||||
// 0.99996 - - bracket #include <malloc.h> for macintosh compilation
|
||||
// 0.99995 - - avoid alias-optimization issue in float-to-int conversion
|
||||
//
|
||||
// See end of file for full version history.
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -153,6 +169,7 @@ extern int stb_vorbis_decode_frame_pushdata(
|
|||
// decode a frame of audio sample data if possible from the passed-in data block
|
||||
//
|
||||
// return value: number of bytes we used from datablock
|
||||
//
|
||||
// possible cases:
|
||||
// 0 bytes used, 0 samples output (need more data)
|
||||
// N bytes used, 0 samples output (resynching the stream, keep going)
|
||||
|
|
@ -197,21 +214,23 @@ extern void stb_vorbis_flush_pushdata(stb_vorbis *f);
|
|||
// just want to go ahead and use pushdata.)
|
||||
|
||||
#if !defined(STB_VORBIS_NO_STDIO) && !defined(STB_VORBIS_NO_INTEGER_CONVERSION)
|
||||
extern int stb_vorbis_decode_filename(char *filename, int *channels, short **output);
|
||||
extern int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output);
|
||||
#endif
|
||||
#if !defined(STB_VORBIS_NO_INTEGER_CONVERSION)
|
||||
extern int stb_vorbis_decode_memory(const unsigned char *mem, int len, int *channels, int *sample_rate, short **output);
|
||||
#endif
|
||||
extern int stb_vorbis_decode_memory(unsigned char *mem, int len, int *channels, short **output);
|
||||
// decode an entire file and output the data interleaved into a malloc()ed
|
||||
// buffer stored in *output. The return value is the number of samples
|
||||
// decoded, or -1 if the file could not be opened or was not an ogg vorbis file.
|
||||
// When you're done with it, just free() the pointer returned in *output.
|
||||
|
||||
extern stb_vorbis * stb_vorbis_open_memory(unsigned char *data, int len,
|
||||
extern stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len,
|
||||
int *error, stb_vorbis_alloc *alloc_buffer);
|
||||
// create an ogg vorbis decoder from an ogg vorbis stream in memory (note
|
||||
// this must be the entire stream!). on failure, returns NULL and sets *error
|
||||
|
||||
#ifndef STB_VORBIS_NO_STDIO
|
||||
extern stb_vorbis * stb_vorbis_open_filename(char *filename,
|
||||
extern stb_vorbis * stb_vorbis_open_filename(const char *filename,
|
||||
int *error, stb_vorbis_alloc *alloc_buffer);
|
||||
// create an ogg vorbis decoder from a filename via fopen(). on failure,
|
||||
// returns NULL and sets *error (possibly to VORBIS_file_open_failure).
|
||||
|
|
@ -535,7 +554,7 @@ enum STBVorbisError
|
|||
#define NULL 0
|
||||
#endif
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#if !defined(_MSC_VER) && !(defined(__MINGW32__) && defined(__forceinline))
|
||||
#if __GNUC__
|
||||
#define __forceinline inline
|
||||
#else
|
||||
|
|
@ -812,7 +831,7 @@ extern int my_prof(int slot);
|
|||
//#define stb_prof my_prof
|
||||
|
||||
#ifndef stb_prof
|
||||
#define stb_prof(x) 0
|
||||
#define stb_prof(x) ((void) 0)
|
||||
#endif
|
||||
|
||||
#if defined(STB_VORBIS_NO_PUSHDATA_API)
|
||||
|
|
@ -896,7 +915,7 @@ static void *setup_temp_malloc(vorb *f, int sz)
|
|||
return malloc(sz);
|
||||
}
|
||||
|
||||
static void setup_temp_free(vorb *f, void *p, size_t sz)
|
||||
static void setup_temp_free(vorb *f, void *p, int sz)
|
||||
{
|
||||
if (f->alloc.alloc_buffer) {
|
||||
f->temp_offset += (sz+3)&~3;
|
||||
|
|
@ -914,7 +933,7 @@ static void crc32_init(void)
|
|||
uint32 s;
|
||||
for(i=0; i < 256; i++) {
|
||||
for (s=i<<24, j=0; j < 8; ++j)
|
||||
s = (s << 1) ^ (s >= (1<<31) ? CRC32_POLY : 0);
|
||||
s = (s << 1) ^ (s >= (1U<<31) ? CRC32_POLY : 0);
|
||||
crc_table[i] = s;
|
||||
}
|
||||
}
|
||||
|
|
@ -948,15 +967,15 @@ static int ilog(int32 n)
|
|||
static signed char log2_4[16] = { 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4 };
|
||||
|
||||
// 2 compares if n < 16, 3 compares otherwise (4 if signed or n > 1<<29)
|
||||
if (n < (1U << 14))
|
||||
if (n < (1U << 4)) return 0 + log2_4[n ];
|
||||
else if (n < (1U << 9)) return 5 + log2_4[n >> 5];
|
||||
if (n < (1 << 14))
|
||||
if (n < (1 << 4)) return 0 + log2_4[n ];
|
||||
else if (n < (1 << 9)) return 5 + log2_4[n >> 5];
|
||||
else return 10 + log2_4[n >> 10];
|
||||
else if (n < (1U << 24))
|
||||
if (n < (1U << 19)) return 15 + log2_4[n >> 15];
|
||||
else if (n < (1 << 24))
|
||||
if (n < (1 << 19)) return 15 + log2_4[n >> 15];
|
||||
else return 20 + log2_4[n >> 20];
|
||||
else if (n < (1U << 29)) return 25 + log2_4[n >> 25];
|
||||
else if (n < (1U << 31)) return 30 + log2_4[n >> 30];
|
||||
else if (n < (1 << 29)) return 25 + log2_4[n >> 25];
|
||||
else if (n < (1 << 31)) return 30 + log2_4[n >> 30];
|
||||
else return 0; // signed n returns 0
|
||||
}
|
||||
|
||||
|
|
@ -1069,7 +1088,13 @@ static void compute_accelerated_huffman(Codebook *c)
|
|||
}
|
||||
}
|
||||
|
||||
static int uint32_compare(const void *p, const void *q)
|
||||
#ifdef _MSC_VER
|
||||
#define STBV_CDECL __cdecl
|
||||
#else
|
||||
#define STBV_CDECL
|
||||
#endif
|
||||
|
||||
static int STBV_CDECL uint32_compare(const void *p, const void *q)
|
||||
{
|
||||
uint32 x = * (uint32 *) p;
|
||||
uint32 y = * (uint32 *) q;
|
||||
|
|
@ -1225,7 +1250,7 @@ typedef struct
|
|||
uint16 x,y;
|
||||
} Point;
|
||||
|
||||
int point_compare(const void *p, const void *q)
|
||||
static int STBV_CDECL point_compare(const void *p, const void *q)
|
||||
{
|
||||
Point *a = (Point *) p;
|
||||
Point *b = (Point *) q;
|
||||
|
|
@ -1351,7 +1376,7 @@ static int capture_pattern(vorb *f)
|
|||
|
||||
static int start_page_no_capturepattern(vorb *f)
|
||||
{
|
||||
uint32 loc0,loc1,n,i;
|
||||
uint32 loc0,loc1,n;
|
||||
// stream structure version
|
||||
if (0 != get8(f)) return error(f, VORBIS_invalid_stream_structure_version);
|
||||
// header flag
|
||||
|
|
@ -1374,7 +1399,8 @@ static int start_page_no_capturepattern(vorb *f)
|
|||
return error(f, VORBIS_unexpected_eof);
|
||||
// assume we _don't_ know any the sample position of any segments
|
||||
f->end_seg_with_known_loc = -2;
|
||||
if (loc0 != ~0 || loc1 != ~0) {
|
||||
if (loc0 != ~0U || loc1 != ~0U) {
|
||||
int i;
|
||||
// determine which packet is the last one that will complete
|
||||
for (i=f->segment_count-1; i >= 0; --i)
|
||||
if (f->segments[i] < 255)
|
||||
|
|
@ -1471,9 +1497,10 @@ static int next_segment(vorb *f)
|
|||
|
||||
static int get8_packet_raw(vorb *f)
|
||||
{
|
||||
if (!f->bytes_in_seg)
|
||||
if (!f->bytes_in_seg) { // CLANG!
|
||||
if (f->last_seg) return EOP;
|
||||
else if (!next_segment(f)) return EOP;
|
||||
}
|
||||
assert(f->bytes_in_seg > 0);
|
||||
--f->bytes_in_seg;
|
||||
++f->packet_bytes;
|
||||
|
|
@ -1524,14 +1551,6 @@ static uint32 get_bits(vorb *f, int n)
|
|||
return z;
|
||||
}
|
||||
|
||||
static int32 get_bits_signed(vorb *f, int n)
|
||||
{
|
||||
uint32 z = get_bits(f, n);
|
||||
if (z & (1 << (n-1)))
|
||||
z += ~((1 << n) - 1);
|
||||
return (int32) z;
|
||||
}
|
||||
|
||||
// @OPTIMIZE: primary accumulator for huffman
|
||||
// expand the buffer to as many bits as possible without reading off end of packet
|
||||
// it might be nice to allow f->valid_bits and f->acc to be stored in registers,
|
||||
|
|
@ -1615,23 +1634,6 @@ static int codebook_decode_scalar_raw(vorb *f, Codebook *c)
|
|||
return -1;
|
||||
}
|
||||
|
||||
static int codebook_decode_scalar(vorb *f, Codebook *c)
|
||||
{
|
||||
int i;
|
||||
if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH)
|
||||
prep_huffman(f);
|
||||
// fast huffman table lookup
|
||||
i = f->acc & FAST_HUFFMAN_TABLE_MASK;
|
||||
i = c->fast_huffman[i];
|
||||
if (i >= 0) {
|
||||
f->acc >>= c->codeword_lengths[i];
|
||||
f->valid_bits -= c->codeword_lengths[i];
|
||||
if (f->valid_bits < 0) { f->valid_bits = 0; return -1; }
|
||||
return i;
|
||||
}
|
||||
return codebook_decode_scalar_raw(f,c);
|
||||
}
|
||||
|
||||
#ifndef STB_VORBIS_NO_INLINE_DECODE
|
||||
|
||||
#define DECODE_RAW(var, f,c) \
|
||||
|
|
@ -1650,6 +1652,23 @@ static int codebook_decode_scalar(vorb *f, Codebook *c)
|
|||
|
||||
#else
|
||||
|
||||
static int codebook_decode_scalar(vorb *f, Codebook *c)
|
||||
{
|
||||
int i;
|
||||
if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH)
|
||||
prep_huffman(f);
|
||||
// fast huffman table lookup
|
||||
i = f->acc & FAST_HUFFMAN_TABLE_MASK;
|
||||
i = c->fast_huffman[i];
|
||||
if (i >= 0) {
|
||||
f->acc >>= c->codeword_lengths[i];
|
||||
f->valid_bits -= c->codeword_lengths[i];
|
||||
if (f->valid_bits < 0) { f->valid_bits = 0; return -1; }
|
||||
return i;
|
||||
}
|
||||
return codebook_decode_scalar_raw(f,c);
|
||||
}
|
||||
|
||||
#define DECODE_RAW(var,f,c) var = codebook_decode_scalar(f,c);
|
||||
|
||||
#endif
|
||||
|
|
@ -1681,7 +1700,7 @@ static int codebook_decode_scalar(vorb *f, Codebook *c)
|
|||
#define CODEBOOK_ELEMENT_BASE(c) (0)
|
||||
#endif
|
||||
|
||||
static int codebook_decode_start(vorb *f, Codebook *c, int len)
|
||||
static int codebook_decode_start(vorb *f, Codebook *c)
|
||||
{
|
||||
int z = -1;
|
||||
|
||||
|
|
@ -1703,7 +1722,7 @@ static int codebook_decode_start(vorb *f, Codebook *c, int len)
|
|||
|
||||
static int codebook_decode(vorb *f, Codebook *c, float *output, int len)
|
||||
{
|
||||
int i,z = codebook_decode_start(f,c,len);
|
||||
int i,z = codebook_decode_start(f,c);
|
||||
if (z < 0) return FALSE;
|
||||
if (len > c->dimensions) len = c->dimensions;
|
||||
|
||||
|
|
@ -1742,7 +1761,7 @@ static int codebook_decode(vorb *f, Codebook *c, float *output, int len)
|
|||
|
||||
static int codebook_decode_step(vorb *f, Codebook *c, float *output, int len, int step)
|
||||
{
|
||||
int i,z = codebook_decode_start(f,c,len);
|
||||
int i,z = codebook_decode_start(f,c);
|
||||
float last = CODEBOOK_ELEMENT_BASE(c);
|
||||
if (z < 0) return FALSE;
|
||||
if (len > c->dimensions) len = c->dimensions;
|
||||
|
|
@ -1806,7 +1825,8 @@ static int codebook_decode_deinterleave_repeat(vorb *f, Codebook *c, float **out
|
|||
for (i=0; i < effective; ++i) {
|
||||
int off = (z / div) % c->lookup_values;
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,off) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == ch) { c_inter = 0; ++p_inter; }
|
||||
if (c->sequence_p) last = val;
|
||||
div *= c->lookup_values;
|
||||
|
|
@ -1818,14 +1838,16 @@ static int codebook_decode_deinterleave_repeat(vorb *f, Codebook *c, float **out
|
|||
if (c->sequence_p) {
|
||||
for (i=0; i < effective; ++i) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == ch) { c_inter = 0; ++p_inter; }
|
||||
last = val;
|
||||
}
|
||||
} else {
|
||||
for (i=0; i < effective; ++i) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == ch) { c_inter = 0; ++p_inter; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1873,7 +1895,8 @@ static int codebook_decode_deinterleave_repeat_2(vorb *f, Codebook *c, float **o
|
|||
// haven't optimized this case because I don't have any examples
|
||||
for (i=0; i < effective; ++i) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == 2) { c_inter = 0; ++p_inter; }
|
||||
last = val;
|
||||
}
|
||||
|
|
@ -1881,7 +1904,8 @@ static int codebook_decode_deinterleave_repeat_2(vorb *f, Codebook *c, float **o
|
|||
i=0;
|
||||
if (c_inter == 1) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
c_inter = 0; ++p_inter;
|
||||
++i;
|
||||
}
|
||||
|
|
@ -1889,15 +1913,20 @@ static int codebook_decode_deinterleave_repeat_2(vorb *f, Codebook *c, float **o
|
|||
float *z0 = outputs[0];
|
||||
float *z1 = outputs[1];
|
||||
for (; i+1 < effective;) {
|
||||
z0[p_inter] += CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
z1[p_inter] += CODEBOOK_ELEMENT_FAST(c,z+i+1) + last;
|
||||
float v0 = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
float v1 = CODEBOOK_ELEMENT_FAST(c,z+i+1) + last;
|
||||
if (z0)
|
||||
z0[p_inter] += v0;
|
||||
if (z1)
|
||||
z1[p_inter] += v1;
|
||||
++p_inter;
|
||||
i += 2;
|
||||
}
|
||||
}
|
||||
if (i < effective) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == 2) { c_inter = 0; ++p_inter; }
|
||||
}
|
||||
}
|
||||
|
|
@ -2098,7 +2127,6 @@ static void decode_residue(vorb *f, float *residue_buffers[], int ch, int n, int
|
|||
memset(residue_buffers[i], 0, sizeof(float) * n);
|
||||
|
||||
if (rtype == 2 && ch != 1) {
|
||||
int len = ch * n;
|
||||
for (j=0; j < ch; ++j)
|
||||
if (!do_not_decode[j])
|
||||
break;
|
||||
|
|
@ -2344,7 +2372,7 @@ void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype)
|
|||
}
|
||||
free(x);
|
||||
}
|
||||
#else
|
||||
#elif 0
|
||||
// transform to use a slow dct-iv; this is STILL basically trivial,
|
||||
// but only requires half as many ops
|
||||
void dct_iv_slow(float *buffer, int n)
|
||||
|
|
@ -2360,10 +2388,8 @@ void dct_iv_slow(float *buffer, int n)
|
|||
float acc = 0;
|
||||
for (j=0; j < n; ++j)
|
||||
acc += x[j] * mcos[((2 * i + 1)*(2*j+1)) & nmask];
|
||||
//acc += x[j] * cos(M_PI / n * (i + 0.5) * (j + 0.5));
|
||||
buffer[i] = acc;
|
||||
}
|
||||
free(x);
|
||||
}
|
||||
|
||||
void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype)
|
||||
|
|
@ -2604,7 +2630,6 @@ static __forceinline void iter_54(float *z)
|
|||
|
||||
static void imdct_step3_inner_s_loop_ld654(int n, float *e, int i_off, float *A, int base_n)
|
||||
{
|
||||
int k_off = -8;
|
||||
int a_off = base_n >> 3;
|
||||
float A2 = A[0+a_off];
|
||||
float *z = e + i_off;
|
||||
|
|
@ -2650,7 +2675,7 @@ static void imdct_step3_inner_s_loop_ld654(int n, float *e, int i_off, float *A,
|
|||
static void inverse_mdct(float *buffer, int n, vorb *f, int blocktype)
|
||||
{
|
||||
int n2 = n >> 1, n4 = n >> 2, n8 = n >> 3, l;
|
||||
int n3_4 = n - n4, ld;
|
||||
int ld;
|
||||
// @OPTIMIZE: reduce register pressure by using fewer variables?
|
||||
int save_point = temp_alloc_save(f);
|
||||
float *buf2 = (float *) temp_alloc(f, n2 * sizeof(*buf2));
|
||||
|
|
@ -3184,13 +3209,10 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
|
|||
int i,j,k,n,n2;
|
||||
int zero_channel[256];
|
||||
int really_zero_channel[256];
|
||||
int window_center;
|
||||
|
||||
// WINDOWING
|
||||
|
||||
n = f->blocksize[m->blockflag];
|
||||
window_center = n >> 1;
|
||||
|
||||
map = &f->mapping[m->mapping];
|
||||
|
||||
// FLOORS
|
||||
|
|
@ -3304,7 +3326,7 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
|
|||
// RESIDUE DECODE
|
||||
for (i=0; i < map->submaps; ++i) {
|
||||
float *residue_buffers[STB_VORBIS_MAX_CHANNELS];
|
||||
int r,t;
|
||||
int r;
|
||||
uint8 do_not_decode[256];
|
||||
int ch = 0;
|
||||
for (j=0; j < f->channels; ++j) {
|
||||
|
|
@ -3320,7 +3342,6 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
|
|||
}
|
||||
}
|
||||
r = map->submap_residue[i];
|
||||
t = f->residue_types[r];
|
||||
decode_residue(f, residue_buffers, ch, n2, r, do_not_decode);
|
||||
}
|
||||
|
||||
|
|
@ -3562,7 +3583,7 @@ static int is_whole_packet_present(stb_vorbis *f, int end_page)
|
|||
}
|
||||
if (end_page)
|
||||
if (s < n-1) return error(f, VORBIS_invalid_stream);
|
||||
if (s == f->segment_count)
|
||||
if (s == n)
|
||||
s = -1; // set 'crosses page' flag
|
||||
if (p > f->stream_end) return error(f, VORBIS_need_more_data);
|
||||
first = FALSE;
|
||||
|
|
@ -3713,7 +3734,6 @@ static int start_decoder(vorb *f)
|
|||
// compute the size of the sorted tables
|
||||
if (c->sparse) {
|
||||
sorted_count = total;
|
||||
//assert(total != 0);
|
||||
} else {
|
||||
sorted_count = 0;
|
||||
#ifndef STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH
|
||||
|
|
@ -3830,10 +3850,12 @@ static int start_decoder(vorb *f)
|
|||
#else
|
||||
for (j=0; j < (int) c->lookup_values; ++j)
|
||||
c->multiplicands[j] = mults[j] * c->delta_value + c->minimum_value;
|
||||
setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values);
|
||||
#endif
|
||||
setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values);
|
||||
}
|
||||
#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK
|
||||
skip:;
|
||||
#endif
|
||||
|
||||
#ifdef STB_VORBIS_CODEBOOK_FLOATS
|
||||
if (c->lookup_type == 2 && c->sequence_p) {
|
||||
|
|
@ -3980,7 +4002,7 @@ static int start_decoder(vorb *f)
|
|||
if (mapping_type != 0) return error(f, VORBIS_invalid_setup);
|
||||
m->chan = (MappingChannel *) setup_malloc(f, f->channels * sizeof(*m->chan));
|
||||
if (get_bits(f,1))
|
||||
m->submaps = get_bits(f,4);
|
||||
m->submaps = get_bits(f,4)+1;
|
||||
else
|
||||
m->submaps = 1;
|
||||
if (m->submaps > max_submaps)
|
||||
|
|
@ -3988,8 +4010,8 @@ static int start_decoder(vorb *f)
|
|||
if (get_bits(f,1)) {
|
||||
m->coupling_steps = get_bits(f,8)+1;
|
||||
for (k=0; k < m->coupling_steps; ++k) {
|
||||
m->chan[k].magnitude = get_bits(f, ilog(f->channels)-1);
|
||||
m->chan[k].angle = get_bits(f, ilog(f->channels)-1);
|
||||
m->chan[k].magnitude = get_bits(f, ilog(f->channels-1));
|
||||
m->chan[k].angle = get_bits(f, ilog(f->channels-1));
|
||||
if (m->chan[k].magnitude >= f->channels) return error(f, VORBIS_invalid_setup);
|
||||
if (m->chan[k].angle >= f->channels) return error(f, VORBIS_invalid_setup);
|
||||
if (m->chan[k].magnitude == m->chan[k].angle) return error(f, VORBIS_invalid_setup);
|
||||
|
|
@ -4138,6 +4160,7 @@ static void vorbis_deinit(stb_vorbis *p)
|
|||
setup_free(p, p->B[i]);
|
||||
setup_free(p, p->C[i]);
|
||||
setup_free(p, p->window[i]);
|
||||
setup_free(p, p->bit_reverse[i]);
|
||||
}
|
||||
#ifndef STB_VORBIS_NO_STDIO
|
||||
if (p->close_on_free) fclose(p->f);
|
||||
|
|
@ -4294,7 +4317,7 @@ static int vorbis_search_for_page_pushdata(vorb *f, uint8 *data, int data_len)
|
|||
f->next_seg = -1; // start a new page
|
||||
f->current_loc = f->scan[i].sample_loc; // set the current sample location
|
||||
// to the amount we'd have decoded had we decoded this page
|
||||
f->current_loc_valid = f->current_loc != ~0;
|
||||
f->current_loc_valid = f->current_loc != ~0U;
|
||||
return data_len;
|
||||
}
|
||||
// delete entry
|
||||
|
|
@ -4477,11 +4500,12 @@ static uint32 vorbis_find_page(stb_vorbis *f, uint32 *end, uint32 *last)
|
|||
// invalid-but-useful files?
|
||||
if (end)
|
||||
*end = stb_vorbis_get_file_offset(f);
|
||||
if (last)
|
||||
if (last) {
|
||||
if (header[5] & 0x04)
|
||||
*last = 1;
|
||||
else
|
||||
*last = 0;
|
||||
}
|
||||
set_file_offset(f, retry_loc-1);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -4514,7 +4538,7 @@ static int vorbis_analyze_page(stb_vorbis *f, ProbedPage *z)
|
|||
{
|
||||
uint8 header[27], lacing[255];
|
||||
uint8 packet_type[255];
|
||||
int num_packet, packet_start, previous =0;
|
||||
int num_packet, packet_start;
|
||||
int i,len;
|
||||
uint32 samples;
|
||||
|
||||
|
|
@ -4547,7 +4571,7 @@ static int vorbis_analyze_page(stb_vorbis *f, ProbedPage *z)
|
|||
|
||||
// scan through the frames to determine the sample-count of each one...
|
||||
// our goal is the sample # of the first fully-decoded sample on the
|
||||
// page, which is the first decoded sample of the 2nd page
|
||||
// page, which is the first decoded sample of the 2nd packet
|
||||
|
||||
num_packet=0;
|
||||
|
||||
|
|
@ -4555,18 +4579,15 @@ static int vorbis_analyze_page(stb_vorbis *f, ProbedPage *z)
|
|||
|
||||
for (i=0; i < header[26]; ++i) {
|
||||
if (packet_start) {
|
||||
uint8 n,b,m;
|
||||
uint8 n,b;
|
||||
if (lacing[i] == 0) goto bail; // trying to read from zero-length packet
|
||||
n = get8(f);
|
||||
// if bottom bit is non-zero, we've got corruption
|
||||
if (n & 1) goto bail;
|
||||
n >>= 1;
|
||||
b = ilog(f->mode_count-1);
|
||||
m = n >> b;
|
||||
n &= (1 << b)-1;
|
||||
if (n >= f->mode_count) goto bail;
|
||||
if (num_packet == 0 && f->mode_config[n].blockflag)
|
||||
previous = (m & 1);
|
||||
packet_type[num_packet++] = f->mode_config[n].blockflag;
|
||||
skip(f, lacing[i]-1);
|
||||
} else
|
||||
|
|
@ -4855,7 +4876,7 @@ unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f)
|
|||
|
||||
if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing);
|
||||
if (!f->total_samples) {
|
||||
int last;
|
||||
unsigned int last;
|
||||
uint32 lo,hi;
|
||||
char header[6];
|
||||
|
||||
|
|
@ -4873,7 +4894,7 @@ unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f)
|
|||
// previous_safe is now our candidate 'earliest known place that seeking
|
||||
// to will lead to the final page'
|
||||
|
||||
if (!vorbis_find_page(f, &end, (int unsigned *)&last)) {
|
||||
if (!vorbis_find_page(f, &end, &last)) {
|
||||
// if we can't find a page, we're hosed!
|
||||
f->error = VORBIS_cant_find_last_page;
|
||||
f->total_samples = 0xffffffff;
|
||||
|
|
@ -4888,7 +4909,7 @@ unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f)
|
|||
// explicitly checking the length of the section
|
||||
while (!last) {
|
||||
set_file_offset(f, end);
|
||||
if (!vorbis_find_page(f, &end, (int unsigned *)&last)) {
|
||||
if (!vorbis_find_page(f, &end, &last)) {
|
||||
// the last page we found didn't have the 'last page' flag
|
||||
// set. whoops!
|
||||
break;
|
||||
|
|
@ -4987,7 +5008,7 @@ stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, stb
|
|||
return stb_vorbis_open_file_section(file, close_on_free, error, alloc, len);
|
||||
}
|
||||
|
||||
stb_vorbis * stb_vorbis_open_filename(char *filename, int *error, stb_vorbis_alloc *alloc)
|
||||
stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, stb_vorbis_alloc *alloc)
|
||||
{
|
||||
FILE *f = fopen(filename, "rb");
|
||||
if (f)
|
||||
|
|
@ -4997,14 +5018,14 @@ stb_vorbis * stb_vorbis_open_filename(char *filename, int *error, stb_vorbis_all
|
|||
}
|
||||
#endif // STB_VORBIS_NO_STDIO
|
||||
|
||||
stb_vorbis * stb_vorbis_open_memory(unsigned char *data, int len, int *error, stb_vorbis_alloc *alloc)
|
||||
stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *error, stb_vorbis_alloc *alloc)
|
||||
{
|
||||
stb_vorbis *f, p;
|
||||
if (data == NULL) return NULL;
|
||||
vorbis_init(&p, alloc);
|
||||
p.stream = data;
|
||||
p.stream_end = data + len;
|
||||
p.stream_start = p.stream;
|
||||
p.stream = (uint8 *) data;
|
||||
p.stream_end = (uint8 *) data + len;
|
||||
p.stream_start = (uint8 *) p.stream;
|
||||
p.stream_len = len;
|
||||
p.push_mode = FALSE;
|
||||
if (start_decoder(&p)) {
|
||||
|
|
@ -5097,7 +5118,6 @@ static void compute_samples(int mask, short *output, int num_c, float **data, in
|
|||
}
|
||||
}
|
||||
|
||||
static int channel_selector[3][2] = { {0}, {PLAYBACK_MONO}, {PLAYBACK_LEFT, PLAYBACK_RIGHT} };
|
||||
static void compute_stereo_samples(short *output, int num_c, float **data, int d_offset, int len)
|
||||
{
|
||||
#define BUFFER_SIZE 32
|
||||
|
|
@ -5147,7 +5167,7 @@ static void convert_samples_short(int buf_c, short **buffer, int b_offset, int d
|
|||
} else {
|
||||
int limit = buf_c < data_c ? buf_c : data_c;
|
||||
for (i=0; i < limit; ++i)
|
||||
copy_samples(buffer[i]+b_offset, data[i], samples);
|
||||
copy_samples(buffer[i]+b_offset, data[i]+d_offset, samples);
|
||||
for ( ; i < buf_c; ++i)
|
||||
memset(buffer[i]+b_offset, 0, sizeof(short) * samples);
|
||||
}
|
||||
|
|
@ -5243,7 +5263,7 @@ int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, in
|
|||
}
|
||||
|
||||
#ifndef STB_VORBIS_NO_STDIO
|
||||
int stb_vorbis_decode_filename(char *filename, int *channels, short **output)
|
||||
int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output)
|
||||
{
|
||||
int data_len, offset, total, limit, error;
|
||||
short *data;
|
||||
|
|
@ -5251,6 +5271,8 @@ int stb_vorbis_decode_filename(char *filename, int *channels, short **output)
|
|||
if (v == NULL) return -1;
|
||||
limit = v->channels * 4096;
|
||||
*channels = v->channels;
|
||||
if (sample_rate)
|
||||
*sample_rate = v->sample_rate;
|
||||
offset = data_len = 0;
|
||||
total = limit;
|
||||
data = (short *) malloc(total * sizeof(*data));
|
||||
|
|
@ -5276,11 +5298,12 @@ int stb_vorbis_decode_filename(char *filename, int *channels, short **output)
|
|||
}
|
||||
}
|
||||
*output = data;
|
||||
stb_vorbis_close(v);
|
||||
return data_len;
|
||||
}
|
||||
#endif // NO_STDIO
|
||||
|
||||
int stb_vorbis_decode_memory(uint8 *mem, int len, int *channels, short **output)
|
||||
int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *sample_rate, short **output)
|
||||
{
|
||||
int data_len, offset, total, limit, error;
|
||||
short *data;
|
||||
|
|
@ -5288,6 +5311,8 @@ int stb_vorbis_decode_memory(uint8 *mem, int len, int *channels, short **output)
|
|||
if (v == NULL) return -1;
|
||||
limit = v->channels * 4096;
|
||||
*channels = v->channels;
|
||||
if (sample_rate)
|
||||
*sample_rate = v->sample_rate;
|
||||
offset = data_len = 0;
|
||||
total = limit;
|
||||
data = (short *) malloc(total * sizeof(*data));
|
||||
|
|
@ -5313,9 +5338,10 @@ int stb_vorbis_decode_memory(uint8 *mem, int len, int *channels, short **output)
|
|||
}
|
||||
}
|
||||
*output = data;
|
||||
stb_vorbis_close(v);
|
||||
return data_len;
|
||||
}
|
||||
#endif
|
||||
#endif // STB_VORBIS_NO_INTEGER_CONVERSION
|
||||
|
||||
int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats)
|
||||
{
|
||||
|
|
@ -5336,8 +5362,10 @@ int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float
|
|||
}
|
||||
n += k;
|
||||
f->channel_buffer_start += k;
|
||||
if (n == len) break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break;
|
||||
if (n == len)
|
||||
break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs))
|
||||
break;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
|
@ -5354,17 +5382,64 @@ int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, in
|
|||
if (n+k >= num_samples) k = num_samples - n;
|
||||
if (k) {
|
||||
for (i=0; i < z; ++i)
|
||||
memcpy(buffer[i]+n, f->channel_buffers+f->channel_buffer_start, sizeof(float)*k);
|
||||
memcpy(buffer[i]+n, f->channel_buffers[i]+f->channel_buffer_start, sizeof(float)*k);
|
||||
for ( ; i < channels; ++i)
|
||||
memset(buffer[i]+n, 0, sizeof(float) * k);
|
||||
}
|
||||
n += k;
|
||||
f->channel_buffer_start += k;
|
||||
if (n == num_samples) break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break;
|
||||
if (n == num_samples)
|
||||
break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs))
|
||||
break;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
#endif // STB_VORBIS_NO_PULLDATA_API
|
||||
|
||||
/* Version history
|
||||
1.05 - 2015/04/19 - don't define __forceinline if it's redundant
|
||||
1.04 - 2014/08/27 - fix missing const-correct case in API
|
||||
1.03 - 2014/08/07 - Warning fixes
|
||||
1.02 - 2014/07/09 - Declare qsort compare function _cdecl on windows
|
||||
1.01 - 2014/06/18 - fix stb_vorbis_get_samples_float
|
||||
1.0 - 2014/05/26 - fix memory leaks; fix warnings; fix bugs in multichannel
|
||||
(API change) report sample rate for decode-full-file funcs
|
||||
0.99996 - bracket #include <malloc.h> for macintosh compilation by Laurent Gomila
|
||||
0.99995 - use union instead of pointer-cast for fast-float-to-int to avoid alias-optimization problem
|
||||
0.99994 - change fast-float-to-int to work in single-precision FPU mode, remove endian-dependence
|
||||
0.99993 - remove assert that fired on legal files with empty tables
|
||||
0.99992 - rewind-to-start
|
||||
0.99991 - bugfix to stb_vorbis_get_samples_short by Bernhard Wodo
|
||||
0.9999 - (should have been 0.99990) fix no-CRT support, compiling as C++
|
||||
0.9998 - add a full-decode function with a memory source
|
||||
0.9997 - fix a bug in the read-from-FILE case in 0.9996 addition
|
||||
0.9996 - query length of vorbis stream in samples/seconds
|
||||
0.9995 - bugfix to another optimization that only happened in certain files
|
||||
0.9994 - bugfix to one of the optimizations that caused significant (but inaudible?) errors
|
||||
0.9993 - performance improvements; runs in 99% to 104% of time of reference implementation
|
||||
0.9992 - performance improvement of IMDCT; now performs close to reference implementation
|
||||
0.9991 - performance improvement of IMDCT
|
||||
0.999 - (should have been 0.9990) performance improvement of IMDCT
|
||||
0.998 - no-CRT support from Casey Muratori
|
||||
0.997 - bugfixes for bugs found by Terje Mathisen
|
||||
0.996 - bugfix: fast-huffman decode initialized incorrectly for sparse codebooks; fixing gives 10% speedup - found by Terje Mathisen
|
||||
0.995 - bugfix: fix to 'effective' overrun detection - found by Terje Mathisen
|
||||
0.994 - bugfix: garbage decode on final VQ symbol of a non-multiple - found by Terje Mathisen
|
||||
0.993 - bugfix: pushdata API required 1 extra byte for empty page (failed to consume final page if empty) - found by Terje Mathisen
|
||||
0.992 - fixes for MinGW warning
|
||||
0.991 - turn fast-float-conversion on by default
|
||||
0.990 - fix push-mode seek recovery if you seek into the headers
|
||||
0.98b - fix to bad release of 0.98
|
||||
0.98 - fix push-mode seek recovery; robustify float-to-int and support non-fast mode
|
||||
0.97 - builds under c++ (typecasting, don't use 'class' keyword)
|
||||
0.96 - somehow MY 0.95 was right, but the web one was wrong, so here's my 0.95 rereleased as 0.96, fixes a typo in the clamping code
|
||||
0.95 - clamping code for 16-bit functions
|
||||
0.94 - not publically released
|
||||
0.93 - fixed all-zero-floor case (was decoding garbage)
|
||||
0.92 - fixed a memory leak
|
||||
0.91 - conditional compiles to omit parts of the API and the infrastructure to support them: STB_VORBIS_NO_PULLDATA_API, STB_VORBIS_NO_PUSHDATA_API, STB_VORBIS_NO_STDIO, STB_VORBIS_NO_INTEGER_CONVERSION
|
||||
0.90 - first public release
|
||||
*/
|
||||
|
||||
#endif // STB_VORBIS_HEADER_ONLY
|
||||
|
|
|
|||
|
|
@ -13,34 +13,34 @@
|
|||
|
||||
snd_sequence_struct *snd_decode_ogg(uint8 *buffer,int32 bytes){
|
||||
|
||||
int result;
|
||||
int channels;
|
||||
short *out;
|
||||
result=stb_vorbis_decode_memory((unsigned char *)buffer,bytes,&channels,&out);
|
||||
if (result==-1) return NULL;
|
||||
//extern int stb_vorbis_decode_memory(unsigned char *mem, int len, int *channels, short **output);
|
||||
// decode an entire file and output the data interleaved into a malloc()ed
|
||||
// buffer stored in *output. The return value is the number of samples
|
||||
// decoded, or -1 if the file could not be opened or was not an ogg vorbis file.
|
||||
// When you're done with it, just free() the pointer returned in *output.
|
||||
int result;
|
||||
int channels;
|
||||
int samplerate;
|
||||
short *out;
|
||||
result=stb_vorbis_decode_memory((unsigned char *)buffer,bytes,&channels,&samplerate,&out);
|
||||
if (result==-1) return NULL;
|
||||
//extern int stb_vorbis_decode_memory(unsigned char *mem, int len, int *channels, int *sample_rate, short **output);
|
||||
// decode an entire file and output the data interleaved into a malloc()ed
|
||||
// buffer stored in *output. The return value is the number of samples
|
||||
// decoded, or -1 if the file could not be opened or was not an ogg vorbis file.
|
||||
// When you're done with it, just free() the pointer returned in *output.
|
||||
|
||||
//attach to new sequence
|
||||
static int32 seq_handle; seq_handle=list_add(snd_sequences);
|
||||
static snd_sequence_struct *seq; seq=(snd_sequence_struct*)list_get(snd_sequences,seq_handle);
|
||||
memset(seq,0,sizeof(snd_sequence_struct));
|
||||
seq->references=1;
|
||||
//attach to new sequence
|
||||
static int32 seq_handle; seq_handle=list_add(snd_sequences);
|
||||
static snd_sequence_struct *seq; seq=(snd_sequence_struct*)list_get(snd_sequences,seq_handle);
|
||||
memset(seq,0,sizeof(snd_sequence_struct));
|
||||
seq->references=1;
|
||||
|
||||
seq->channels=channels;
|
||||
seq->sample_rate=44100;
|
||||
seq->bits_per_sample=16;
|
||||
seq->endian=0;//native
|
||||
seq->is_unsigned=0;
|
||||
seq->data=(uint8*)out;
|
||||
seq->data_size=result*2*channels;
|
||||
seq->channels=channels;
|
||||
seq->sample_rate=samplerate;
|
||||
seq->bits_per_sample=16;
|
||||
seq->endian=0;//native
|
||||
seq->is_unsigned=0;
|
||||
seq->data=(uint8*)out;
|
||||
seq->data_size=result*2*channels;
|
||||
|
||||
|
||||
return seq;
|
||||
|
||||
return seq;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,46 @@
|
|||
// Ogg Vorbis I audio decoder -- version 0.99996
|
||||
// Ogg Vorbis audio decoder - v1.05 - public domain
|
||||
// http://nothings.org/stb_vorbis/
|
||||
//
|
||||
// Written in April 2007 by Sean Barrett, sponsored by RAD Game Tools.
|
||||
// Written by Sean Barrett in 2007, last updated in 2014
|
||||
// Sponsored by RAD Game Tools.
|
||||
//
|
||||
// Placed in the public domain April 2007 by the author: no copyright is
|
||||
// claimed, and you may use it for any purpose you like.
|
||||
// Placed in the public domain April 2007 by the author: no copyright
|
||||
// is claimed, and you may use it for any purpose you like.
|
||||
//
|
||||
// No warranty for any purpose is expressed or implied by the author (nor
|
||||
// by RAD Game Tools). Report bugs and send enhancements to the author.
|
||||
//
|
||||
// Get the latest version and other information at:
|
||||
// http://nothings.org/stb_vorbis/
|
||||
|
||||
|
||||
// Todo:
|
||||
//
|
||||
// - seeking (note you can seek yourself using the pushdata API)
|
||||
//
|
||||
// Limitations:
|
||||
//
|
||||
// - floor 0 not supported (used in old ogg vorbis files)
|
||||
// - seeking not supported except manually via PUSHDATA api
|
||||
// - floor 0 not supported (used in old ogg vorbis files pre-2004)
|
||||
// - lossless sample-truncation at beginning ignored
|
||||
// - cannot concatenate multiple vorbis streams
|
||||
// - sample positions are 32-bit, limiting seekable 192Khz
|
||||
// files to around 6 hours (Ogg supports 64-bit)
|
||||
//
|
||||
// All of these limitations may be removed in future versions.
|
||||
// Bugfix/warning contributors:
|
||||
// Terje Mathisen Niklas Frykholm Andy Hill
|
||||
// Casey Muratori John Bolton Gargaj
|
||||
// Laurent Gomila Marc LeBlanc Ronny Chevalier
|
||||
// Bernhard Wodo Evan Balster "alxprd"@github
|
||||
// Tom Beaumont Ingo Leitgeb Nicolas Guillemot
|
||||
// (If you reported a bug but do not appear in this list, it is because
|
||||
// someone else reported the bug before you. There were too many of you to
|
||||
// list them all because I was lax about updating for a long time, sorry.)
|
||||
//
|
||||
// Partial history:
|
||||
// 1.05 - 2015/04/19 - don't define __forceinline if it's redundant
|
||||
// 1.04 - 2014/08/27 - fix missing const-correct case in API
|
||||
// 1.03 - 2014/08/07 - warning fixes
|
||||
// 1.02 - 2014/07/09 - declare qsort comparison as explicitly _cdecl in Windows
|
||||
// 1.01 - 2014/06/18 - fix stb_vorbis_get_samples_float (interleaved was correct)
|
||||
// 1.0 - 2014/05/26 - fix memory leaks; fix warnings; fix bugs in >2-channel;
|
||||
// (API change) report sample rate for decode-full-file funcs
|
||||
// 0.99996 - - bracket #include <malloc.h> for macintosh compilation
|
||||
// 0.99995 - - avoid alias-optimization issue in float-to-int conversion
|
||||
//
|
||||
// See end of file for full version history.
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -153,6 +169,7 @@ extern int stb_vorbis_decode_frame_pushdata(
|
|||
// decode a frame of audio sample data if possible from the passed-in data block
|
||||
//
|
||||
// return value: number of bytes we used from datablock
|
||||
//
|
||||
// possible cases:
|
||||
// 0 bytes used, 0 samples output (need more data)
|
||||
// N bytes used, 0 samples output (resynching the stream, keep going)
|
||||
|
|
@ -197,21 +214,23 @@ extern void stb_vorbis_flush_pushdata(stb_vorbis *f);
|
|||
// just want to go ahead and use pushdata.)
|
||||
|
||||
#if !defined(STB_VORBIS_NO_STDIO) && !defined(STB_VORBIS_NO_INTEGER_CONVERSION)
|
||||
extern int stb_vorbis_decode_filename(char *filename, int *channels, short **output);
|
||||
extern int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output);
|
||||
#endif
|
||||
#if !defined(STB_VORBIS_NO_INTEGER_CONVERSION)
|
||||
extern int stb_vorbis_decode_memory(const unsigned char *mem, int len, int *channels, int *sample_rate, short **output);
|
||||
#endif
|
||||
extern int stb_vorbis_decode_memory(unsigned char *mem, int len, int *channels, short **output);
|
||||
// decode an entire file and output the data interleaved into a malloc()ed
|
||||
// buffer stored in *output. The return value is the number of samples
|
||||
// decoded, or -1 if the file could not be opened or was not an ogg vorbis file.
|
||||
// When you're done with it, just free() the pointer returned in *output.
|
||||
|
||||
extern stb_vorbis * stb_vorbis_open_memory(unsigned char *data, int len,
|
||||
extern stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len,
|
||||
int *error, stb_vorbis_alloc *alloc_buffer);
|
||||
// create an ogg vorbis decoder from an ogg vorbis stream in memory (note
|
||||
// this must be the entire stream!). on failure, returns NULL and sets *error
|
||||
|
||||
#ifndef STB_VORBIS_NO_STDIO
|
||||
extern stb_vorbis * stb_vorbis_open_filename(char *filename,
|
||||
extern stb_vorbis * stb_vorbis_open_filename(const char *filename,
|
||||
int *error, stb_vorbis_alloc *alloc_buffer);
|
||||
// create an ogg vorbis decoder from a filename via fopen(). on failure,
|
||||
// returns NULL and sets *error (possibly to VORBIS_file_open_failure).
|
||||
|
|
@ -535,13 +554,15 @@ enum STBVorbisError
|
|||
#define NULL 0
|
||||
#endif
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#if 0
|
||||
#if !defined(_MSC_VER) && !(defined(__MINGW32__) && defined(__forceinline))
|
||||
#if __GNUC__
|
||||
#define __forceinline inline
|
||||
#else
|
||||
#define __forceinline
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if STB_VORBIS_MAX_CHANNELS > 256
|
||||
#error "Value of STB_VORBIS_MAX_CHANNELS outside of allowed range"
|
||||
|
|
@ -812,7 +833,7 @@ extern int my_prof(int slot);
|
|||
//#define stb_prof my_prof
|
||||
|
||||
#ifndef stb_prof
|
||||
#define stb_prof(x) 0
|
||||
#define stb_prof(x) ((void) 0)
|
||||
#endif
|
||||
|
||||
#if defined(STB_VORBIS_NO_PUSHDATA_API)
|
||||
|
|
@ -896,7 +917,7 @@ static void *setup_temp_malloc(vorb *f, int sz)
|
|||
return malloc(sz);
|
||||
}
|
||||
|
||||
static void setup_temp_free(vorb *f, void *p, size_t sz)
|
||||
static void setup_temp_free(vorb *f, void *p, int sz)
|
||||
{
|
||||
if (f->alloc.alloc_buffer) {
|
||||
f->temp_offset += (sz+3)&~3;
|
||||
|
|
@ -914,12 +935,12 @@ static void crc32_init(void)
|
|||
uint32 s;
|
||||
for(i=0; i < 256; i++) {
|
||||
for (s=i<<24, j=0; j < 8; ++j)
|
||||
s = (s << 1) ^ (s >= (1<<31) ? CRC32_POLY : 0);
|
||||
s = (s << 1) ^ (s >= (1U<<31) ? CRC32_POLY : 0);
|
||||
crc_table[i] = s;
|
||||
}
|
||||
}
|
||||
|
||||
static __forceinline uint32 crc32_update(uint32 crc, uint8 byte)
|
||||
static inline uint32 crc32_update(uint32 crc, uint8 byte)
|
||||
{
|
||||
return (crc << 8) ^ crc_table[byte ^ (crc >> 24)];
|
||||
}
|
||||
|
|
@ -948,15 +969,15 @@ static int ilog(int32 n)
|
|||
static signed char log2_4[16] = { 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4 };
|
||||
|
||||
// 2 compares if n < 16, 3 compares otherwise (4 if signed or n > 1<<29)
|
||||
if (n < (1U << 14))
|
||||
if (n < (1U << 4)) return 0 + log2_4[n ];
|
||||
else if (n < (1U << 9)) return 5 + log2_4[n >> 5];
|
||||
if (n < (1 << 14))
|
||||
if (n < (1 << 4)) return 0 + log2_4[n ];
|
||||
else if (n < (1 << 9)) return 5 + log2_4[n >> 5];
|
||||
else return 10 + log2_4[n >> 10];
|
||||
else if (n < (1U << 24))
|
||||
if (n < (1U << 19)) return 15 + log2_4[n >> 15];
|
||||
else if (n < (1 << 24))
|
||||
if (n < (1 << 19)) return 15 + log2_4[n >> 15];
|
||||
else return 20 + log2_4[n >> 20];
|
||||
else if (n < (1U << 29)) return 25 + log2_4[n >> 25];
|
||||
else if (n < (1U << 31)) return 30 + log2_4[n >> 30];
|
||||
else if (n < (1 << 29)) return 25 + log2_4[n >> 25];
|
||||
else if (n < (1 << 31)) return 30 + log2_4[n >> 30];
|
||||
else return 0; // signed n returns 0
|
||||
}
|
||||
|
||||
|
|
@ -1069,7 +1090,13 @@ static void compute_accelerated_huffman(Codebook *c)
|
|||
}
|
||||
}
|
||||
|
||||
static int uint32_compare(const void *p, const void *q)
|
||||
#ifdef _MSC_VER
|
||||
#define STBV_CDECL __cdecl
|
||||
#else
|
||||
#define STBV_CDECL
|
||||
#endif
|
||||
|
||||
static int STBV_CDECL uint32_compare(const void *p, const void *q)
|
||||
{
|
||||
uint32 x = * (uint32 *) p;
|
||||
uint32 y = * (uint32 *) q;
|
||||
|
|
@ -1225,7 +1252,7 @@ typedef struct
|
|||
uint16 x,y;
|
||||
} Point;
|
||||
|
||||
int point_compare(const void *p, const void *q)
|
||||
static int STBV_CDECL point_compare(const void *p, const void *q)
|
||||
{
|
||||
Point *a = (Point *) p;
|
||||
Point *b = (Point *) q;
|
||||
|
|
@ -1351,7 +1378,7 @@ static int capture_pattern(vorb *f)
|
|||
|
||||
static int start_page_no_capturepattern(vorb *f)
|
||||
{
|
||||
uint32 loc0,loc1,n,i;
|
||||
uint32 loc0,loc1,n;
|
||||
// stream structure version
|
||||
if (0 != get8(f)) return error(f, VORBIS_invalid_stream_structure_version);
|
||||
// header flag
|
||||
|
|
@ -1374,7 +1401,8 @@ static int start_page_no_capturepattern(vorb *f)
|
|||
return error(f, VORBIS_unexpected_eof);
|
||||
// assume we _don't_ know any the sample position of any segments
|
||||
f->end_seg_with_known_loc = -2;
|
||||
if (loc0 != ~0 || loc1 != ~0) {
|
||||
if (loc0 != ~0U || loc1 != ~0U) {
|
||||
int i;
|
||||
// determine which packet is the last one that will complete
|
||||
for (i=f->segment_count-1; i >= 0; --i)
|
||||
if (f->segments[i] < 255)
|
||||
|
|
@ -1471,9 +1499,10 @@ static int next_segment(vorb *f)
|
|||
|
||||
static int get8_packet_raw(vorb *f)
|
||||
{
|
||||
if (!f->bytes_in_seg)
|
||||
if (!f->bytes_in_seg) { // CLANG!
|
||||
if (f->last_seg) return EOP;
|
||||
else if (!next_segment(f)) return EOP;
|
||||
}
|
||||
assert(f->bytes_in_seg > 0);
|
||||
--f->bytes_in_seg;
|
||||
++f->packet_bytes;
|
||||
|
|
@ -1524,19 +1553,11 @@ static uint32 get_bits(vorb *f, int n)
|
|||
return z;
|
||||
}
|
||||
|
||||
static int32 get_bits_signed(vorb *f, int n)
|
||||
{
|
||||
uint32 z = get_bits(f, n);
|
||||
if (z & (1 << (n-1)))
|
||||
z += ~((1 << n) - 1);
|
||||
return (int32) z;
|
||||
}
|
||||
|
||||
// @OPTIMIZE: primary accumulator for huffman
|
||||
// expand the buffer to as many bits as possible without reading off end of packet
|
||||
// it might be nice to allow f->valid_bits and f->acc to be stored in registers,
|
||||
// e.g. cache them locally and decode locally
|
||||
static __forceinline void prep_huffman(vorb *f)
|
||||
static inline void prep_huffman(vorb *f)
|
||||
{
|
||||
if (f->valid_bits <= 24) {
|
||||
if (f->valid_bits == 0) f->acc = 0;
|
||||
|
|
@ -1615,23 +1636,6 @@ static int codebook_decode_scalar_raw(vorb *f, Codebook *c)
|
|||
return -1;
|
||||
}
|
||||
|
||||
static int codebook_decode_scalar(vorb *f, Codebook *c)
|
||||
{
|
||||
int i;
|
||||
if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH)
|
||||
prep_huffman(f);
|
||||
// fast huffman table lookup
|
||||
i = f->acc & FAST_HUFFMAN_TABLE_MASK;
|
||||
i = c->fast_huffman[i];
|
||||
if (i >= 0) {
|
||||
f->acc >>= c->codeword_lengths[i];
|
||||
f->valid_bits -= c->codeword_lengths[i];
|
||||
if (f->valid_bits < 0) { f->valid_bits = 0; return -1; }
|
||||
return i;
|
||||
}
|
||||
return codebook_decode_scalar_raw(f,c);
|
||||
}
|
||||
|
||||
#ifndef STB_VORBIS_NO_INLINE_DECODE
|
||||
|
||||
#define DECODE_RAW(var, f,c) \
|
||||
|
|
@ -1650,6 +1654,23 @@ static int codebook_decode_scalar(vorb *f, Codebook *c)
|
|||
|
||||
#else
|
||||
|
||||
static int codebook_decode_scalar(vorb *f, Codebook *c)
|
||||
{
|
||||
int i;
|
||||
if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH)
|
||||
prep_huffman(f);
|
||||
// fast huffman table lookup
|
||||
i = f->acc & FAST_HUFFMAN_TABLE_MASK;
|
||||
i = c->fast_huffman[i];
|
||||
if (i >= 0) {
|
||||
f->acc >>= c->codeword_lengths[i];
|
||||
f->valid_bits -= c->codeword_lengths[i];
|
||||
if (f->valid_bits < 0) { f->valid_bits = 0; return -1; }
|
||||
return i;
|
||||
}
|
||||
return codebook_decode_scalar_raw(f,c);
|
||||
}
|
||||
|
||||
#define DECODE_RAW(var,f,c) var = codebook_decode_scalar(f,c);
|
||||
|
||||
#endif
|
||||
|
|
@ -1681,7 +1702,7 @@ static int codebook_decode_scalar(vorb *f, Codebook *c)
|
|||
#define CODEBOOK_ELEMENT_BASE(c) (0)
|
||||
#endif
|
||||
|
||||
static int codebook_decode_start(vorb *f, Codebook *c, int len)
|
||||
static int codebook_decode_start(vorb *f, Codebook *c)
|
||||
{
|
||||
int z = -1;
|
||||
|
||||
|
|
@ -1703,7 +1724,7 @@ static int codebook_decode_start(vorb *f, Codebook *c, int len)
|
|||
|
||||
static int codebook_decode(vorb *f, Codebook *c, float *output, int len)
|
||||
{
|
||||
int i,z = codebook_decode_start(f,c,len);
|
||||
int i,z = codebook_decode_start(f,c);
|
||||
if (z < 0) return FALSE;
|
||||
if (len > c->dimensions) len = c->dimensions;
|
||||
|
||||
|
|
@ -1742,7 +1763,7 @@ static int codebook_decode(vorb *f, Codebook *c, float *output, int len)
|
|||
|
||||
static int codebook_decode_step(vorb *f, Codebook *c, float *output, int len, int step)
|
||||
{
|
||||
int i,z = codebook_decode_start(f,c,len);
|
||||
int i,z = codebook_decode_start(f,c);
|
||||
float last = CODEBOOK_ELEMENT_BASE(c);
|
||||
if (z < 0) return FALSE;
|
||||
if (len > c->dimensions) len = c->dimensions;
|
||||
|
|
@ -1806,7 +1827,8 @@ static int codebook_decode_deinterleave_repeat(vorb *f, Codebook *c, float **out
|
|||
for (i=0; i < effective; ++i) {
|
||||
int off = (z / div) % c->lookup_values;
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,off) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == ch) { c_inter = 0; ++p_inter; }
|
||||
if (c->sequence_p) last = val;
|
||||
div *= c->lookup_values;
|
||||
|
|
@ -1818,14 +1840,16 @@ static int codebook_decode_deinterleave_repeat(vorb *f, Codebook *c, float **out
|
|||
if (c->sequence_p) {
|
||||
for (i=0; i < effective; ++i) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == ch) { c_inter = 0; ++p_inter; }
|
||||
last = val;
|
||||
}
|
||||
} else {
|
||||
for (i=0; i < effective; ++i) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == ch) { c_inter = 0; ++p_inter; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1873,7 +1897,8 @@ static int codebook_decode_deinterleave_repeat_2(vorb *f, Codebook *c, float **o
|
|||
// haven't optimized this case because I don't have any examples
|
||||
for (i=0; i < effective; ++i) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == 2) { c_inter = 0; ++p_inter; }
|
||||
last = val;
|
||||
}
|
||||
|
|
@ -1881,7 +1906,8 @@ static int codebook_decode_deinterleave_repeat_2(vorb *f, Codebook *c, float **o
|
|||
i=0;
|
||||
if (c_inter == 1) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
c_inter = 0; ++p_inter;
|
||||
++i;
|
||||
}
|
||||
|
|
@ -1889,15 +1915,20 @@ static int codebook_decode_deinterleave_repeat_2(vorb *f, Codebook *c, float **o
|
|||
float *z0 = outputs[0];
|
||||
float *z1 = outputs[1];
|
||||
for (; i+1 < effective;) {
|
||||
z0[p_inter] += CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
z1[p_inter] += CODEBOOK_ELEMENT_FAST(c,z+i+1) + last;
|
||||
float v0 = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
float v1 = CODEBOOK_ELEMENT_FAST(c,z+i+1) + last;
|
||||
if (z0)
|
||||
z0[p_inter] += v0;
|
||||
if (z1)
|
||||
z1[p_inter] += v1;
|
||||
++p_inter;
|
||||
i += 2;
|
||||
}
|
||||
}
|
||||
if (i < effective) {
|
||||
float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last;
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (outputs[c_inter])
|
||||
outputs[c_inter][p_inter] += val;
|
||||
if (++c_inter == 2) { c_inter = 0; ++p_inter; }
|
||||
}
|
||||
}
|
||||
|
|
@ -2010,7 +2041,7 @@ static float inverse_db_table[256] =
|
|||
int8 integer_divide_table[DIVTAB_NUMER][DIVTAB_DENOM]; // 2KB
|
||||
#endif
|
||||
|
||||
static __forceinline void draw_line(float *output, int x0, int y0, int x1, int y1, int n)
|
||||
static inline void draw_line(float *output, int x0, int y0, int x1, int y1, int n)
|
||||
{
|
||||
int dy = y1 - y0;
|
||||
int adx = x1 - x0;
|
||||
|
|
@ -2098,7 +2129,6 @@ static void decode_residue(vorb *f, float *residue_buffers[], int ch, int n, int
|
|||
memset(residue_buffers[i], 0, sizeof(float) * n);
|
||||
|
||||
if (rtype == 2 && ch != 1) {
|
||||
int len = ch * n;
|
||||
for (j=0; j < ch; ++j)
|
||||
if (!do_not_decode[j])
|
||||
break;
|
||||
|
|
@ -2344,7 +2374,7 @@ void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype)
|
|||
}
|
||||
free(x);
|
||||
}
|
||||
#else
|
||||
#elif 0
|
||||
// transform to use a slow dct-iv; this is STILL basically trivial,
|
||||
// but only requires half as many ops
|
||||
void dct_iv_slow(float *buffer, int n)
|
||||
|
|
@ -2360,10 +2390,8 @@ void dct_iv_slow(float *buffer, int n)
|
|||
float acc = 0;
|
||||
for (j=0; j < n; ++j)
|
||||
acc += x[j] * mcos[((2 * i + 1)*(2*j+1)) & nmask];
|
||||
//acc += x[j] * cos(M_PI / n * (i + 0.5) * (j + 0.5));
|
||||
buffer[i] = acc;
|
||||
}
|
||||
free(x);
|
||||
}
|
||||
|
||||
void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype)
|
||||
|
|
@ -2570,7 +2598,7 @@ static void imdct_step3_inner_s_loop(int n, float *e, int i_off, int k_off, floa
|
|||
}
|
||||
}
|
||||
|
||||
static __forceinline void iter_54(float *z)
|
||||
static inline void iter_54(float *z)
|
||||
{
|
||||
float k00,k11,k22,k33;
|
||||
float y0,y1,y2,y3;
|
||||
|
|
@ -2604,7 +2632,6 @@ static __forceinline void iter_54(float *z)
|
|||
|
||||
static void imdct_step3_inner_s_loop_ld654(int n, float *e, int i_off, float *A, int base_n)
|
||||
{
|
||||
int k_off = -8;
|
||||
int a_off = base_n >> 3;
|
||||
float A2 = A[0+a_off];
|
||||
float *z = e + i_off;
|
||||
|
|
@ -2650,7 +2677,7 @@ static void imdct_step3_inner_s_loop_ld654(int n, float *e, int i_off, float *A,
|
|||
static void inverse_mdct(float *buffer, int n, vorb *f, int blocktype)
|
||||
{
|
||||
int n2 = n >> 1, n4 = n >> 2, n8 = n >> 3, l;
|
||||
int n3_4 = n - n4, ld;
|
||||
int ld;
|
||||
// @OPTIMIZE: reduce register pressure by using fewer variables?
|
||||
int save_point = temp_alloc_save(f);
|
||||
float *buf2 = (float *) temp_alloc(f, n2 * sizeof(*buf2));
|
||||
|
|
@ -3184,13 +3211,10 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
|
|||
int i,j,k,n,n2;
|
||||
int zero_channel[256];
|
||||
int really_zero_channel[256];
|
||||
int window_center;
|
||||
|
||||
// WINDOWING
|
||||
|
||||
n = f->blocksize[m->blockflag];
|
||||
window_center = n >> 1;
|
||||
|
||||
map = &f->mapping[m->mapping];
|
||||
|
||||
// FLOORS
|
||||
|
|
@ -3304,7 +3328,7 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
|
|||
// RESIDUE DECODE
|
||||
for (i=0; i < map->submaps; ++i) {
|
||||
float *residue_buffers[STB_VORBIS_MAX_CHANNELS];
|
||||
int r,t;
|
||||
int r;
|
||||
uint8 do_not_decode[256];
|
||||
int ch = 0;
|
||||
for (j=0; j < f->channels; ++j) {
|
||||
|
|
@ -3320,7 +3344,6 @@ static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start,
|
|||
}
|
||||
}
|
||||
r = map->submap_residue[i];
|
||||
t = f->residue_types[r];
|
||||
decode_residue(f, residue_buffers, ch, n2, r, do_not_decode);
|
||||
}
|
||||
|
||||
|
|
@ -3562,7 +3585,7 @@ static int is_whole_packet_present(stb_vorbis *f, int end_page)
|
|||
}
|
||||
if (end_page)
|
||||
if (s < n-1) return error(f, VORBIS_invalid_stream);
|
||||
if (s == f->segment_count)
|
||||
if (s == n)
|
||||
s = -1; // set 'crosses page' flag
|
||||
if (p > f->stream_end) return error(f, VORBIS_need_more_data);
|
||||
first = FALSE;
|
||||
|
|
@ -3713,7 +3736,6 @@ static int start_decoder(vorb *f)
|
|||
// compute the size of the sorted tables
|
||||
if (c->sparse) {
|
||||
sorted_count = total;
|
||||
//assert(total != 0);
|
||||
} else {
|
||||
sorted_count = 0;
|
||||
#ifndef STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH
|
||||
|
|
@ -3830,10 +3852,12 @@ static int start_decoder(vorb *f)
|
|||
#else
|
||||
for (j=0; j < (int) c->lookup_values; ++j)
|
||||
c->multiplicands[j] = mults[j] * c->delta_value + c->minimum_value;
|
||||
setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values);
|
||||
#endif
|
||||
setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values);
|
||||
}
|
||||
#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK
|
||||
skip:;
|
||||
#endif
|
||||
|
||||
#ifdef STB_VORBIS_CODEBOOK_FLOATS
|
||||
if (c->lookup_type == 2 && c->sequence_p) {
|
||||
|
|
@ -3980,7 +4004,7 @@ static int start_decoder(vorb *f)
|
|||
if (mapping_type != 0) return error(f, VORBIS_invalid_setup);
|
||||
m->chan = (MappingChannel *) setup_malloc(f, f->channels * sizeof(*m->chan));
|
||||
if (get_bits(f,1))
|
||||
m->submaps = get_bits(f,4);
|
||||
m->submaps = get_bits(f,4)+1;
|
||||
else
|
||||
m->submaps = 1;
|
||||
if (m->submaps > max_submaps)
|
||||
|
|
@ -3988,8 +4012,8 @@ static int start_decoder(vorb *f)
|
|||
if (get_bits(f,1)) {
|
||||
m->coupling_steps = get_bits(f,8)+1;
|
||||
for (k=0; k < m->coupling_steps; ++k) {
|
||||
m->chan[k].magnitude = get_bits(f, ilog(f->channels)-1);
|
||||
m->chan[k].angle = get_bits(f, ilog(f->channels)-1);
|
||||
m->chan[k].magnitude = get_bits(f, ilog(f->channels-1));
|
||||
m->chan[k].angle = get_bits(f, ilog(f->channels-1));
|
||||
if (m->chan[k].magnitude >= f->channels) return error(f, VORBIS_invalid_setup);
|
||||
if (m->chan[k].angle >= f->channels) return error(f, VORBIS_invalid_setup);
|
||||
if (m->chan[k].magnitude == m->chan[k].angle) return error(f, VORBIS_invalid_setup);
|
||||
|
|
@ -4138,6 +4162,7 @@ static void vorbis_deinit(stb_vorbis *p)
|
|||
setup_free(p, p->B[i]);
|
||||
setup_free(p, p->C[i]);
|
||||
setup_free(p, p->window[i]);
|
||||
setup_free(p, p->bit_reverse[i]);
|
||||
}
|
||||
#ifndef STB_VORBIS_NO_STDIO
|
||||
if (p->close_on_free) fclose(p->f);
|
||||
|
|
@ -4294,7 +4319,7 @@ static int vorbis_search_for_page_pushdata(vorb *f, uint8 *data, int data_len)
|
|||
f->next_seg = -1; // start a new page
|
||||
f->current_loc = f->scan[i].sample_loc; // set the current sample location
|
||||
// to the amount we'd have decoded had we decoded this page
|
||||
f->current_loc_valid = f->current_loc != ~0;
|
||||
f->current_loc_valid = f->current_loc != ~0U;
|
||||
return data_len;
|
||||
}
|
||||
// delete entry
|
||||
|
|
@ -4477,11 +4502,12 @@ static uint32 vorbis_find_page(stb_vorbis *f, uint32 *end, uint32 *last)
|
|||
// invalid-but-useful files?
|
||||
if (end)
|
||||
*end = stb_vorbis_get_file_offset(f);
|
||||
if (last)
|
||||
if (last) {
|
||||
if (header[5] & 0x04)
|
||||
*last = 1;
|
||||
else
|
||||
*last = 0;
|
||||
}
|
||||
set_file_offset(f, retry_loc-1);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -4514,7 +4540,7 @@ static int vorbis_analyze_page(stb_vorbis *f, ProbedPage *z)
|
|||
{
|
||||
uint8 header[27], lacing[255];
|
||||
uint8 packet_type[255];
|
||||
int num_packet, packet_start, previous =0;
|
||||
int num_packet, packet_start;
|
||||
int i,len;
|
||||
uint32 samples;
|
||||
|
||||
|
|
@ -4547,7 +4573,7 @@ static int vorbis_analyze_page(stb_vorbis *f, ProbedPage *z)
|
|||
|
||||
// scan through the frames to determine the sample-count of each one...
|
||||
// our goal is the sample # of the first fully-decoded sample on the
|
||||
// page, which is the first decoded sample of the 2nd page
|
||||
// page, which is the first decoded sample of the 2nd packet
|
||||
|
||||
num_packet=0;
|
||||
|
||||
|
|
@ -4555,18 +4581,15 @@ static int vorbis_analyze_page(stb_vorbis *f, ProbedPage *z)
|
|||
|
||||
for (i=0; i < header[26]; ++i) {
|
||||
if (packet_start) {
|
||||
uint8 n,b,m;
|
||||
uint8 n,b;
|
||||
if (lacing[i] == 0) goto bail; // trying to read from zero-length packet
|
||||
n = get8(f);
|
||||
// if bottom bit is non-zero, we've got corruption
|
||||
if (n & 1) goto bail;
|
||||
n >>= 1;
|
||||
b = ilog(f->mode_count-1);
|
||||
m = n >> b;
|
||||
n &= (1 << b)-1;
|
||||
if (n >= f->mode_count) goto bail;
|
||||
if (num_packet == 0 && f->mode_config[n].blockflag)
|
||||
previous = (m & 1);
|
||||
packet_type[num_packet++] = f->mode_config[n].blockflag;
|
||||
skip(f, lacing[i]-1);
|
||||
} else
|
||||
|
|
@ -4855,7 +4878,7 @@ unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f)
|
|||
|
||||
if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing);
|
||||
if (!f->total_samples) {
|
||||
int last;
|
||||
unsigned int last;
|
||||
uint32 lo,hi;
|
||||
char header[6];
|
||||
|
||||
|
|
@ -4873,7 +4896,7 @@ unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f)
|
|||
// previous_safe is now our candidate 'earliest known place that seeking
|
||||
// to will lead to the final page'
|
||||
|
||||
if (!vorbis_find_page(f, &end, (int unsigned *)&last)) {
|
||||
if (!vorbis_find_page(f, &end, &last)) {
|
||||
// if we can't find a page, we're hosed!
|
||||
f->error = VORBIS_cant_find_last_page;
|
||||
f->total_samples = 0xffffffff;
|
||||
|
|
@ -4888,7 +4911,7 @@ unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f)
|
|||
// explicitly checking the length of the section
|
||||
while (!last) {
|
||||
set_file_offset(f, end);
|
||||
if (!vorbis_find_page(f, &end, (int unsigned *)&last)) {
|
||||
if (!vorbis_find_page(f, &end, &last)) {
|
||||
// the last page we found didn't have the 'last page' flag
|
||||
// set. whoops!
|
||||
break;
|
||||
|
|
@ -4987,7 +5010,7 @@ stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, stb
|
|||
return stb_vorbis_open_file_section(file, close_on_free, error, alloc, len);
|
||||
}
|
||||
|
||||
stb_vorbis * stb_vorbis_open_filename(char *filename, int *error, stb_vorbis_alloc *alloc)
|
||||
stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, stb_vorbis_alloc *alloc)
|
||||
{
|
||||
FILE *f = fopen(filename, "rb");
|
||||
if (f)
|
||||
|
|
@ -4997,14 +5020,14 @@ stb_vorbis * stb_vorbis_open_filename(char *filename, int *error, stb_vorbis_all
|
|||
}
|
||||
#endif // STB_VORBIS_NO_STDIO
|
||||
|
||||
stb_vorbis * stb_vorbis_open_memory(unsigned char *data, int len, int *error, stb_vorbis_alloc *alloc)
|
||||
stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *error, stb_vorbis_alloc *alloc)
|
||||
{
|
||||
stb_vorbis *f, p;
|
||||
if (data == NULL) return NULL;
|
||||
vorbis_init(&p, alloc);
|
||||
p.stream = data;
|
||||
p.stream_end = data + len;
|
||||
p.stream_start = p.stream;
|
||||
p.stream = (uint8 *) data;
|
||||
p.stream_end = (uint8 *) data + len;
|
||||
p.stream_start = (uint8 *) p.stream;
|
||||
p.stream_len = len;
|
||||
p.push_mode = FALSE;
|
||||
if (start_decoder(&p)) {
|
||||
|
|
@ -5097,7 +5120,6 @@ static void compute_samples(int mask, short *output, int num_c, float **data, in
|
|||
}
|
||||
}
|
||||
|
||||
static int channel_selector[3][2] = { {0}, {PLAYBACK_MONO}, {PLAYBACK_LEFT, PLAYBACK_RIGHT} };
|
||||
static void compute_stereo_samples(short *output, int num_c, float **data, int d_offset, int len)
|
||||
{
|
||||
#define BUFFER_SIZE 32
|
||||
|
|
@ -5147,7 +5169,7 @@ static void convert_samples_short(int buf_c, short **buffer, int b_offset, int d
|
|||
} else {
|
||||
int limit = buf_c < data_c ? buf_c : data_c;
|
||||
for (i=0; i < limit; ++i)
|
||||
copy_samples(buffer[i]+b_offset, data[i], samples);
|
||||
copy_samples(buffer[i]+b_offset, data[i]+d_offset, samples);
|
||||
for ( ; i < buf_c; ++i)
|
||||
memset(buffer[i]+b_offset, 0, sizeof(short) * samples);
|
||||
}
|
||||
|
|
@ -5243,7 +5265,7 @@ int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, in
|
|||
}
|
||||
|
||||
#ifndef STB_VORBIS_NO_STDIO
|
||||
int stb_vorbis_decode_filename(char *filename, int *channels, short **output)
|
||||
int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output)
|
||||
{
|
||||
int data_len, offset, total, limit, error;
|
||||
short *data;
|
||||
|
|
@ -5251,6 +5273,8 @@ int stb_vorbis_decode_filename(char *filename, int *channels, short **output)
|
|||
if (v == NULL) return -1;
|
||||
limit = v->channels * 4096;
|
||||
*channels = v->channels;
|
||||
if (sample_rate)
|
||||
*sample_rate = v->sample_rate;
|
||||
offset = data_len = 0;
|
||||
total = limit;
|
||||
data = (short *) malloc(total * sizeof(*data));
|
||||
|
|
@ -5276,11 +5300,12 @@ int stb_vorbis_decode_filename(char *filename, int *channels, short **output)
|
|||
}
|
||||
}
|
||||
*output = data;
|
||||
stb_vorbis_close(v);
|
||||
return data_len;
|
||||
}
|
||||
#endif // NO_STDIO
|
||||
|
||||
int stb_vorbis_decode_memory(uint8 *mem, int len, int *channels, short **output)
|
||||
int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *sample_rate, short **output)
|
||||
{
|
||||
int data_len, offset, total, limit, error;
|
||||
short *data;
|
||||
|
|
@ -5288,6 +5313,8 @@ int stb_vorbis_decode_memory(uint8 *mem, int len, int *channels, short **output)
|
|||
if (v == NULL) return -1;
|
||||
limit = v->channels * 4096;
|
||||
*channels = v->channels;
|
||||
if (sample_rate)
|
||||
*sample_rate = v->sample_rate;
|
||||
offset = data_len = 0;
|
||||
total = limit;
|
||||
data = (short *) malloc(total * sizeof(*data));
|
||||
|
|
@ -5313,9 +5340,10 @@ int stb_vorbis_decode_memory(uint8 *mem, int len, int *channels, short **output)
|
|||
}
|
||||
}
|
||||
*output = data;
|
||||
stb_vorbis_close(v);
|
||||
return data_len;
|
||||
}
|
||||
#endif
|
||||
#endif // STB_VORBIS_NO_INTEGER_CONVERSION
|
||||
|
||||
int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats)
|
||||
{
|
||||
|
|
@ -5336,8 +5364,10 @@ int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float
|
|||
}
|
||||
n += k;
|
||||
f->channel_buffer_start += k;
|
||||
if (n == len) break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break;
|
||||
if (n == len)
|
||||
break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs))
|
||||
break;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
|
@ -5354,17 +5384,64 @@ int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, in
|
|||
if (n+k >= num_samples) k = num_samples - n;
|
||||
if (k) {
|
||||
for (i=0; i < z; ++i)
|
||||
memcpy(buffer[i]+n, f->channel_buffers+f->channel_buffer_start, sizeof(float)*k);
|
||||
memcpy(buffer[i]+n, f->channel_buffers[i]+f->channel_buffer_start, sizeof(float)*k);
|
||||
for ( ; i < channels; ++i)
|
||||
memset(buffer[i]+n, 0, sizeof(float) * k);
|
||||
}
|
||||
n += k;
|
||||
f->channel_buffer_start += k;
|
||||
if (n == num_samples) break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break;
|
||||
if (n == num_samples)
|
||||
break;
|
||||
if (!stb_vorbis_get_frame_float(f, NULL, &outputs))
|
||||
break;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
#endif // STB_VORBIS_NO_PULLDATA_API
|
||||
|
||||
/* Version history
|
||||
1.05 - 2015/04/19 - don't define __forceinline if it's redundant
|
||||
1.04 - 2014/08/27 - fix missing const-correct case in API
|
||||
1.03 - 2014/08/07 - Warning fixes
|
||||
1.02 - 2014/07/09 - Declare qsort compare function _cdecl on windows
|
||||
1.01 - 2014/06/18 - fix stb_vorbis_get_samples_float
|
||||
1.0 - 2014/05/26 - fix memory leaks; fix warnings; fix bugs in multichannel
|
||||
(API change) report sample rate for decode-full-file funcs
|
||||
0.99996 - bracket #include <malloc.h> for macintosh compilation by Laurent Gomila
|
||||
0.99995 - use union instead of pointer-cast for fast-float-to-int to avoid alias-optimization problem
|
||||
0.99994 - change fast-float-to-int to work in single-precision FPU mode, remove endian-dependence
|
||||
0.99993 - remove assert that fired on legal files with empty tables
|
||||
0.99992 - rewind-to-start
|
||||
0.99991 - bugfix to stb_vorbis_get_samples_short by Bernhard Wodo
|
||||
0.9999 - (should have been 0.99990) fix no-CRT support, compiling as C++
|
||||
0.9998 - add a full-decode function with a memory source
|
||||
0.9997 - fix a bug in the read-from-FILE case in 0.9996 addition
|
||||
0.9996 - query length of vorbis stream in samples/seconds
|
||||
0.9995 - bugfix to another optimization that only happened in certain files
|
||||
0.9994 - bugfix to one of the optimizations that caused significant (but inaudible?) errors
|
||||
0.9993 - performance improvements; runs in 99% to 104% of time of reference implementation
|
||||
0.9992 - performance improvement of IMDCT; now performs close to reference implementation
|
||||
0.9991 - performance improvement of IMDCT
|
||||
0.999 - (should have been 0.9990) performance improvement of IMDCT
|
||||
0.998 - no-CRT support from Casey Muratori
|
||||
0.997 - bugfixes for bugs found by Terje Mathisen
|
||||
0.996 - bugfix: fast-huffman decode initialized incorrectly for sparse codebooks; fixing gives 10% speedup - found by Terje Mathisen
|
||||
0.995 - bugfix: fix to 'effective' overrun detection - found by Terje Mathisen
|
||||
0.994 - bugfix: garbage decode on final VQ symbol of a non-multiple - found by Terje Mathisen
|
||||
0.993 - bugfix: pushdata API required 1 extra byte for empty page (failed to consume final page if empty) - found by Terje Mathisen
|
||||
0.992 - fixes for MinGW warning
|
||||
0.991 - turn fast-float-conversion on by default
|
||||
0.990 - fix push-mode seek recovery if you seek into the headers
|
||||
0.98b - fix to bad release of 0.98
|
||||
0.98 - fix push-mode seek recovery; robustify float-to-int and support non-fast mode
|
||||
0.97 - builds under c++ (typecasting, don't use 'class' keyword)
|
||||
0.96 - somehow MY 0.95 was right, but the web one was wrong, so here's my 0.95 rereleased as 0.96, fixes a typo in the clamping code
|
||||
0.95 - clamping code for 16-bit functions
|
||||
0.94 - not publically released
|
||||
0.93 - fixed all-zero-floor case (was decoding garbage)
|
||||
0.92 - fixed a memory leak
|
||||
0.91 - conditional compiles to omit parts of the API and the infrastructure to support them: STB_VORBIS_NO_PULLDATA_API, STB_VORBIS_NO_PUSHDATA_API, STB_VORBIS_NO_STDIO, STB_VORBIS_NO_INTEGER_CONVERSION
|
||||
0.90 - first public release
|
||||
*/
|
||||
|
||||
#endif // STB_VORBIS_HEADER_ONLY
|
||||
|
|
|
|||
Loading…
Reference in a new issue