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

Add stream buffer to AsioStream

Browse source
This commit is contained in:
badaix 2019-11-28 20:05:54 +01:00
parent ea62d8d768
commit 43c58febd7
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/streamreader/asio_stream.hpp
View file

@ -45,6 +45,7 @@ protected:
timeval tv_chunk_; timeval tv_chunk_;
bool first_; bool first_;
long nextTick_; long nextTick_;
uint32_t buffer_ms_;
boost::asio::deadline_timer timer_; boost::asio::deadline_timer timer_;
boost::asio::deadline_timer idle_timer_; boost::asio::deadline_timer idle_timer_;
std::unique_ptr<ReadStream> stream_; std::unique_ptr<ReadStream> stream_;
@ -59,6 +60,15 @@ 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;
try
{
buffer_ms_ = cpt::stoi(uri_.getQuery("bufferms", cpt::to_string(buffer_ms_)));
}
catch (...)
{
}
} }
@ -136,7 +146,7 @@ void AsioStream<ReadStream>::do_read()
chunk_->timestamp.sec = tv_chunk_.tv_sec; chunk_->timestamp.sec = tv_chunk_.tv_sec;
chunk_->timestamp.usec = tv_chunk_.tv_usec; chunk_->timestamp.usec = tv_chunk_.tv_usec;
tvEncodedChunk_ = tv_chunk_; tvEncodedChunk_ = tv_chunk_;
nextTick_ = chronos::getTickCount(); nextTick_ = chronos::getTickCount() + buffer_ms_;
} }
encoder_->encode(chunk_.get()); encoder_->encode(chunk_.get());
nextTick_ += pcmReadMs_; nextTick_ += pcmReadMs_;
@ -163,7 +173,7 @@ void AsioStream<ReadStream>::do_read()
chronos::systemtimeofday(&tv_chunk_); chronos::systemtimeofday(&tv_chunk_);
tvEncodedChunk_ = tv_chunk_; tvEncodedChunk_ = tv_chunk_;
pcmListener_->onResync(this, currentTick - nextTick_); pcmListener_->onResync(this, currentTick - nextTick_);
nextTick_ = currentTick; nextTick_ = currentTick + buffer_ms_;
do_read(); do_read();
} }
}); });