oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Code deduplication: move mod_loadfile() into ModCommon.cxx

Browse Source
This commit is contained in:
GrimReaperFloof
2021-05-11 20:05:26 +02:00
parent 541c31c879
commit fec6aac0f1
2 changed files with 7 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/decoder/plugins/OpenmptDecoderPlugin.cxx
View File

@@ -18,6 +18,7 @@
*/ */
#include "OpenmptDecoderPlugin.hxx" #include "OpenmptDecoderPlugin.hxx"
#include "ModCommon.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
@@ -35,7 +36,6 @@
static constexpr Domain openmpt_domain("openmpt"); static constexpr Domain openmpt_domain("openmpt");
static constexpr size_t OPENMPT_FRAME_SIZE = 4096; static constexpr size_t OPENMPT_FRAME_SIZE = 4096;
static constexpr size_t OPENMPT_PREALLOC_BLOCK = 256 * 1024;
static constexpr int32_t OPENMPT_SAMPLE_RATE = 48000; static constexpr int32_t OPENMPT_SAMPLE_RATE = 48000;
static int openmpt_stereo_separation; static int openmpt_stereo_separation;
@@ -60,68 +60,13 @@ openmpt_decoder_init(const ConfigBlock &block)
return true; return true;
} }
static WritableBuffer<uint8_t>
mod_loadfile(DecoderClient *client, InputStream &is)
{
//known/unknown size, preallocate array, lets read in chunks
const bool is_stream = !is.KnownSize();
WritableBuffer<uint8_t> buffer;
if (is_stream)
buffer.size = OPENMPT_PREALLOC_BLOCK;
else {
const auto size = is.GetSize();
if (size == 0) {
LogWarning(openmpt_domain, "file is empty");
return nullptr;
}
buffer.size = size;
}
buffer.data = new uint8_t[buffer.size];
uint8_t *const end = buffer.end();
uint8_t *p = buffer.begin();
while (true) {
size_t ret = decoder_read(client, is, p, end - p);
if (ret == 0) {
if (is.LockIsEOF())
/* end of file */
break;
/* I/O error - skip this song */
delete[] buffer.data;
buffer.data = nullptr;
return buffer;
}
p += ret;
if (p == end) {
if (!is_stream)
break;
LogWarning(openmpt_domain, "stream too large");
delete[] buffer.data;
buffer.data = nullptr;
return buffer;
}
}
buffer.size = p - buffer.data;
return buffer;
}
static void static void
mod_decode(DecoderClient &client, InputStream &is) mod_decode(DecoderClient &client, InputStream &is)
{ {
int ret; int ret;
char audio_buffer[OPENMPT_FRAME_SIZE]; char audio_buffer[OPENMPT_FRAME_SIZE];
const auto buffer = mod_loadfile(&client, is); const auto buffer = mod_loadfile(&openmpt_domain, &client, is);
if (buffer.IsNull()) { if (buffer.IsNull()) {
LogWarning(openmpt_domain, "could not load stream"); LogWarning(openmpt_domain, "could not load stream");
return; return;
@@ -171,7 +116,7 @@ mod_decode(DecoderClient &client, InputStream &is)
static bool static bool
openmpt_scan_stream(InputStream &is, TagHandler &handler) noexcept openmpt_scan_stream(InputStream &is, TagHandler &handler) noexcept
{ {
const auto buffer = mod_loadfile(nullptr, is); const auto buffer = mod_loadfile(&openmpt_domain, nullptr, is);
if (buffer.IsNull()) { if (buffer.IsNull()) {
LogWarning(openmpt_domain, "could not load stream"); LogWarning(openmpt_domain, "could not load stream");
return false; return false;

5
src/decoder/plugins/meson.build
View File

@@ -111,7 +111,10 @@ endif
libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt')) libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt'))
decoder_features.set('ENABLE_OPENMPT', libopenmpt_dep.found()) decoder_features.set('ENABLE_OPENMPT', libopenmpt_dep.found())
if libopenmpt_dep.found() if libopenmpt_dep.found()
decoder_plugins_sources += 'OpenmptDecoderPlugin.cxx' decoder_plugins_sources += [
'OpenmptDecoderPlugin.cxx',
'ModCommon.cxx'
]
endif endif
libmpcdec_dep = c_compiler.find_library('mpcdec', required: get_option('mpcdec')) libmpcdec_dep = c_compiler.find_library('mpcdec', required: get_option('mpcdec'))