dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-21 10:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ignore if stb_vorbis decodes one sample less than expected

Browse source 
In idSampleDecoderLocal::DecodeOGG() sometimes (esp. in The Lost Mission
mod) it happens that stb_vorbis_get_samples_float() decodes one sample
less than expected so one is left and when trying to decode that,
stb_vorbis_get_samples_float() returns 0, which we interpreted as an error.
This case is now handled more gracefully: No warning is printed (except
if developer 1) and failed is not set (setting it would prevent the sound
from being played again, I think).
This commit is contained in:
Daniel Gibson 2021-06-17 04:02:30 +02:00
parent 52ea5b3877
commit 1b4badfd41
1 changed files with 13 additions and 5 deletions

18
neo/sound/snd_decoder.cpp
View file

@ -241,7 +241,7 @@ int idWaveFile::ReadOGG( byte* pBuffer, int dwSizeToRead, int *pdwSizeRead ) {
}
if ( ret < 0 ) {
int stbverr = stb_vorbis_get_error( ov );
common->Warning( "idWaveFile::ReadOGG() stb_vorbis_get_samples_short_interleaved() failed: %s\n", my_stbv_strerror(stbverr) );
common->Warning( "idWaveFile::ReadOGG() stb_vorbis_get_samples_short_interleaved() %d shorts failed: %s\n", numShorts, my_stbv_strerror(stbverr) );
return -1;
}
// for some reason, stb_vorbis_get_samples_short_interleaved() takes the absolute
@ -585,10 +585,18 @@ int idSampleDecoderLocal::DecodeOGG( idSoundSample *sample, int sampleOffset44k,
int ret = stb_vorbis_get_samples_float( stbv, sample->objectInfo.nChannels, samples, reqSamples );
if ( ret == 0 ) {
int stbVorbErr = stb_vorbis_get_error( stbv );
common->Warning( "idSampleDecoderLocal::DecodeOGG() stb_vorbis_get_samples_float() for %s failed: %s\n",
sample->name.c_str(), my_stbv_strerror( stbVorbErr ) );
failed = true;
break;
if ( stbVorbErr == VORBIS__no_error && reqSamples < 5 ) {
// DG: it sometimes happens that 0 is returned when reqSamples was 1 and there is no error.
// don't really know why; I'll just (arbitrarily) accept up to 5 "dropped" samples
ret = reqSamples; // pretend decoding went ok
common->DPrintf( "idSampleDecoderLocal::DecodeOGG() IGNORING stb_vorbis_get_samples_float() dropping %d (%d) samples\n for %s\n",
reqSamples, totalSamples, sample->name.c_str() );
} else {
common->Warning( "idSampleDecoderLocal::DecodeOGG() stb_vorbis_get_samples_float() %d (%d) samples\n for %s failed: %s\n",
reqSamples, totalSamples, sample->name.c_str(), my_stbv_strerror( stbVorbErr ) );
failed = true;
break;
}
}
if ( ret < 0 ) {
failed = true;