3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-03 03:11:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Drop PCM chunks that are too old

Browse source
This commit is contained in:
badaix 2020-02-26 19:35:19 +01:00
parent 7376c7709c
commit 92088eb9c2
3 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/stream_session.cpp
View file

@ -147,10 +147,22 @@ void StreamSession::send_next()
void StreamSession::sendAsync(shared_const_buffer const_buf, bool send_now)
{
strand_.post([ this, self = shared_from_this(), const_buf, send_now ]() {
// delete PCM chunks that are older than the overall buffer duration
messages_.erase(std::remove_if(messages_.begin(), messages_.end(),
[this](const shared_const_buffer& buffer) {
const auto& msg = buffer.message();
if (!msg.is_pcm_chunk)
return false;
auto age = chronos::clk::now() - msg.rec_time;
return (age > std::chrono::milliseconds(bufferMs_) + 100ms);
}),
messages_.end());
if (send_now)
messages_.push_front(const_buf);
else
messages_.push_back(const_buf);
if (messages_.size() > 1)
{
LOG(DEBUG, LOG_TAG) << "outstanding async_write\n";
@ -166,12 +178,8 @@ void StreamSession::sendAsync(msg::message_ptr message, bool send_now)
if (!message)
return;
tv t;
// TODO: better set the timestamp in send_next for more accurate time sync
message->sent = t;
std::ostringstream oss;
message->serialize(oss);
sendAsync(shared_const_buffer(oss.str()), send_now);
sendAsync(shared_const_buffer(*message), send_now);
}