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

Fix for select of unavailable channels in receiver

parent c9b4a82a
Branches
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
Pipeline #28188 failed
......@@ -165,7 +165,8 @@ void Receiver::_processData(const StreamPacket &spkt, const Packet &pkt) {
auto &f = (spkt.frame_number == 255) ? **fs : fs->frames[spkt.frame_number];
f.informChange(spkt.channel, build.changeType(), pkt);
const auto &sel = stream_->selected(spkt.frameSetID()); // & cs->available(spkt.frameSetID());
const auto *cs = stream_;
const auto sel = stream_->selected(spkt.frameSetID()) & cs->available(spkt.frameSetID());
if (f.hasAll(sel)) {
timestamp_ = spkt.timestamp;
......@@ -350,8 +351,8 @@ void Receiver::_processVideo(const StreamPacket &spkt, const Packet &pkt) {
//auto &frame = builder(spkt.streamID).get(spkt.timestamp, spkt.frame_number+i);
auto &frame = fs->frames[spkt.frame_number+i];
//const auto *cs = stream_;
const auto &sel = stream_->selected(spkt.frameSetID()); // & cs->available(spkt.frameSetID());
const auto *cs = stream_;
const auto sel = stream_->selected(spkt.frameSetID()) & cs->available(spkt.frameSetID());
//frame.create<cv::cuda::GpuMat>(spkt.channel);
......@@ -407,7 +408,8 @@ void Receiver::setStream(ftl::stream::Stream *s) {
if (spkt.streamID < 255 && pkt.flags == 0) {
// Get the frameset
auto fs = builder(spkt.streamID).get(spkt.timestamp, spkt.frame_number+pkt.frame_count-1);
const auto &sel = stream_->selected(spkt.frameSetID());
const auto *cs = stream_;
const auto sel = stream_->selected(spkt.frameSetID()) & cs->available(spkt.frameSetID());
for (auto &frame : fs->frames) {
//LOG(INFO) << "MARK " << frame.source() << " " << (int)spkt.channel;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment