nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-01-31 12:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

ogg vorbis streams resample change (they don't crash, although 22100->48000 sounds horrible due to problems)

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2953 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2008-05-11 14:38:19 +00:00
parent 0739c739a6
commit 0a03e2bc3b
1 changed files with 50 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
engine/client/snd_ov.c
View file

@ -62,6 +62,8 @@ typedef struct {
char *mediaaswavdata; char *mediaaswavdata;
int mediaaswavpos; int mediaaswavpos;
int mediaaswavbuflen; int mediaaswavbuflen;
char *mediatemprecode;
int mediatemprecodelen;
OggVorbis_File vf; OggVorbis_File vf;
@ -105,8 +107,12 @@ sfxcache_t *S_LoadOVSound (sfx_t *s, qbyte *data, int datalen, int sndspeed)
if (buffer->mediaaswavdata) if (buffer->mediaaswavdata)
{ {
BZ_Free(buffer->mediaaswavdata); BZ_Free(buffer->mediaaswavdata);
buffer->mediaaswavdata = NULL;
buffer->mediaaswavdata=NULL; }
if (buffer->mediatemprecode)
{
BZ_Free(buffer->mediatemprecode);
buffer->mediatemprecode = NULL;
} }
Z_Free(s->decoder); Z_Free(s->decoder);
s->decoder=NULL; s->decoder=NULL;
@ -125,7 +131,7 @@ sfxcache_t *S_LoadOVSound (sfx_t *s, qbyte *data, int datalen, int sndspeed)
int OV_DecodeSome(sfx_t *s, int minlength) int OV_DecodeSome(sfx_t *s, int minlength)
{ {
extern int snd_speed; extern int snd_speed;
int i; extern cvar_t snd_linearresample_stream;
int bigendianp = bigendian; int bigendianp = bigendian;
int current_section = 0; int current_section = 0;
sfxcache_t *sc; sfxcache_t *sc;
@ -159,33 +165,47 @@ int OV_DecodeSome(sfx_t *s, int minlength)
return 0; return 0;
} }
bytesread = p_ov_read(&dec->vf, dec->mediaaswavdata+dec->mediaaswavpos, dec->mediaaswavbuflen-dec->mediaaswavpos, bigendianp, 2, 1, &current_section); if (snd_speed == dec->srcspeed)
if (bytesread <= 0)
{ {
if (bytesread != 0) //0==eof bytesread = p_ov_read(&dec->vf, dec->mediaaswavdata+dec->mediaaswavpos, dec->mediaaswavbuflen-dec->mediaaswavpos, bigendianp, 2, 1, &current_section);
if (bytesread <= 0)
{ {
Con_Printf("ogg decoding failed\n"); if (bytesread != 0) //0==eof
return 1; {
Con_Printf("ogg decoding failed\n");
return 1;
}
return 0;
} }
return 0;
} }
else
{
double scale = dec->srcspeed / (double)snd_speed;
int decodesize = ceil((dec->mediaaswavbuflen-dec->mediaaswavpos) * scale);
if (decodesize > dec->mediatemprecodelen)
{
dec->mediatemprecode = BZ_Realloc(dec->mediatemprecode, decodesize);
dec->mediatemprecodelen = decodesize;
}
if (snd_speed != dec->srcspeed) bytesread = p_ov_read(&dec->vf, dec->mediatemprecode, decodesize, bigendianp, 2, 1, &current_section);
{ //resample
if (dec->mediasc.numchannels==2) SND_ResampleStream(dec->mediatemprecode,
{ dec->srcspeed,
int *data = (int*)(dec->mediaaswavdata+dec->mediaaswavpos); 2,
float frac = (float)dec->srcspeed/snd_speed; dec->mediasc.numchannels,
bytesread = (int)(bytesread/frac); bytesread / (2 * dec->mediasc.numchannels),
for(i = 0; i < bytesread/4; i++) dec->mediaaswavdata+dec->mediaaswavpos,
data[i] = data[(int)(i*frac)]; snd_speed,
} 2,
else dec->mediasc.numchannels,
{ (int)snd_linearresample_stream.value);
}
bytesread = (int)floor(bytesread / scale) & ~0x1;
} }
dec->mediaaswavpos += bytesread; dec->mediaaswavpos += bytesread;
sc->length = (dec->mediaaswavpos-sizeof(sfxcache_t))/(2*(dec->mediasc.numchannels)); sc->length = (dec->mediaaswavpos-sizeof(sfxcache_t))/(2*(dec->mediasc.numchannels));
dec->mediasc.length = sc->length; dec->mediasc.length = sc->length;
@ -213,6 +233,12 @@ void OV_CancelDecoder(sfx_t *s)
memcpy(dest, src, dec->mediaaswavpos); memcpy(dest, src, dec->mediaaswavpos);
BZ_Free(src); BZ_Free(src);
if (dec->mediatemprecode)
{
BZ_Free(dec->mediatemprecode);
dec->mediatemprecode = NULL;
}
Z_Free(s->decoder); Z_Free(s->decoder);
s->decoder = NULL; s->decoder = NULL;
@ -360,6 +386,8 @@ qboolean OV_StartDecode(unsigned char *start, unsigned long length, ovdecoderbuf
(long)p_ov_pcm_total(&buffer->vf,-1)); (long)p_ov_pcm_total(&buffer->vf,-1));
Con_Printf("Encoded by: %s\n\n",p_ov_comment(&buffer->vf,-1)->vendor); Con_Printf("Encoded by: %s\n\n",p_ov_comment(&buffer->vf,-1)->vendor);
*/ } */ }
buffer->mediatemprecode = NULL;
buffer->mediatemprecodelen = 0;
buffer->start = BZ_Malloc(length); buffer->start = BZ_Malloc(length);
memcpy(buffer->start, start, length); memcpy(buffer->start, start, length);