LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

The existence of the AL_EXT_MCFORMATS OpenAL extension is checked when creating 5.1 and 7.1 (6 and 8 channel) Sources. love.audio.newSource now errors if the channel count and bit-depth combination of the Source isn't supported.

Browse Source
This commit is contained in:
Alex Szpakowski
2015-01-15 15:59:15 -04:00
parent 12c358769c
commit f1634bc6a8
2 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Source.cpp
+33 -10
View File
@@ -33,6 +33,17 @@ namespace audio
namespace openal namespace openal
{ {
class InvalidFormatException : public love::Exception
{
public:
InvalidFormatException(int channels, int bitdepth)
: Exception("%d-channel Sources with %d bits per sample are not supported.", channels, bitdepth)
{
}
};
StaticDataBuffer::StaticDataBuffer(ALenum format, const ALvoid *data, ALsizei size, ALsizei freq) StaticDataBuffer::StaticDataBuffer(ALenum format, const ALvoid *data, ALsizei size, ALsizei freq)
{ {
alGenBuffers(1, &buffer); alGenBuffers(1, &buffer);
@@ -68,6 +79,9 @@ Source::Source(Pool *pool, love::sound::SoundData *soundData)
, toLoop(0) , toLoop(0)
{ {
ALenum fmt = getFormat(soundData->getChannels(), soundData->getBitDepth()); ALenum fmt = getFormat(soundData->getChannels(), soundData->getBitDepth());
if (fmt == 0)
throw InvalidFormatException(soundData->getChannels(), soundData->getBitDepth());
staticBuffer.set(new StaticDataBuffer(fmt, soundData->getData(), soundData->getSize(), soundData->getSampleRate())); staticBuffer.set(new StaticDataBuffer(fmt, soundData->getData(), soundData->getSize(), soundData->getSampleRate()));
// The buffer has a +2 retain count right now, but we want it to have +1. // The buffer has a +2 retain count right now, but we want it to have +1.
@@ -103,6 +117,9 @@ Source::Source(Pool *pool, love::sound::Decoder *decoder)
, decoder(decoder) , decoder(decoder)
, toLoop(0) , toLoop(0)
{ {
if (getFormat(decoder->getChannels(), decoder->getBitDepth()) == 0)
throw InvalidFormatException(decoder->getChannels(), decoder->getBitDepth());
alGenBuffers(MAX_BUFFERS, streamBuffers); alGenBuffers(MAX_BUFFERS, streamBuffers);
float z[3] = {0, 0, 0}; float z[3] = {0, 0, 0};
@@ -651,16 +668,22 @@ ALenum Source::getFormat(int channels, int bitDepth) const
return AL_FORMAT_STEREO8; return AL_FORMAT_STEREO8;
else if (channels == 2 && bitDepth == 16) else if (channels == 2 && bitDepth == 16)
return AL_FORMAT_STEREO16; return AL_FORMAT_STEREO16;
else if (channels == 6 && bitDepth == 8)
return AL_FORMAT_51CHN8; #ifdef AL_EXT_MCFORMATS
else if (channels == 6 && bitDepth == 16) if (alIsExtensionPresent("AL_EXT_MCFORMATS"))
return AL_FORMAT_51CHN16; {
else if (channels == 8 && bitDepth == 8) if (channels == 6 && bitDepth == 8)
return AL_FORMAT_71CHN8; return AL_FORMAT_51CHN8;
else if (channels == 8 && bitDepth == 16) else if (channels == 6 && bitDepth == 16)
return AL_FORMAT_71CHN16; return AL_FORMAT_51CHN16;
else else if (channels == 8 && bitDepth == 8)
return 0; return AL_FORMAT_71CHN8;
else if (channels == 8 && bitDepth == 16)
return AL_FORMAT_71CHN16;
}
#endif
return 0;
} }
int Source::streamAtomic(ALuint buffer, love::sound::Decoder *d) int Source::streamAtomic(ALuint buffer, love::sound::Decoder *d)
src/modules/audio/wrap_Audio.cpp
+6 -4
View File
@@ -58,10 +58,12 @@ int w_newSource(lua_State *L)
Source *t = 0; Source *t = 0;
if (luax_istype(L, 1, SOUND_SOUND_DATA_T)) luax_catchexcept(L, [&]() {
t = instance()->newSource(luax_totype<love::sound::SoundData>(L, 1, "SoundData", SOUND_SOUND_DATA_T)); if (luax_istype(L, 1, SOUND_SOUND_DATA_T))
else if (luax_istype(L, 1, SOUND_DECODER_T)) t = instance()->newSource(luax_totype<love::sound::SoundData>(L, 1, "SoundData", SOUND_SOUND_DATA_T));
t = instance()->newSource(luax_totype<love::sound::Decoder>(L, 1, "Decoder", SOUND_DECODER_T)); else if (luax_istype(L, 1, SOUND_DECODER_T))
t = instance()->newSource(luax_totype<love::sound::Decoder>(L, 1, "Decoder", SOUND_DECODER_T));
});
if (t) if (t)
{ {