From e18644c047404ced3536882a4ccc12e8c5567497 Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Mon, 26 Feb 2018 17:43:17 +0100
Subject: [PATCH] Move selectPack() to ProcessorBase
---
src/processor_base.cpp | 12 ++++++++++++
src/processor_base.h | 4 ++++
src/processor_tracker.cpp | 8 --------
src/processor_tracker.h | 2 --
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/processor_base.cpp b/src/processor_base.cpp
index fd8c518dd..c818aca22 100644
--- a/src/processor_base.cpp
+++ b/src/processor_base.cpp
@@ -74,6 +74,16 @@ void ProcessorBase::remove()
}
}
+KFPackPtr ProcessorBase::selectPack(const CaptureBasePtr & _cap)
+{
+ if (_cap)
+ return kf_pack_buffer_.selectPack(_cap->getTimeStamp(), time_tolerance_);
+
+ return nullptr;
+}
+
+
+
/////////////////////////////////////////////////////////////////////////////////////////
void KFPackBuffer::removeUpTo(const TimeStamp& _time_stamp)
@@ -147,4 +157,6 @@ bool KFPackBuffer::checkTimeTolerance(const TimeStamp& _time_stamp1, const Scala
return (std::fabs(_time_stamp1 - _time_stamp2) <= std::min(_time_tolerance1, _time_tolerance2));
}
+
+
} // namespace wolf
diff --git a/src/processor_base.h b/src/processor_base.h
index 997db66eb..429cdf673 100644
--- a/src/processor_base.h
+++ b/src/processor_base.h
@@ -174,6 +174,10 @@ class ProcessorBase : public NodeBase, public std::enable_shared_from_this<Proce
void setTimeTolerance(Scalar _time_tolerance);
+ protected:
+ KFPackPtr selectPack(const CaptureBasePtr & _cap);
+
+
};
}
diff --git a/src/processor_tracker.cpp b/src/processor_tracker.cpp
index 5d6054084..baa0f9c10 100644
--- a/src/processor_tracker.cpp
+++ b/src/processor_tracker.cpp
@@ -203,14 +203,6 @@ void ProcessorTracker::setKeyFrame(CaptureBasePtr _capture_ptr)
}
}
-KFPackPtr ProcessorTracker::selectPack(const CaptureBasePtr & _cap)
-{
- if (_cap)
- return kf_pack_buffer_.selectPack(_cap->getTimeStamp(), time_tolerance_);
-
- return nullptr;
-}
-
void ProcessorTracker::computeProcessingStep()
{
// First determine the processing phase by checking the status of the tracker pointers
diff --git a/src/processor_tracker.h b/src/processor_tracker.h
index 44b4ef841..31b83cf50 100644
--- a/src/processor_tracker.h
+++ b/src/processor_tracker.h
@@ -209,8 +209,6 @@ class ProcessorTracker : public ProcessorBase
void addNewFeatureIncoming(FeatureBasePtr _feature_ptr);
- private:
- KFPackPtr selectPack(const CaptureBasePtr & _cap);
};
inline void ProcessorTracker::setMaxNewFeatures(const unsigned int& _max_new_features)
--
GitLab