3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-10 23:56:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

use timeval instead of double for time sync

Browse source
This commit is contained in:
badaix 2016-04-02 13:22:08 +02:00
parent 6ea10c77dd
commit 14b5abe5d7
6 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/controller.cpp
View file

@ -72,10 +72,7 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
{
msg::Time reply;
reply.deserialize(baseMessage, buffer);
double latency = (reply.received.sec - reply.sent.sec) + (reply.received.usec - reply.sent.usec) / 1000000.;
// logO << "timeMsg: " << latency << "\n";
TimeProvider::getInstance().setDiffToServer((reply.latency - latency) * 1000 / 2);
// logO << "diff to server [ms]: " << (float)TimeProvider::getInstance().getDiffToServer<chronos::usec>().count() / 1000.f << "\n";
TimeProvider::getInstance().setDiff(reply.latency, reply.received - reply.sent);// ToServer(diff / 2);
}
else if (baseMessage.type == message_type::kServerSettings)
{
@ -185,8 +182,7 @@ void Controller::worker()
shared_ptr<msg::Time> reply = clientConnection_->sendReq<msg::Time>(&timeReq, chronos::msec(2000));
if (reply)
{
double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.;
TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2);
TimeProvider::getInstance().setDiff(reply->latency, reply->received - reply->sent);
usleep(100);
}
}

8
client/timeProvider.cpp
View file

@ -26,6 +26,14 @@ TimeProvider::TimeProvider() : diffToServer_(0)
}
void TimeProvider::setDiff(const tv& c2s, const tv& s2c)
{
tv latency = c2s - s2c;
double diff = latency.sec * 1000. + latency.usec / 1000.;
setDiffToServer(diff / 2.);
}
void TimeProvider::setDiffToServer(double ms)
{
static int32_t lastTimeSync = 0;

1
client/timeProvider.h
View file

@ -42,6 +42,7 @@ public:
}
void setDiffToServer(double ms);
void setDiff(const tv& c2s, const tv& s2c);
template<typename T>
inline T getDiffToServer() const

4
message/message.h
View file

@ -81,7 +81,7 @@ struct tv
int32_t sec;
int32_t usec;
tv operator+(const tv& other)
tv operator+(const tv& other) const
{
tv result(*this);
result.sec += other.sec;
@ -94,7 +94,7 @@ struct tv
return result;
}
tv operator-(const tv& other)
tv operator-(const tv& other) const
{
tv result(*this);
result.sec -= other.sec;

11
message/time.h
View file

@ -37,21 +37,22 @@ public:
virtual void read(std::istream& stream)
{
readVal(stream, latency);
// stream.read(reinterpret_cast<char *>(&latency), sizeof(double));
readVal(stream, latency.sec);
readVal(stream, latency.usec);
}
virtual uint32_t getSize() const
{
return sizeof(double);
return sizeof(tv);
}
double latency;
tv latency;
protected:
virtual void doserialize(std::ostream& stream) const
{
writeVal(stream, latency);//reinterpret_cast<const char *>(&latency), sizeof(double));
writeVal(stream, latency.sec);
writeVal(stream, latency.usec);
}
};

4
server/streamServer.cpp
View file

@ -250,8 +250,8 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
{
msg::Time timeMsg;
timeMsg.refersTo = requestMsg.id;
timeMsg.latency = (requestMsg.received.sec - requestMsg.sent.sec) + (requestMsg.received.usec - requestMsg.sent.usec) / 1000000.;
logD << "Latency: " << timeMsg.latency << ", refers to: " << timeMsg.refersTo << "\n";
timeMsg.latency = requestMsg.received - requestMsg.sent;
// logO << "Latency sec: " << timeMsg.latency.sec << ", usec: " << timeMsg.latency.usec << ", refers to: " << timeMsg.refersTo << "\n";
connection->send(&timeMsg);
// refresh connection state