3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-18 19:46:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Discard old chunks if not consumed (fixes #708)

Browse source
This commit is contained in:
badaix 2020-10-11 11:11:49 +02:00
parent 8e9eb5c870
commit 136766412c
3 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/stream.cpp
View file

@ -89,6 +89,7 @@ void Stream::setBufferLen(size_t bufferLenMs)
void Stream::clearChunks()
{
std::lock_guard<std::mutex> lock(mutex_);
while (chunks_.size() > 0)
chunks_.pop();
resetBuffers();
@ -102,11 +103,24 @@ void Stream::addChunk(unique_ptr<msg::PcmChunk> chunk)
if (age > 5s + bufferMs_)
return;
// LOG(TRACE, LOG_TAG) << "new chunk: " << chunk->durationMs() << " ms, age: " << age.count() << " ms, Chunks: " << chunks_.size() << "\n";
auto resampled = resampler_->resample(std::move(chunk));
if (resampled)
chunks_.push(move(resampled));
{
std::lock_guard<std::mutex> lock(mutex_);
recent_ = resampled;
chunks_.push(resampled);
std::shared_ptr<msg::PcmChunk> front_;
while (chunks_.front_copy(front_))
{
auto age = std::chrono::duration_cast<cs::msec>(TimeProvider::serverNow() - front_->start());
if ((age > 5s + bufferMs_) && chunks_.try_pop(front_))
LOG(TRACE, LOG_TAG) << "Oldest chunk too old: " << age.count() << " ms, removing. Chunks in queue left: " << chunks_.size() << "\n";
else
break;
}
}
// LOG(TRACE, LOG_TAG) << "new chunk: " << chunk->durationMs() << " ms, age: " << age.count() << " ms, Chunks: " << chunks_.size() << "\n";
}
@ -229,6 +243,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
return false;
}
std::lock_guard<std::mutex> lock(mutex_);
time_t now = time(nullptr);
if (!chunk_ && !chunks_.try_pop(chunk_))
{