aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-01-23 10:32:57 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-01-23 10:32:57 +0100
commit9fec888d1e5e68600b854408324eef059bbc2b47 (patch)
tree62656f12b8c63558ace53a20c239452068a12209
parente352ec38c20d626a4359c684abea23ef92a41470 (diff)
downloaddabmod-9fec888d1e5e68600b854408324eef059bbc2b47.tar.gz
dabmod-9fec888d1e5e68600b854408324eef059bbc2b47.tar.bz2
dabmod-9fec888d1e5e68600b854408324eef059bbc2b47.zip
TimestampDecoder: handle negative offset properly
-rw-r--r--src/TimestampDecoder.cpp24
-rw-r--r--src/TimestampDecoder.h17
2 files changed, 24 insertions, 17 deletions
diff --git a/src/TimestampDecoder.cpp b/src/TimestampDecoder.cpp
index 4aaaf67..a561237 100644
--- a/src/TimestampDecoder.cpp
+++ b/src/TimestampDecoder.cpp
@@ -35,6 +35,28 @@
//#define MDEBUG(fmt, args...) fprintf (LOG, "*****" fmt , ## args)
#define MDEBUG(fmt, args...) PDEBUG(fmt, ## args)
+frame_timestamp& frame_timestamp::operator+=(const double& diff)
+{
+ double offset_pps, offset_secs;
+ offset_pps = modf(diff, &offset_secs);
+
+ this->timestamp_sec += lrint(offset_secs);
+ int64_t new_pps = (int64_t)this->timestamp_pps + llrint(offset_pps * 16384000.0);
+
+ while (new_pps < 0) {
+ this->timestamp_sec -= 1;
+ new_pps += 16384000;
+ }
+
+ while (new_pps > 16384000) {
+ this->timestamp_sec += 1;
+ new_pps -= 16384000;
+ }
+
+ this->timestamp_pps = new_pps;
+ return *this;
+}
+
TimestampDecoder::TimestampDecoder(double& offset_s) :
RemoteControllable("tist"),
timestamp_offset(offset_s)
@@ -65,8 +87,6 @@ std::shared_ptr<frame_timestamp> TimestampDecoder::getTimestamp()
ts->timestamp_refresh = offset_changed;
offset_changed = false;
- MDEBUG("time_secs=%d, time_pps=%f\n", time_secs,
- (double)time_pps / 16384000.0);
*ts += timestamp_offset;
return ts;
diff --git a/src/TimestampDecoder.h b/src/TimestampDecoder.h
index ed41dfb..d083061 100644
--- a/src/TimestampDecoder.h
+++ b/src/TimestampDecoder.h
@@ -44,22 +44,9 @@ struct frame_timestamp
bool timestamp_valid = false;
bool timestamp_refresh;
- frame_timestamp& operator+=(const double& diff)
- {
- double offset_pps, offset_secs;
- offset_pps = modf(diff, &offset_secs);
-
- this->timestamp_sec += lrint(offset_secs);
- this->timestamp_pps += lrint(offset_pps * 16384000.0);
-
- while (this->timestamp_pps >= 16384000) {
- this->timestamp_pps -= 16384000;
- this->timestamp_sec += 1;
- }
- return *this;
- }
+ frame_timestamp& operator+=(const double& diff);
- const frame_timestamp operator+(const double diff) {
+ const frame_timestamp operator+(const double diff) const {
frame_timestamp ts = *this;
ts += diff;
return ts;