diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2017-04-14 20:39:32 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2017-04-15 08:57:35 +0200 |
| commit | 8b3506186e5c9c810bcbe4a4206874d9fd4dfe9b (patch) | |
| tree | f27d5d1bcdd1f560de35f418bdf9333d32fff387 /src/audiocache.cc | |
| parent | 87e0b9b288c0157544cfcefb63015a319507698a (diff) | |
Add chunk size control to the audio cache engine.
Diffstat (limited to 'src/audiocache.cc')
| -rw-r--r-- | src/audiocache.cc | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/audiocache.cc b/src/audiocache.cc index 7d80ae9..aecb208 100644 --- a/src/audiocache.cc +++ b/src/audiocache.cc @@ -35,8 +35,6 @@ #include "audiocachefile.h" -#define CHUNKSIZE(x) (x * CHUNK_MULTIPLIER) - AudioCache::AudioCache(Settings& settings) : settings(settings) { @@ -137,7 +135,7 @@ sample_t* AudioCache::open(const AudioFile& file, if(c.back == nullptr) { - c.back = new sample_t[CHUNKSIZE(framesize)]; + c.back = new sample_t[chunk_size]; } event_handler.pushLoadNextEvent(c.afile, c.channel, c.pos, @@ -184,7 +182,7 @@ sample_t* AudioCache::next(cacheid_t id, std::size_t& size) { // We are playing from cache: - if(c.localpos < CHUNKSIZE(framesize)) + if(c.localpos < chunk_size) { sample_t* s = c.front + c.localpos; c.localpos += framesize; @@ -206,7 +204,7 @@ sample_t* AudioCache::next(cacheid_t id, std::size_t& size) // Next time we go here we have already read the first frame. c.localpos = framesize; - c.pos += CHUNKSIZE(framesize); + c.pos += chunk_size; // Does the file have remaining unread samples? assert(c.afile); // Assert that we have an audio file. @@ -215,7 +213,7 @@ sample_t* AudioCache::next(cacheid_t id, std::size_t& size) // Do we have a back buffer to read into? if(c.back == nullptr) { - c.back = new sample_t[CHUNKSIZE(framesize)]; + c.back = new sample_t[chunk_size]; } event_handler.pushLoadNextEvent(c.afile, c.channel, c.pos, @@ -273,8 +271,6 @@ void AudioCache::setFrameSize(std::size_t framesize) } this->framesize = framesize; - - event_handler.setChunkSize(CHUNKSIZE(framesize)); } std::size_t AudioCache::getFrameSize() const @@ -282,6 +278,23 @@ std::size_t AudioCache::getFrameSize() const return framesize; } +void AudioCache::updateChunkSize(std::size_t output_channels) +{ + // Make sure we won't get out-of-range chunk sizes. + std::size_t disk_cache_chunk_size = + std::max(settings.disk_cache_chunk_size.load(), std::size_t(512u * 1024u)); + output_channels = std::max(output_channels, std::size_t(1u)); + + // 1MB pr. chunk divided over 16 channels, 4 bytes pr. sample. + const auto ideal_chunk_size = + disk_cache_chunk_size / output_channels / sizeof(sample_t); + + // Chunk size must match a whole number of frames. + chunk_size = (ideal_chunk_size / framesize) * framesize; + + event_handler.setChunkSize(chunk_size); +} + void AudioCache::setAsyncMode(bool async) { event_handler.setThreaded(async); |