Skip to content
Snippets Groups Projects
Commit 877bd1dc authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' of...

Merge branch 'devel' of ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git into devel
parents 4bf99552 75a97e8d
No related branches found
No related tags found
No related merge requests found
...@@ -290,8 +290,6 @@ inline double TimeStamp::operator -(const TimeStamp& ts) const ...@@ -290,8 +290,6 @@ inline double TimeStamp::operator -(const TimeStamp& ts) const
return double((long int)(time_stamp_nano_ - ts.time_stamp_nano_))*1e-9; // long int cast fix overflow in case of negative substraction result return double((long int)(time_stamp_nano_ - ts.time_stamp_nano_))*1e-9; // long int cast fix overflow in case of negative substraction result
} }
//static const TimeStamp TimeStampInvalid() {return TimeStamp(-1.0);}
} // namespace wolf } // namespace wolf
#endif #endif
...@@ -37,7 +37,7 @@ TimeStamp::TimeStamp(const TimeStamp& _ts) : ...@@ -37,7 +37,7 @@ TimeStamp::TimeStamp(const TimeStamp& _ts) :
TimeStamp::TimeStamp(const double& _ts) : TimeStamp::TimeStamp(const double& _ts) :
time_stamp_nano_(_ts > 0 ? (unsigned long int)(_ts*1e9) : 0), time_stamp_nano_(_ts > 0 ? (unsigned long int)(_ts*1e9) : 0),
is_valid_(_ts > 0) is_valid_(_ts >= 0)
{ {
// //
} }
......
...@@ -58,6 +58,24 @@ void ProcessorMotion::splitBuffer(const wolf::CaptureMotionPtr& _capture_source, ...@@ -58,6 +58,24 @@ void ProcessorMotion::splitBuffer(const wolf::CaptureMotionPtr& _capture_source,
const FrameBasePtr& _keyframe_target, const FrameBasePtr& _keyframe_target,
const wolf::CaptureMotionPtr& _capture_target) const wolf::CaptureMotionPtr& _capture_target)
{ {
/** we are doing this:
*
* Before split:
*
* ts_split
* KF | F or KF
* * -----------------------*
* origin source
*
*
* After split:
*
* KF KF F or KF
* * ----------* -----------*
* origin target source
*
*/
// split the buffer // split the buffer
// and give the part of the buffer before the new keyframe to the capture for the KF callback // and give the part of the buffer before the new keyframe to the capture for the KF callback
_capture_source->getBuffer().split(_ts_split, _capture_target->getBuffer()); _capture_source->getBuffer().split(_ts_split, _capture_target->getBuffer());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment