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

changed default sample rate to 48kHz

Browse source
This commit is contained in:
badaix 2016-01-03 20:43:42 +01:00
parent a7287eeb00
commit bc4f29b9f2
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/stream.cpp
View file

@ -306,7 +306,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
{ {
if (buffer_.full()) if (buffer_.full())
{ {
if (cs::usec(abs(median_)) > cs::msec(2)) if (cs::usec(abs(median_)) > cs::msec(1))
{ {
logO << "pBuffer->full() && (abs(median_) > 1): " << median_ << "\n"; logO << "pBuffer->full() && (abs(median_) > 1): " << median_ << "\n";
sleep_ = cs::usec(median_); sleep_ = cs::usec(median_);
@ -322,7 +322,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
*/ } */ }
else if (shortBuffer_.full()) else if (shortBuffer_.full())
{ {
if (cs::usec(abs(shortMedian_)) > cs::msec(20)) if (cs::usec(abs(shortMedian_)) > cs::msec(5))
{ {
logO << "pShortBuffer->full() && (abs(shortMedian_) > 5): " << shortMedian_ << "\n"; logO << "pShortBuffer->full() && (abs(shortMedian_) > 5): " << shortMedian_ << "\n";
sleep_ = cs::usec(shortMedian_); sleep_ = cs::usec(shortMedian_);
@ -332,7 +332,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
setRealSampleRate(format_.rate + -shortMedian_ / 100); setRealSampleRate(format_.rate + -shortMedian_ / 100);
} }
*/ } */ }
else if (miniBuffer_.full() && (cs::usec(abs(miniBuffer_.median())) > cs::msec(200))) else if (miniBuffer_.full() && (cs::usec(abs(miniBuffer_.median())) > cs::msec(50)))
{ {
logO << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer_.median() << "\n"; logO << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer_.median() << "\n";
sleep_ = cs::usec((cs::msec::rep)miniBuffer_.mean()); sleep_ = cs::usec((cs::msec::rep)miniBuffer_.mean());

2
server/snapserver.1
View file

@ -25,7 +25,7 @@ show version number
server port server port
.TP .TP
\fB-s, --sampleformat\fR \fB-s, --sampleformat\fR
sample format (default = 44100:16:2) sample format (default = 48000:16:2)
.TP .TP
\fB-c, --codec\fR \fB-c, --codec\fR
transport codec [flac|ogg|pcm][:options]. Type codec:? to get codec specific options transport codec [flac|ogg|pcm][:options]. Type codec:? to get codec specific options

10
server/streamServer.cpp
View file

@ -215,12 +215,12 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer) void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer)
{ {
logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n"; logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
if (baseMessage.type == message_type::kRequest) if (baseMessage.type == message_type::kRequest)
{ {
msg::Request requestMsg; msg::Request requestMsg;
requestMsg.deserialize(baseMessage, buffer); requestMsg.deserialize(baseMessage, buffer);
logO << "request: " << requestMsg.request << "\n"; logD << "request: " << requestMsg.request << "\n";
if (requestMsg.request == kTime) if (requestMsg.request == kTime)
{ {
msg::Time timeMsg; msg::Time timeMsg;
@ -231,7 +231,7 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
} }
else if (requestMsg.request == kServerSettings) else if (requestMsg.request == kServerSettings)
{ {
logO << "request kServerSettings: " << connection->macAddress << "\n"; logD << "request kServerSettings: " << connection->macAddress << "\n";
std::unique_lock<std::mutex> mlock(mutex_); std::unique_lock<std::mutex> mlock(mutex_);
ClientInfoPtr clientInfo = Config::instance().getClientInfo(connection->macAddress, true); ClientInfoPtr clientInfo = Config::instance().getClientInfo(connection->macAddress, true);
if (clientInfo == nullptr) if (clientInfo == nullptr)
@ -240,16 +240,14 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
} }
else else
{ {
logO << "request kServerSettings\n"; logD << "request kServerSettings\n";
msg::ServerSettings serverSettings; msg::ServerSettings serverSettings;
serverSettings.volume = clientInfo->volume.percent; serverSettings.volume = clientInfo->volume.percent;
serverSettings.muted = clientInfo->volume.muted; serverSettings.muted = clientInfo->volume.muted;
serverSettings.latency = clientInfo->latency; serverSettings.latency = clientInfo->latency;
serverSettings.refersTo = requestMsg.id; serverSettings.refersTo = requestMsg.id;
serverSettings.bufferMs = settings_.bufferMs; serverSettings.bufferMs = settings_.bufferMs;
logO << "request kServerSettings\n";
connection->send(&serverSettings); connection->send(&serverSettings);
logO << "request kServerSettings\n";
} }
} }
else if (requestMsg.request == kSampleFormat) else if (requestMsg.request == kSampleFormat)

2
server/streamServer.h
View file

@ -49,7 +49,7 @@ struct StreamServerSettings
fifoName("/tmp/snapfifo"), fifoName("/tmp/snapfifo"),
codec("flac"), codec("flac"),
bufferMs(1000), bufferMs(1000),
sampleFormat("44100:16:2"), sampleFormat("48000:16:2"),
pipeReadMs(20) pipeReadMs(20)
{ {
} }