TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1283 from marauder2k9-torque/sound-fix

Browse source 
Update sfxSndStream.cpp
This commit is contained in:
Brian Roberts 2024-05-27 19:08:23 -05:00 • committed by GitHub
commit ca5cb3f85f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Engine/source/sfx/media/sfxSndStream.cpp
View file

@ -57,15 +57,14 @@ bool SFXSndStream::_readHeader()
bitsPerSample = 8; bitsPerSample = 8;
break; break;
case SF_FORMAT_PCM_16: case SF_FORMAT_PCM_16:
case SF_FORMAT_VORBIS:
bitsPerSample = 16; bitsPerSample = 16;
break; break;
case SF_FORMAT_VORBIS:
case SF_FORMAT_PCM_24: case SF_FORMAT_PCM_24:
bitsPerSample = 24;
break;
case SF_FORMAT_PCM_32: case SF_FORMAT_PCM_32:
case SF_FORMAT_FLOAT: case SF_FORMAT_FLOAT:
bitsPerSample = 32; bitsPerSample = 16;
sf_command(sndFile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE);
break; break;
default: default:
// missed, set it to 16 anyway. // missed, set it to 16 anyway.
@ -105,14 +104,46 @@ void SFXSndStream::reset()
U32 SFXSndStream::read(U8* buffer, U32 length) U32 SFXSndStream::read(U8* buffer, U32 length)
{ {
if (!sndFile)
{
Con::errorf("SFXSndStream - read: Called on uninitialized stream.");
return 0;
}
U32 framesToRead = length / mFormat.getBytesPerSample();
U32 framesRead = 0; U32 framesRead = 0;
framesRead = sf_readf_short(sndFile, (short*)buffer, sfinfo.frames); switch (sfinfo.format & SF_FORMAT_SUBMASK)
if (framesRead != sfinfo.frames) {
case SF_FORMAT_PCM_S8:
case SF_FORMAT_PCM_U8:
framesRead = sf_readf_int(sndFile, (int*)buffer, framesToRead);
break;
case SF_FORMAT_PCM_16:
case SF_FORMAT_VORBIS:
case SF_FORMAT_PCM_24:
case SF_FORMAT_PCM_32:
case SF_FORMAT_FLOAT:
framesRead = sf_readf_short(sndFile, (short*)buffer, framesToRead);
break;
default:
Con::errorf("SFXSndStream - read: Unsupported format.");
return 0;
}
if (framesRead != framesToRead)
{ {
Con::errorf("SFXSndStream - read: %s", sf_strerror(sndFile)); Con::errorf("SFXSndStream - read: %s", sf_strerror(sndFile));
} }
// (convert to frames) - number of frames available < MAX_BUFFER? reset
if (((getPosition() / mFormat.getBytesPerSample()) - sfinfo.frames) < MAX_BUFFER)
{
// reset stream
setPosition(0);
}
return framesRead * mFormat.getBytesPerSample(); return framesRead * mFormat.getBytesPerSample();
} }