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

Log chunk age

Browse source
This commit is contained in:
badaix 2020-08-10 22:18:09 +02:00
parent 2b894c8b07
commit ecd5f57b0c
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/stream.cpp
View file

@ -102,7 +102,7 @@ void Stream::addChunk(unique_ptr<msg::PcmChunk> chunk)
if (age > 5s + bufferMs_) if (age > 5s + bufferMs_)
return; return;
LOG(DEBUG, LOG_TAG) << "new chunk: " << chunk->durationMs() << " ms, age: " << age.count() << " ms, Chunks: " << chunks_.size() << "\n"; LOG(TRACE, LOG_TAG) << "new chunk: " << chunk->durationMs() << " ms, age: " << age.count() << " ms, Chunks: " << chunks_.size() << "\n";
auto resampled = resampler_->resample(std::move(chunk)); auto resampled = resampler_->resample(std::move(chunk));
if (resampled) if (resampled)
@ -240,6 +240,21 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
return false; return false;
} }
static int64_t min_buffer = 0;
std::shared_ptr<msg::PcmChunk> recent_;
if (chunks_.back_copy(recent_))
{
cs::nsec req_chunk_duration = cs::nsec(static_cast<cs::nsec::rep>(frames / format_.nsRate()));
auto youngest = recent_->end() - req_chunk_duration;
cs::msec age = std::chrono::duration_cast<cs::msec>(TimeProvider::serverNow() - youngest + outputBufferDacTime);
min_buffer = std::max(min_buffer, age.count());
if (now != lastUpdate_)
{
LOG(TRACE, LOG_TAG) << "getPlayerChunk duration: " << std::chrono::duration_cast<std::chrono::milliseconds>(req_chunk_duration).count() << ", min buffer: " << min_buffer << "\n";
min_buffer = 0;
}
}
/// we have a chunk /// we have a chunk
/// age = chunk age (server now - rec time: some positive value) - buffer (e.g. 1000ms) + time to DAC /// age = chunk age (server now - rec time: some positive value) - buffer (e.g. 1000ms) + time to DAC
/// age = 0 => play now /// age = 0 => play now

10
common/queue.h
View file

@ -98,6 +98,16 @@ public:
cond_.notify_one(); cond_.notify_one();
} }
bool back_copy(T& copy)
{
std::lock_guard<std::mutex> mlock(mutex_);
if (queue_.empty())
return false;
T t = queue_.back();
copy = t;
return true;
}
void push_front(T&& item) void push_front(T&& item)
{ {
{ {

2
server/streamreader/pipe_stream.cpp
View file

@ -57,7 +57,7 @@ void PipeStream::do_connect()
{ {
int fd = open(uri_.path.c_str(), O_RDONLY | O_NONBLOCK); int fd = open(uri_.path.c_str(), O_RDONLY | O_NONBLOCK);
int pipe_size = -1; int pipe_size = -1;
#ifndef MACOS #if !defined(MACOS)
pipe_size = fcntl(fd, F_GETPIPE_SZ); pipe_size = fcntl(fd, F_GETPIPE_SZ);
#endif #endif
LOG(INFO, LOG_TAG) << "Stream: " << name_ << ", connect to pipe: " << uri_.path << ", fd: " << fd << ", pipe size: " << pipe_size << "\n"; LOG(INFO, LOG_TAG) << "Stream: " << name_ << ", connect to pipe: " << uri_.path << ", fd: " << fd << ", pipe size: " << pipe_size << "\n";