3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-30 02:37:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 21b35efc98 into 40ad2bac0a

Browse source
This commit is contained in:
Stefan Keller 2025-03-03 16:16:32 +00:00 • committed by GitHub
commit c49293b710
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/streamreader/asio_stream.hpp
View file

@ -74,6 +74,8 @@ protected:
std::chrono::microseconds silence_{0ms}; std::chrono::microseconds silence_{0ms};
/// silence duration before switching the stream to idle /// silence duration before switching the stream to idle
std::chrono::milliseconds idle_threshold_; std::chrono::milliseconds idle_threshold_;
std::chrono::milliseconds silence_threshold_;
bool silence_detection_disabled_;
}; };
@ -103,7 +105,9 @@ AsioStream<ReadStream>::AsioStream(PcmStream::Listener* pcmListener, boost::asio
LOG(DEBUG, "AsioStream") << "Chunk duration: " << chunk_->durationMs() << " ms, frames: " << chunk_->getFrameCount() << ", size: " << chunk_->payloadSize LOG(DEBUG, "AsioStream") << "Chunk duration: " << chunk_->durationMs() << " ms, frames: " << chunk_->getFrameCount() << ", size: " << chunk_->payloadSize
<< "\n"; << "\n";
idle_threshold_ = std::chrono::milliseconds(std::max(cpt::stoi(uri_.getQuery("idle_threshold", "100")), 10)); idle_threshold_ = std::chrono::milliseconds(std::max(cpt::stoi(uri_.getQuery("idle_threshold", "500")), 10));
silence_threshold_ = std::chrono::milliseconds(std::max(cpt::stoi(uri_.getQuery("silence_threshold", "1500")), 10));
silence_detection_disabled_ = cpt::stoi(uri_.getQuery("silence_threshold", "1500")) == -1;
buffer_ms_ = 50; buffer_ms_ = 50;
@ -192,14 +196,14 @@ void AsioStream<ReadStream>::do_read()
lastException_.clear(); lastException_.clear();
if (isSilent(*chunk_)) if (isSilent(*chunk_) && !silence_detection_disabled_)
{ {
silence_ += chunk_->duration<std::chrono::microseconds>(); silence_ += chunk_->duration<std::chrono::microseconds>();
if (silence_ >= idle_threshold_) if (silence_ >= silence_threshold_)
{ {
setState(ReaderState::kIdle); setState(ReaderState::kIdle);
// Avoid overflow // Avoid overflow
silence_ = idle_threshold_; silence_ = silence_threshold_;
} }
} }
else else