mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-02 16:31:01 +00:00
AUDIO: Remove dynamic load of EAS for Android and fix DLS loading
Android 7 prevents loading of private libraries like AES. DLS support was also broken because of a change in API.
This commit is contained in:
Le Philousophe
Eugene Sandulenko
parent
37764d86fc
commit
2e68867e98
@ -21,18 +21,10 @@
|
||||
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#if defined(USE_SONIVOX) || defined(__ANDROID__)
|
||||
#if defined(USE_SONIVOX)
|
||||
|
||||
#ifdef USE_SONIVOX
|
||||
#include <sonivox/eas.h>
|
||||
#include <sonivox/eas_reverb.h>
|
||||
#else
|
||||
#define EAS_DLOPEN
|
||||
#endif
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
#include "common/debug.h"
|
||||
#include "common/endian.h"
|
||||
@ -46,7 +38,7 @@
|
||||
#include "audio/musicplugin.h"
|
||||
#include "audio/mixer.h"
|
||||
|
||||
//#define EAS_DUMPSTREAM
|
||||
//#define EAS_DUMPSTREAM "/sdcard/eas.dump"
|
||||
|
||||
// NOTE:
|
||||
// EAS's render function *only* accepts one mix buffer size. it's defined at
|
||||
@ -60,18 +52,35 @@
|
||||
// from rate_arm.cpp
|
||||
#define INTERMEDIATE_BUFFER_SIZE 512
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
// so far all android versions have the very same library version
|
||||
#define EAS_LIBRARY "libsonivox.so"
|
||||
#define EAS_KNOWNVERSION 0x03060a0e
|
||||
#endif
|
||||
// EAS does many 1 byte reads, avoid seeking by caching values
|
||||
struct EAS_FileHandle {
|
||||
Common::SeekableReadStream *stream;
|
||||
int64 size;
|
||||
int64 pos;
|
||||
};
|
||||
|
||||
#ifndef USE_SONIVOX
|
||||
#define EAS_MODULE_REVERB 2
|
||||
#define EAS_PARAM_REVERB_BYPASS 0
|
||||
#define EAS_PARAM_REVERB_PRESET 1
|
||||
#define EAS_PARAM_REVERB_CHAMBER 2
|
||||
#endif
|
||||
static int EAS_DLS_read(void *handle, void *buf, int offset, int size) {
|
||||
EAS_FileHandle *fh = (EAS_FileHandle *)handle;
|
||||
if (fh->pos != offset) {
|
||||
if (!fh->stream->seek(offset)) {
|
||||
fh->pos = -1;
|
||||
return 0;
|
||||
}
|
||||
fh->pos = offset;
|
||||
}
|
||||
int ret = fh->stream->read(buf, size);
|
||||
fh->pos += ret;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int EAS_DLS_size(void *handle) {
|
||||
EAS_FileHandle *fh = (EAS_FileHandle *)handle;
|
||||
if (fh->size < 0) {
|
||||
fh->size = fh->stream->size();
|
||||
}
|
||||
return fh->size;
|
||||
}
|
||||
|
||||
class MidiDriver_EAS : public MidiDriver_MPU401, Audio::AudioStream {
|
||||
public:
|
||||
@ -80,7 +89,7 @@ public:
|
||||
|
||||
// MidiDriver
|
||||
int open() override;
|
||||
bool isOpen() const override { return _isOpen; }
|
||||
bool isOpen() const override { return _EASHandle; }
|
||||
|
||||
void close() override;
|
||||
void send(uint32 b) override;
|
||||
@ -96,97 +105,6 @@ public:
|
||||
bool endOfData() const override;
|
||||
|
||||
private:
|
||||
#ifndef USE_SONIVOX
|
||||
typedef long EAS_RESULT;
|
||||
|
||||
typedef unsigned EAS_BOOL;
|
||||
|
||||
typedef unsigned char EAS_U8;
|
||||
typedef signed char EAS_I8;
|
||||
typedef char EAS_CHAR;
|
||||
|
||||
typedef unsigned short EAS_U16;
|
||||
typedef short EAS_I16;
|
||||
|
||||
typedef unsigned long EAS_U32;
|
||||
typedef long EAS_I32;
|
||||
|
||||
typedef short EAS_PCM;
|
||||
|
||||
struct S_EAS_LIB_CONFIG {
|
||||
EAS_U32 libVersion;
|
||||
EAS_BOOL checkedVersion;
|
||||
EAS_I32 maxVoices;
|
||||
EAS_I32 numChannels;
|
||||
EAS_I32 sampleRate;
|
||||
EAS_I32 mixBufferSize;
|
||||
EAS_BOOL filterEnabled;
|
||||
EAS_U32 buildTimeStamp;
|
||||
EAS_CHAR *buildGUID;
|
||||
};
|
||||
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
struct EAS_FILE_LOCATOR {
|
||||
const char *path;
|
||||
int fd;
|
||||
long long offset;
|
||||
long long length;
|
||||
};
|
||||
#endif
|
||||
|
||||
typedef void * EAS_DATA_HANDLE;
|
||||
typedef void * EAS_HANDLE;
|
||||
#endif
|
||||
|
||||
typedef const S_EAS_LIB_CONFIG *(*ConfigFunc)();
|
||||
typedef EAS_RESULT (*InitFunc)(EAS_DATA_HANDLE *);
|
||||
typedef EAS_RESULT (*ShutdownFunc)(EAS_DATA_HANDLE);
|
||||
typedef EAS_RESULT (*SetParameterFunc)(EAS_DATA_HANDLE, EAS_I32, EAS_I32, EAS_I32);
|
||||
typedef EAS_RESULT (*SetVolumeFunc)(EAS_DATA_HANDLE, EAS_HANDLE, EAS_I32);
|
||||
typedef EAS_RESULT (*OpenStreamFunc)(EAS_DATA_HANDLE, EAS_HANDLE *, EAS_HANDLE);
|
||||
typedef EAS_RESULT (*WriteStreamFunc)(EAS_DATA_HANDLE, EAS_HANDLE, EAS_U8 *, EAS_I32);
|
||||
typedef EAS_RESULT (*CloseStreamFunc)(EAS_DATA_HANDLE, EAS_HANDLE);
|
||||
typedef EAS_RESULT (*RenderFunc)(EAS_DATA_HANDLE, EAS_PCM *, EAS_I32, EAS_I32 *);
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
typedef EAS_RESULT (*LoadDLSFunc)(EAS_DATA_HANDLE, EAS_HANDLE, EAS_FILE_LOCATOR *);
|
||||
#endif
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
template<typename T>
|
||||
void sym(T &t, const char *symbol) {
|
||||
union {
|
||||
void *v;
|
||||
T t;
|
||||
} u;
|
||||
|
||||
assert(sizeof(u.v) == sizeof(u.t));
|
||||
|
||||
u.v = dlsym(_dlHandle, symbol);
|
||||
|
||||
if (!u.v)
|
||||
warning("couldn't resolve %s from " EAS_LIBRARY, symbol);
|
||||
|
||||
t = u.t;
|
||||
}
|
||||
|
||||
void *_dlHandle;
|
||||
#endif
|
||||
|
||||
bool _isOpen;
|
||||
|
||||
ConfigFunc _configFunc;
|
||||
InitFunc _initFunc;
|
||||
ShutdownFunc _shutdownFunc;
|
||||
SetParameterFunc _setParameterFunc;
|
||||
SetVolumeFunc _setVolumeFunc;
|
||||
OpenStreamFunc _openStreamFunc;
|
||||
WriteStreamFunc _writeStreamFunc;
|
||||
CloseStreamFunc _closeStreamFunc;
|
||||
RenderFunc _renderFunc;
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
LoadDLSFunc _loadDLSFunc;
|
||||
#endif
|
||||
|
||||
const S_EAS_LIB_CONFIG *_config;
|
||||
EAS_DATA_HANDLE _EASHandle;
|
||||
EAS_HANDLE _midiStream;
|
||||
@ -202,22 +120,6 @@ private:
|
||||
|
||||
MidiDriver_EAS::MidiDriver_EAS() :
|
||||
MidiDriver_MPU401(),
|
||||
#ifdef USE_DLOPEN
|
||||
_dlHandle(0),
|
||||
#endif
|
||||
_configFunc(0),
|
||||
_initFunc(0),
|
||||
_shutdownFunc(0),
|
||||
_setParameterFunc(0),
|
||||
_setVolumeFunc(0),
|
||||
_openStreamFunc(0),
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
_loadDLSFunc(0),
|
||||
#endif
|
||||
_isOpen(false),
|
||||
_writeStreamFunc(0),
|
||||
_closeStreamFunc(0),
|
||||
_renderFunc(0),
|
||||
_config(0),
|
||||
_EASHandle(0),
|
||||
_midiStream(0),
|
||||
@ -236,37 +138,13 @@ int MidiDriver_EAS::open() {
|
||||
if (isOpen())
|
||||
return MERR_ALREADY_OPEN;
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
_dlHandle = dlopen(EAS_LIBRARY, RTLD_LAZY);
|
||||
if (!_dlHandle) {
|
||||
warning("error opening " EAS_LIBRARY ": %s", dlerror());
|
||||
return MERR_DEVICE_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
sym(_configFunc, "EAS_Config");
|
||||
if (!_configFunc) {
|
||||
close();
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
_configFunc = EAS_Config;
|
||||
#endif
|
||||
|
||||
_config = _configFunc();
|
||||
_config = EAS_Config();
|
||||
if (!_config) {
|
||||
close();
|
||||
warning("error retrieving EAS library configuration");
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
if (_config->libVersion != EAS_KNOWNVERSION) {
|
||||
close();
|
||||
warning("unknown EAS library version: 0x%08x", (int32)_config->libVersion);
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (_config->numChannels > 2) {
|
||||
close();
|
||||
warning("unsupported number of EAS channels: %d", (int32)_config->numChannels);
|
||||
@ -280,67 +158,59 @@ int MidiDriver_EAS::open() {
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
sym(_initFunc, "EAS_Init");
|
||||
sym(_shutdownFunc, "EAS_Shutdown");
|
||||
sym(_setParameterFunc, "EAS_SetParameter");
|
||||
sym(_setVolumeFunc, "EAS_SetVolume");
|
||||
sym(_openStreamFunc, "EAS_OpenMIDIStream");
|
||||
sym(_writeStreamFunc, "EAS_WriteMIDIStream");
|
||||
sym(_closeStreamFunc, "EAS_CloseMIDIStream");
|
||||
sym(_renderFunc, "EAS_Render");
|
||||
|
||||
if (!_initFunc || !_shutdownFunc || !_setParameterFunc ||
|
||||
!_openStreamFunc || !_writeStreamFunc || !_closeStreamFunc ||
|
||||
!_renderFunc) {
|
||||
close();
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
sym(_loadDLSFunc, "EAS_LoadDLSCollection");
|
||||
|
||||
if (!_loadDLSFunc) {
|
||||
close();
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
_initFunc = EAS_Init;
|
||||
_shutdownFunc = EAS_Shutdown;
|
||||
_setParameterFunc = EAS_SetParameter;
|
||||
_setVolumeFunc = EAS_SetVolume;
|
||||
_openStreamFunc = EAS_OpenMIDIStream;
|
||||
_writeStreamFunc = EAS_WriteMIDIStream;
|
||||
_closeStreamFunc = EAS_CloseMIDIStream;
|
||||
_renderFunc = EAS_Render;
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
_loadDLSFunc = EAS_LoadDLSCollection;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
EAS_RESULT res = _initFunc(&_EASHandle);
|
||||
EAS_RESULT res = EAS_Init(&_EASHandle);
|
||||
if (res) {
|
||||
close();
|
||||
warning("error initializing the EAS library: %d", (int32)res);
|
||||
return -1;
|
||||
}
|
||||
|
||||
res = _setParameterFunc(_EASHandle, EAS_MODULE_REVERB, EAS_PARAM_REVERB_PRESET, EAS_PARAM_REVERB_CHAMBER);
|
||||
res = EAS_SetParameter(_EASHandle, EAS_MODULE_REVERB, EAS_PARAM_REVERB_PRESET, EAS_PARAM_REVERB_CHAMBER);
|
||||
if (res)
|
||||
warning("error setting reverb preset: %d", (int32)res);
|
||||
|
||||
res = _setParameterFunc(_EASHandle, EAS_MODULE_REVERB, EAS_PARAM_REVERB_BYPASS, 0);
|
||||
res = EAS_SetParameter(_EASHandle, EAS_MODULE_REVERB, EAS_PARAM_REVERB_BYPASS, 0);
|
||||
if (res)
|
||||
warning("error disabling reverb bypass: %d", (int32)res);
|
||||
|
||||
// 90 is EAS's default, max is 100
|
||||
// so the option slider will only work from 0.1 to 1.1
|
||||
res = _setVolumeFunc(_EASHandle, 0, ConfMan.getInt("midi_gain") - 10);
|
||||
res = EAS_SetVolume(_EASHandle, 0, ConfMan.getInt("midi_gain") - 10);
|
||||
if (res)
|
||||
warning("error setting EAS master volume: %d", (int32)res);
|
||||
|
||||
res = _openStreamFunc(_EASHandle, &_midiStream, 0);
|
||||
if (ConfMan.hasKey("soundfont")) {
|
||||
const Common::String dls = ConfMan.get("soundfont");
|
||||
|
||||
debug("loading DLS file '%s'", dls.c_str());
|
||||
Common::FSNode fsnode(dls);
|
||||
Common::SeekableReadStream *stream = fsnode.createReadStream();
|
||||
|
||||
if (stream) {
|
||||
EAS_FileHandle h;
|
||||
h.stream = stream;
|
||||
h.size = -1;
|
||||
h.pos = -1;
|
||||
|
||||
EAS_FILE f;
|
||||
memset(&f, 0, sizeof(EAS_FILE));
|
||||
f.handle = &h;
|
||||
f.readAt = EAS_DLS_read;
|
||||
f.size = EAS_DLS_size;
|
||||
|
||||
res = EAS_LoadDLSCollection(_EASHandle, 0, &f);
|
||||
if (res)
|
||||
warning("error loading DLS file '%s': %d", dls.c_str(), (int32)res);
|
||||
else
|
||||
debug("DLS file loaded");
|
||||
|
||||
delete stream;
|
||||
} else {
|
||||
warning("error loading DLS file '%s': can't be opened", dls.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
res = EAS_OpenMIDIStream(_EASHandle, &_midiStream, 0);
|
||||
if (res) {
|
||||
close();
|
||||
warning("error opening EAS MIDI stream: %d", (int32)res);
|
||||
@ -357,43 +227,23 @@ int MidiDriver_EAS::open() {
|
||||
"tempo:%u rounds:%u", (int32)_config->maxVoices, (int32)_config->numChannels,
|
||||
(int32)_config->sampleRate, (int32)_config->mixBufferSize, _baseTempo, _rounds);
|
||||
|
||||
#ifdef DLS_SYNTHESIZER
|
||||
// TODO doesn't seem to work with midi streams?
|
||||
if (ConfMan.hasKey("soundfont")) {
|
||||
const Common::String dls = ConfMan.get("soundfont");
|
||||
|
||||
debug("loading DLS file '%s'", dls.c_str());
|
||||
|
||||
EAS_FILE_LOCATOR f;
|
||||
memset(&f, 0, sizeof(EAS_FILE_LOCATOR));
|
||||
f.path = dls.c_str();
|
||||
|
||||
res = _loadDLSFunc(_EASHandle, 0, &f);
|
||||
if (res)
|
||||
warning("error loading DLS file '%s': %d", dls.c_str(), (int32)res);
|
||||
else
|
||||
debug("DLS file loaded");
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef EAS_DUMPSTREAM
|
||||
if (!_dump.open("/sdcard/eas.dump"))
|
||||
if (!_dump.open(EAS_DUMPSTREAM))
|
||||
warning("error opening EAS dump file");
|
||||
#endif
|
||||
|
||||
g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType,
|
||||
&_soundHandle, this, -1,
|
||||
Audio::Mixer::kMaxChannelVolume, 0,
|
||||
DisposeAfterUse::NO, true);
|
||||
&_soundHandle, this, -1,
|
||||
Audio::Mixer::kMaxChannelVolume, 0,
|
||||
DisposeAfterUse::NO, true);
|
||||
|
||||
_isOpen = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void MidiDriver_EAS::close() {
|
||||
MidiDriver_MPU401::close();
|
||||
|
||||
if (!isOpen())
|
||||
if (!_EASHandle)
|
||||
return;
|
||||
|
||||
g_system->getMixer()->stopHandle(_soundHandle);
|
||||
@ -407,29 +257,18 @@ void MidiDriver_EAS::close() {
|
||||
g_system->delayMillis((_baseTempo * _rounds) / 1000);
|
||||
|
||||
if (_midiStream) {
|
||||
EAS_RESULT res = _closeStreamFunc(_EASHandle, _midiStream);
|
||||
EAS_RESULT res = EAS_CloseMIDIStream(_EASHandle, _midiStream);
|
||||
if (res)
|
||||
warning("error closing EAS MIDI stream: %d", (int32)res);
|
||||
|
||||
_midiStream = 0;
|
||||
}
|
||||
|
||||
if (_EASHandle) {
|
||||
EAS_RESULT res = _shutdownFunc(_EASHandle);
|
||||
if (res)
|
||||
warning("error shutting down the EAS library: %d", (int32)res);
|
||||
EAS_RESULT res = EAS_Shutdown(_EASHandle);
|
||||
if (res)
|
||||
warning("error shutting down the EAS library: %d", (int32)res);
|
||||
|
||||
_EASHandle = 0;
|
||||
}
|
||||
|
||||
#ifdef EAS_DLOPEN
|
||||
if (dlclose(_dlHandle))
|
||||
warning("error closing " EAS_LIBRARY ": %s", dlerror());
|
||||
|
||||
_dlHandle = 0;
|
||||
#endif
|
||||
|
||||
_isOpen = false;
|
||||
_EASHandle = 0;
|
||||
}
|
||||
|
||||
void MidiDriver_EAS::send(uint32 b) {
|
||||
@ -444,7 +283,7 @@ void MidiDriver_EAS::send(uint32 b) {
|
||||
if ((buf[0] >> 4) == 0xC || (buf[0] >> 4) == 0xD)
|
||||
len = 2;
|
||||
|
||||
int32 res = _writeStreamFunc(_EASHandle, _midiStream, buf, len);
|
||||
int32 res = EAS_WriteMIDIStream(_EASHandle, _midiStream, buf, len);
|
||||
if (res)
|
||||
warning("error writing to EAS MIDI stream: %d", (int32)res);
|
||||
}
|
||||
@ -461,7 +300,7 @@ void MidiDriver_EAS::sysEx(const byte *msg, uint16 length) {
|
||||
memcpy(buf + 1, msg, length);
|
||||
buf[length + 1] = 0xF7;
|
||||
|
||||
EAS_RESULT res = _writeStreamFunc(_EASHandle, _midiStream, buf, length + 2);
|
||||
EAS_RESULT res = EAS_WriteMIDIStream(_EASHandle, _midiStream, buf, length + 2);
|
||||
if (res)
|
||||
warning("error writing to EAS MIDI stream: %d", (int32)res);
|
||||
}
|
||||
@ -492,7 +331,7 @@ int MidiDriver_EAS::readBuffer(int16 *buffer, const int numSamples) {
|
||||
(*_timerProc)(_timerParam);
|
||||
|
||||
// if there are no MIDI events, this just renders silence
|
||||
res = _renderFunc(_EASHandle, buffer, _config->mixBufferSize, &c);
|
||||
res = EAS_Render(_EASHandle, buffer, _config->mixBufferSize, &c);
|
||||
if (res) {
|
||||
warning("error rendering EAS samples: %d", (int32)res);
|
||||
return -1;
|
||||
@ -560,10 +399,6 @@ Common::Error EASMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver
|
||||
return Common::kNoError;
|
||||
}
|
||||
|
||||
//#if PLUGIN_ENABLED_DYNAMIC(EAS)
|
||||
//REGISTER_PLUGIN_DYNAMIC(EAS, PLUGIN_TYPE_MUSIC, EASMusicPlugin);
|
||||
//#else
|
||||
REGISTER_PLUGIN_STATIC(EAS, PLUGIN_TYPE_MUSIC, EASMusicPlugin);
|
||||
//#endif
|
||||
REGISTER_PLUGIN_STATIC(EAS, PLUGIN_TYPE_MUSIC, EASMusicPlugin);
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user