Merge branch 'develop' into feature/android

* develop:
  fix: ros record, add disparity pre clone.
  fix: test and reduce more copy times
  fix: reduce more copy times
This commit is contained in:
John Zhao 2019-03-04 15:05:37 +08:00
commit be15d6a6d9
3 changed files with 18 additions and 0 deletions

View File

@ -34,6 +34,12 @@ class DepthProcessor : public Processor {
std::string Name() override; std::string Name() override;
protected: protected:
inline Processor::process_type ProcessOutputConnection() override {
return Processor::WITHOUT_CLONE;
}
inline Processor::process_type ProcessInputConnection() override {
return Processor::WITHOUT_CLONE;
}
Object *OnCreateOutput() override; Object *OnCreateOutput() override;
bool OnProcess( bool OnProcess(
Object *const in, Object *const out, Object *const in, Object *const out,

View File

@ -41,6 +41,12 @@ class DisparityProcessor : public Processor {
void NotifyComputingTypeChanged(const DisparityComputingMethod &MethodType); void NotifyComputingTypeChanged(const DisparityComputingMethod &MethodType);
protected: protected:
inline Processor::process_type ProcessOutputConnection() override {
return Processor::WITHOUT_CLONE;
}
// inline Processor::process_type ProcessInputConnection() override {
// return Processor::WITHOUT_CLONE;
// }
Object *OnCreateOutput() override; Object *OnCreateOutput() override;
bool OnProcess( bool OnProcess(
Object *const in, Object *const out, Object *const in, Object *const out,

View File

@ -37,6 +37,12 @@ class PointsProcessorOCV : public Processor {
bool OnProcess( bool OnProcess(
Object *const in, Object *const out, Object *const in, Object *const out,
std::shared_ptr<Processor> const parent) override; std::shared_ptr<Processor> const parent) override;
inline Processor::process_type ProcessOutputConnection() override {
return Processor::WITHOUT_CLONE;
}
inline Processor::process_type ProcessInputConnection() override {
return Processor::WITHOUT_CLONE;
}
private: private:
cv::Mat Q_; cv::Mat Q_;