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

Rename buffer parameter

Browse source
This commit is contained in:
badaix 2019-12-01 22:07:03 +01:00
parent 0341174d5d
commit f35efe568a
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/streamreader/asio_stream.hpp
View file

@ -60,11 +60,10 @@ AsioStream<ReadStream>::AsioStream(PcmListener* pcmListener, boost::asio::io_con
{ {
chunk_ = std::make_unique<msg::PcmChunk>(sampleFormat_, pcmReadMs_); chunk_ = std::make_unique<msg::PcmChunk>(sampleFormat_, pcmReadMs_);
bytes_read_ = 0; bytes_read_ = 0;
buffer_ms_ = 50; buffer_ms_ = 50;
try try
{ {
buffer_ms_ = cpt::stoi(uri_.getQuery("bufferms", cpt::to_string(buffer_ms_))); buffer_ms_ = cpt::stoi(uri_.getQuery("buffer_ms", cpt::to_string(buffer_ms_)));
} }
catch (...) catch (...)
{ {
@ -136,6 +135,17 @@ void AsioStream<ReadStream>::do_read()
bytes_read_ += length; bytes_read_ += length;
// LOG(DEBUG) << "Read: " << length << " bytes\n"; // LOG(DEBUG) << "Read: " << length << " bytes\n";
// First read after connect. Set the initial read timestamp
// the timestamp will be incremented after encoding,
// since we do not know how much the encoder actually encoded
timeval now;
chronos::systemtimeofday(&now);
size_t stream2systime_diff = abs(now.tv_sec - tvEncodedChunk_.tv_sec);
if (stream2systime_diff > 5 + pcmReadMs_ / 1000)
{
LOG(WARNING) << "Stream and system time out of sync: " << stream2systime_diff << "s, resetting stream time.\n";
first_ = true;
}
if (first_) if (first_)
{ {
first_ = false; first_ = false;
@ -146,6 +156,7 @@ void AsioStream<ReadStream>::do_read()
nextTick_ += pcmReadMs_; nextTick_ += pcmReadMs_;
long currentTick = chronos::getTickCount(); long currentTick = chronos::getTickCount();
// Synchronize read to pcmReadMs_
if (nextTick_ >= currentTick) if (nextTick_ >= currentTick)
{ {
read_timer_.expires_from_now(boost::posix_time::milliseconds(nextTick_ - currentTick)); read_timer_.expires_from_now(boost::posix_time::milliseconds(nextTick_ - currentTick));
@ -161,6 +172,7 @@ void AsioStream<ReadStream>::do_read()
}); });
return; return;
} }
// Read took longer, wait for the buffer to fill up
else else
{ {
pcmListener_->onResync(this, currentTick - nextTick_); pcmListener_->onResync(this, currentTick - nextTick_);