Skip to content
Snippets Groups Projects
Commit 0f916414 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fix for recon crash in mvmls

parent 47b18adb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
components/operators/include/ftl/operators/mvmls.hpp
+ 4
− 4
View file @ 0f916414
......@@ -16,10 +16,10 @@ class MultiViewMLS : public ftl::operators::Operator {
bool apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cudaStream_t stream) override;
private:
std::vector<ftl::cuda::TextureObject<float4>> centroid_horiz_;
std::vector<ftl::cuda::TextureObject<float4>> centroid_vert_;
std::vector<ftl::cuda::TextureObject<float4>> normals_horiz_;
std::vector<ftl::cuda::TextureObject<float>> contributions_;
std::vector<ftl::cuda::TextureObject<float4>*> centroid_horiz_;
std::vector<ftl::cuda::TextureObject<float4>*> centroid_vert_;
std::vector<ftl::cuda::TextureObject<float4>*> normals_horiz_;
std::vector<ftl::cuda::TextureObject<float>*> contributions_;
};
}
......
components/operators/src/mvmls.cpp
+ 25
− 19
View file @ 0f916414
......@@ -41,22 +41,25 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
params.cost_ratio = config()->value("cost_ratio", 0.2f);
params.cost_threshold = config()->value("cost_threshold", 1.0f);
if (in.frames.size() < 1) return false;
auto size = in.frames[0].get<GpuMat>(Channel::Depth).size();
// Make sure we have enough buffers
if (normals_horiz_.size() < in.frames.size()) {
normals_horiz_.resize(in.frames.size());
centroid_horiz_.resize(in.frames.size());
centroid_vert_.resize(in.frames.size());
contributions_.resize(in.frames.size());
while (normals_horiz_.size() < in.frames.size()) {
normals_horiz_.push_back(new ftl::cuda::TextureObject<float4>(size.height, size.width));
centroid_horiz_.push_back(new ftl::cuda::TextureObject<float4>(size.height, size.width));
centroid_vert_.push_back(new ftl::cuda::TextureObject<float4>(size.width, size.height));
contributions_.push_back(new ftl::cuda::TextureObject<float>(size.width, size.height));
}
// Make sure all buffers are at correct resolution and are allocated
for (size_t i=0; i<in.frames.size(); ++i) {
auto &f = in.frames[i];
auto size = f.get<GpuMat>(Channel::Depth).size();
centroid_horiz_[i].create(size.height, size.width);
normals_horiz_[i].create(size.height, size.width);
centroid_vert_[i].create(size.width, size.height);
contributions_[i].create(size.width, size.height);
centroid_horiz_[i]->create(size.height, size.width);
normals_horiz_[i]->create(size.height, size.width);
centroid_vert_[i]->create(size.width, size.height);
contributions_[i]->create(size.width, size.height);
if (!f.hasChannel(Channel::Normals)) {
throw FTL_Error("Required normals channel missing for MLS");
......@@ -201,8 +204,8 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
//auto *s = in.sources[i];
// Clear data
cv::cuda::GpuMat data(contributions_[i].height(), contributions_[i].width(), CV_32F, contributions_[i].pixelPitch());
data.setTo(cv::Scalar(0.0f), cvstream);
//cv::cuda::GpuMat data(contributions_[i]->height(), contributions_[i]->width(), CV_32F, contributions_[i]->devicePtr(), contributions_[i]->pixelPitch());
//data.setTo(cv::Scalar(0.0f), cvstream);
if (cull_zero && iter == iters-1) {
ftl::cuda::zero_confidence(
......@@ -215,9 +218,9 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
ftl::cuda::mls_aggr_horiz(
f.createTexture<uchar4>(Channel::Support2),
f.createTexture<float4>(Channel::Normals),
normals_horiz_[i],
*normals_horiz_[i],
f.createTexture<float>(Channel::Depth),
centroid_horiz_[i],
*centroid_horiz_[i],
f.createTexture<uchar4>(Channel::Colour),
thresh,
col_smooth,
......@@ -228,10 +231,10 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
ftl::cuda::mls_aggr_vert(
f.getTexture<uchar4>(Channel::Support2),
normals_horiz_[i],
*normals_horiz_[i],
f.getTexture<float4>(Channel::Normals),
centroid_horiz_[i],
centroid_vert_[i],
*centroid_horiz_[i],
*centroid_vert_[i],
f.getTexture<uchar4>(Channel::Colour),
f.getTexture<float>(Channel::Depth),
thresh,
......@@ -242,6 +245,9 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
);
}
//return true;
// Step 3:
// Find corresponding points and perform aggregation of any correspondences
// For each camera combination
......@@ -280,8 +286,8 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
ftl::cuda::aggregate_sources(
f1.getTexture<float4>(Channel::Normals),
f2.getTexture<float4>(Channel::Normals),
centroid_vert_[i],
centroid_vert_[j],
*centroid_vert_[i],
*centroid_vert_[j],
f1.getTexture<float>(Channel::Depth),
//contributions_[i],
//contributions_[j],
......@@ -315,7 +321,7 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
ftl::cuda::mls_adjust_depth(
f.getTexture<float4>(Channel::Normals),
centroid_vert_[i],
*centroid_vert_[i],
f.getTexture<float>(Channel::Depth),
f.createTexture<float>(Channel::Depth2, ftl::rgbd::Format<float>(size)),
f.getLeftCamera(),
......
components/operators/src/operator.cpp
+ 10
− 4
View file @ 0f916414
......@@ -69,7 +69,9 @@ bool Graph::apply(FrameSet &in, FrameSet &out, cudaStream_t stream) {
try {
instance->apply(in.frames[j], out.frames[j], stream_actual);
} catch (const std::exception &e) {
LOG(ERROR) << "Operator exception: " << e.what();
LOG(ERROR) << "Operator exception for '" << instance->config()->getID() << "': " << e.what();
cudaSafeCall(cudaStreamSynchronize(stream_actual));
return false;
}
}
}
......@@ -80,7 +82,9 @@ bool Graph::apply(FrameSet &in, FrameSet &out, cudaStream_t stream) {
try {
instance->apply(in, out, stream_actual);
} catch (const std::exception &e) {
LOG(ERROR) << "Operator exception: " << e.what();
LOG(ERROR) << "Operator exception for '" << instance->config()->getID() << "': " << e.what();
cudaSafeCall(cudaStreamSynchronize(stream_actual));
return false;
}
}
}
......@@ -88,7 +92,7 @@ bool Graph::apply(FrameSet &in, FrameSet &out, cudaStream_t stream) {
if (stream == 0) {
cudaSafeCall(cudaStreamSynchronize(stream_actual));
cudaSafeCall( cudaGetLastError() );
//cudaSafeCall( cudaGetLastError() );
}
return true;
......@@ -111,7 +115,9 @@ bool Graph::apply(Frame &in, Frame &out, cudaStream_t stream) {
try {
instance->apply(in, out, stream_actual);
} catch (const std::exception &e) {
LOG(ERROR) << "Operator exception: " << e.what();
LOG(ERROR) << "Operator exception for '" << instance->config()->getID() << "': " << e.what();
cudaSafeCall(cudaStreamSynchronize(stream_actual));
return false;
}
}
}
......
components/rgbd-sources/include/ftl/rgbd/frameset.hpp
+ 1
− 0
View file @ 0f916414
......@@ -136,6 +136,7 @@ class Builder : public Generator {
float fps_;
int stats_count_;
int64_t last_ts_;
int64_t last_frame_;
std::atomic<int> jobs_;
volatile bool skip_;
ftl::timer::TimerHandle main_id_;
......
components/rgbd-sources/src/frameset.cpp
+ 22
− 4
View file @ 0f916414
......@@ -64,6 +64,7 @@ Builder::Builder() : head_(0) {
skip_ = false;
//setFPS(20);
size_ = 0;
last_frame_ = 0;
mspf_ = ftl::timer::getInterval();
name_ = "NoName";
......@@ -71,6 +72,8 @@ Builder::Builder() : head_(0) {
latency_ = 0.0f;;
stats_count_ = 0;
fps_ = 0.0f;
if (size_ > 0) states_.resize(size_);
}
Builder::~Builder() {
......@@ -84,7 +87,7 @@ Builder::~Builder() {
}
ftl::rgbd::Frame &Builder::get(int64_t timestamp, size_t ix) {
if (timestamp <= 0 || ix >= kMaxFramesInSet) throw ftl::exception("Invalid frame timestamp or index");
if (timestamp <= 0 || ix >= kMaxFramesInSet) throw FTL_Error("Invalid frame timestamp or index");
UNIQUE_LOCK(mutex_, lk);
......@@ -98,15 +101,27 @@ ftl::rgbd::Frame &Builder::get(int64_t timestamp, size_t ix) {
}
//states_[ix] = frame.origin();
if (timestamp <= last_frame_) {
throw FTL_Error("Frameset already completed");
}
auto *fs = _findFrameset(timestamp);
if (!fs) {
// Add new frameset
fs = _addFrameset(timestamp);
if (!fs) throw ftl::exception("Could not add frameset");
if (!fs) throw FTL_Error("Could not add frameset");
}
if (fs->stale) {
throw FTL_Error("Frameset already completed");
}
if (ix >= fs->frames.size()) {
throw FTL_Error("Frame index out-of-bounds");
}
if (fs->frames.size() < size_) fs->frames.resize(size_);
//if (fs->frames.size() < size_) fs->frames.resize(size_);
//lk.unlock();
//SHARED_LOCK(fs->mtx, lk2);
......@@ -159,7 +174,7 @@ void Builder::_schedule() {
if (fs) {
//UNIQUE_LOCK(fs->mtx, lk2);
// The buffers are invalid after callback so mark stale
fs->stale = true;
//fs->stale = true;
jobs_++;
//lk.unlock();
......@@ -310,6 +325,9 @@ ftl::rgbd::FrameSet *Builder::_getFrameset() {
if (!f->stale && static_cast<unsigned int>(f->count) >= size_) {
//LOG(INFO) << "GET FRAMESET and remove: " << f->timestamp;
auto j = framesets_.erase(i);
last_frame_ = f->timestamp;
f->stale = true;
int count = 0;
// Merge all previous frames
......
components/streams/src/receiver.cpp
+ 2
− 1
View file @ 0f916414
......@@ -194,7 +194,8 @@ void Receiver::_processVideo(const StreamPacket &spkt, const Packet &pkt) {
// Now split the tiles from surface into frames, doing colour conversions
// at the same time.
for (int i=0; i<pkt.frame_count; ++i) {
// Note: Done in reverse to allocate correct number of frames first time round
for (int i=pkt.frame_count-1; i>=0; --i) {
InternalVideoStates &vidstate = _getVideoFrame(spkt,i);
auto &frame = builder_.get(spkt.timestamp, spkt.frame_number+i);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment