Add process return bool
This commit is contained in:
parent
c176f55af2
commit
c49342f9f7
|
@ -20,11 +20,12 @@ Object *DepthProcessor::OnCreateOutput() {
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
void DepthProcessor::OnProcess(
|
||||
bool DepthProcessor::OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) {
|
||||
UNUSED(in)
|
||||
UNUSED(out)
|
||||
UNUSED(parent)
|
||||
return true;
|
||||
}
|
||||
|
||||
MYNTEYE_END_NAMESPACE
|
||||
|
|
|
@ -19,7 +19,7 @@ class DepthProcessor : public Processor {
|
|||
|
||||
protected:
|
||||
Object *OnCreateOutput() override;
|
||||
void OnProcess(
|
||||
bool OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) override;
|
||||
};
|
||||
|
||||
|
|
|
@ -22,12 +22,14 @@ Object *DisparityNormalizedProcessor::OnCreateOutput() {
|
|||
return new ObjMat();
|
||||
}
|
||||
|
||||
void DisparityNormalizedProcessor::OnProcess(
|
||||
bool DisparityNormalizedProcessor::OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) {
|
||||
UNUSED(parent)
|
||||
const ObjMat *input = Object::Cast<ObjMat>(in);
|
||||
ObjMat *output = Object::Cast<ObjMat>(out);
|
||||
cv::normalize(input->value, output->value, 0, 255, cv::NORM_MINMAX, CV_8UC1);
|
||||
// cv::normalize maybe return empty ==
|
||||
return !output->value.empty();
|
||||
}
|
||||
|
||||
MYNTEYE_END_NAMESPACE
|
||||
|
|
|
@ -19,7 +19,7 @@ class DisparityNormalizedProcessor : public Processor {
|
|||
|
||||
protected:
|
||||
Object *OnCreateOutput() override;
|
||||
void OnProcess(
|
||||
bool OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) override;
|
||||
};
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ Object *DisparityProcessor::OnCreateOutput() {
|
|||
return new ObjMat();
|
||||
}
|
||||
|
||||
void DisparityProcessor::OnProcess(
|
||||
bool DisparityProcessor::OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) {
|
||||
UNUSED(parent)
|
||||
const ObjMat2 *input = Object::Cast<ObjMat2>(in);
|
||||
|
@ -81,6 +81,7 @@ void DisparityProcessor::OnProcess(
|
|||
sgbm_->compute(input->first, input->second, disparity);
|
||||
#endif
|
||||
output->value = disparity / 16 + 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
MYNTEYE_END_NAMESPACE
|
||||
|
|
|
@ -25,7 +25,7 @@ class DisparityProcessor : public Processor {
|
|||
|
||||
protected:
|
||||
Object *OnCreateOutput() override;
|
||||
void OnProcess(
|
||||
bool OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -20,11 +20,12 @@ Object *PointsProcessor::OnCreateOutput() {
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
void PointsProcessor::OnProcess(
|
||||
bool PointsProcessor::OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) {
|
||||
UNUSED(in)
|
||||
UNUSED(out)
|
||||
UNUSED(parent)
|
||||
return true;
|
||||
}
|
||||
|
||||
MYNTEYE_END_NAMESPACE
|
||||
|
|
|
@ -19,7 +19,7 @@ class PointsProcessor : public Processor {
|
|||
|
||||
protected:
|
||||
Object *OnCreateOutput() override;
|
||||
void OnProcess(
|
||||
bool OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) override;
|
||||
};
|
||||
|
||||
|
|
|
@ -151,12 +151,19 @@ void Processor::Run() {
|
|||
if (pre_callback_) {
|
||||
pre_callback_(input_.get());
|
||||
}
|
||||
bool ok = false;
|
||||
if (callback_) {
|
||||
if (!callback_(input_.get(), output_.get(), parent_)) {
|
||||
OnProcess(input_.get(), output_.get(), parent_);
|
||||
if (callback_(input_.get(), output_.get(), parent_)) {
|
||||
ok = true;
|
||||
} else {
|
||||
ok = OnProcess(input_.get(), output_.get(), parent_);
|
||||
}
|
||||
} else {
|
||||
OnProcess(input_.get(), output_.get(), parent_);
|
||||
ok = OnProcess(input_.get(), output_.get(), parent_);
|
||||
}
|
||||
if (!ok) {
|
||||
VLOG(2) << Name() << " process failed";
|
||||
continue;
|
||||
}
|
||||
if (post_callback_) {
|
||||
post_callback_(output_.get());
|
||||
|
|
|
@ -58,7 +58,7 @@ class Processor /*: public std::enable_shared_from_this<Processor>*/ {
|
|||
|
||||
protected:
|
||||
virtual Object *OnCreateOutput() = 0;
|
||||
virtual void OnProcess(
|
||||
virtual bool OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) = 0;
|
||||
|
||||
private:
|
||||
|
|
|
@ -29,13 +29,14 @@ Object *RectifyProcessor::OnCreateOutput() {
|
|||
return new ObjMat2();
|
||||
}
|
||||
|
||||
void RectifyProcessor::OnProcess(
|
||||
bool RectifyProcessor::OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) {
|
||||
UNUSED(parent)
|
||||
const ObjMat2 *input = Object::Cast<ObjMat2>(in);
|
||||
ObjMat2 *output = Object::Cast<ObjMat2>(out);
|
||||
cv::remap(input->first, output->first, map11, map12, cv::INTER_LINEAR);
|
||||
cv::remap(input->second, output->second, map21, map22, cv::INTER_LINEAR);
|
||||
return true;
|
||||
}
|
||||
|
||||
void RectifyProcessor::InitParams(
|
||||
|
|
|
@ -25,7 +25,7 @@ class RectifyProcessor : public Processor {
|
|||
|
||||
protected:
|
||||
Object *OnCreateOutput() override;
|
||||
void OnProcess(
|
||||
bool OnProcess(
|
||||
Object *const in, Object *const out, Processor *const parent) override;
|
||||
|
||||
private:
|
||||
|
|
Loading…
Reference in New Issue
Block a user