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

Audio source decoding improvements.

Browse Source 
- Streaming sources now also stream the file contents instead of loading it into memory, by default. Added a new stream type enum parameter to newSource ("file" or "memory").
- Audio file decoding now chooses the most appropriate decoder based on the file contents instead of the file extension.
- Videos now stream audio from the file instead of loading all of the video file into memory for use with audio decoding.
This commit is contained in:
Alex Szpakowski
2022-04-21 19:57:32 -03:00
parent d5865e160c
commit c09fef8e79
20 changed files with 318 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sound/lullaby/FLACDecoder.cpp
+20 -24
View File
@@ -22,6 +22,7 @@
#include "FLACDecoder.h"
#include <set>
#include <algorithm>
#include "common/Exception.h"
namespace love
@@ -31,10 +32,24 @@ namespace sound
namespace lullaby
{
FLACDecoder::FLACDecoder(Data *data, int nbufferSize)
: Decoder(data, nbufferSize)
static size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead)
{
flac = drflac_open_memory(data->getData(), data->getSize(), nullptr);
auto stream = (Stream *) pUserData;
int64 read = stream->read(pBufferOut, bytesToRead);
return std::max<int64>(0, read);
}
static drflac_bool32 onSeek(void* pUserData, int offset, drflac_seek_origin origin)
{
auto stream = (Stream *) pUserData;
auto seekorigin = origin == drflac_seek_origin_current ? Stream::SEEKORIGIN_CURRENT : Stream::SEEKORIGIN_BEGIN;
return stream->seek(offset, seekorigin) ? DRFLAC_TRUE : DRFLAC_FALSE;
}
FLACDecoder::FLACDecoder(Stream *stream, int nbufferSize)
: Decoder(stream, nbufferSize)
{
flac = drflac_open(onRead, onSeek, stream, nullptr);
if (flac == nullptr)
throw love::Exception("Could not load FLAC file");
}
@@ -44,29 +59,10 @@ FLACDecoder::~FLACDecoder()
drflac_close(flac);
}
bool FLACDecoder::accepts(const std::string &ext)
{
// dr_flac supports FLAC encapsulated in Ogg, but unfortunately
// LOVE detects .ogg extension as Vorbis. It would be a good idea
// to always probe in the future (see #1487 and commit ccf9e63).
// Please remove once it's no longer the case.
static const std::string supported[] =
{
"flac", "ogg"
};
for (const auto& s : supported)
{
if (s.compare(ext) == 0)
return true;
}
return false;
}
love::sound::Decoder *FLACDecoder::clone()
{
return new FLACDecoder(data.get(), bufferSize);
StrongRef<Stream> s(stream->clone(), Acquire::NORETAIN);
return new FLACDecoder(s, bufferSize);
}
int FLACDecoder::decode()