mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2024-10-28 03:09:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-encode S32 audio sample formats without re-enumerating the files

Browse source
This commit is contained in:
Wayward Heart 2024-08-17 18:27:34 -05:00
parent 181192cb04
commit a3d028335c
3 changed files with 42 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/audio/aldatasource.h
View file

@ -56,8 +56,7 @@ struct ALDataSource
ALDataSource *createSDLSource(SDL_RWops &ops,
const char *extension,
uint32_t maxBufSize,
bool looped,
int fallbackMode);
bool looped);
ALDataSource *createVorbisSource(SDL_RWops &ops,
bool looped);

12
src/audio/alstream.cpp
View file

@ -192,11 +192,10 @@ struct ALStreamOpenHandler : FileSystem::OpenHandler
{
bool looped;
ALDataSource *source;
int fallbackMode;
std::string errorMsg;
ALStreamOpenHandler(bool looped)
: looped(looped), source(0), fallbackMode(0)
: looped(looped), source(0)
{}
bool tryRead(SDL_RWops &ops, const char *ext)
@ -225,7 +224,7 @@ struct ALStreamOpenHandler : FileSystem::OpenHandler
}
}
source = createSDLSource(ops, ext, STREAM_BUF_SIZE, looped, fallbackMode);
source = createSDLSource(ops, ext, STREAM_BUF_SIZE, looped);
}
catch (const Exception &e)
{
@ -258,13 +257,6 @@ void ALStream::openSource(const std::string &filename)
close();
// Try fallback mode, e.g. for handling S32->F32 sample format conversion
if (!handler.source)
{
handler.fallbackMode = 1;
shState->fileSystem().openRead(handler, filename.c_str());
}
if (!handler.source)
{
char buf[512];

74
src/audio/sdlsoundsource.cpp
View file

@ -24,10 +24,15 @@
#include <SDL_sound.h>
static int SDL_RWopsCloseNoop(SDL_RWops *ops) {
return 0;
}
struct SDLSoundSource : ALDataSource
{
Sound_Sample *sample;
SDL_RWops srcOps;
SDL_RWops unclosableOps;
uint8_t sampleSize;
bool looped;
@ -37,53 +42,53 @@ struct SDLSoundSource : ALDataSource
SDLSoundSource(SDL_RWops &ops,
const char *extension,
uint32_t maxBufSize,
bool looped,
int fallbackMode)
bool looped)
: srcOps(ops),
unclosableOps(ops),
looped(looped)
{
if (fallbackMode == 0)
{
sample = Sound_NewSample(&srcOps, extension, 0, maxBufSize);
}
else
{
// We're here because a previous attempt resulted in S32 format.
Sound_AudioInfo desired;
SDL_memset(&desired, '\0', sizeof (Sound_AudioInfo));
desired.format = AUDIO_F32SYS;
sample = Sound_NewSample(&srcOps, extension, &desired, maxBufSize);
}
/* A copy of srcOps with a no-op close function,
* so we can reuse the ops if we need to change the format. */
unclosableOps.close = SDL_RWopsCloseNoop;
sample = Sound_NewSample(&unclosableOps, extension, 0, maxBufSize);
if (!sample)
{
SDL_RWclose(&ops);
SDL_RWclose(&srcOps);
throw Exception(Exception::SDLError, "SDL_sound: %s", Sound_GetError());
}
if (fallbackMode == 0)
bool validFormat = true;
switch (sample->actual.format)
{
bool validFormat = true;
switch (sample->actual.format)
{
// OpenAL Soft doesn't support S32 formats.
// https://github.com/kcat/openal-soft/issues/934
case AUDIO_S32LSB :
case AUDIO_S32MSB :
validFormat = false;
}
}
if (!validFormat)
if (!validFormat)
{
// Unfortunately there's no way to change the desired format of a sample.
// https://github.com/icculus/SDL_sound/issues/91
// So we just have to close the sample (which closes the file too),
// and retry with a new desired format.
Sound_FreeSample(sample);
SDL_RWseek(&unclosableOps, 0, RW_SEEK_SET);
Sound_AudioInfo desired;
SDL_memset(&desired, '\0', sizeof (Sound_AudioInfo));
desired.format = AUDIO_F32SYS;
sample = Sound_NewSample(&unclosableOps, extension, &desired, maxBufSize);
if (!sample)
{
// Unfortunately there's no way to change the desired format of a sample.
// https://github.com/icculus/SDL_sound/issues/91
// So we just have to close the sample (which closes the file too),
// and retry with a new desired format.
Sound_FreeSample(sample);
throw Exception(Exception::SDLError, "SDL_sound: format not supported by OpenAL: %d", sample->actual.format);
SDL_RWclose(&srcOps);
throw Exception(Exception::SDLError, "SDL_sound: %s", Sound_GetError());
}
}
@ -95,8 +100,8 @@ struct SDLSoundSource : ALDataSource
~SDLSoundSource()
{
/* This also closes 'srcOps' */
Sound_FreeSample(sample);
SDL_RWclose(&srcOps);
}
Status fillBuffer(AL::Buffer::ID alBuffer)
@ -162,8 +167,7 @@ struct SDLSoundSource : ALDataSource
ALDataSource *createSDLSource(SDL_RWops &ops,
const char *extension,
uint32_t maxBufSize,
bool looped,
int fallbackMode)
bool looped)
{
return new SDLSoundSource(ops, extension, maxBufSize, looped, fallbackMode);
return new SDLSoundSource(ops, extension, maxBufSize, looped);
}