diff --git a/components/streams/src/receiver.cpp b/components/streams/src/receiver.cpp index 38feb34d591afa41fa2003776ad8076dd4302d93..00aa56be07f484b6ec03617d55dcbacd5addb027 100644 --- a/components/streams/src/receiver.cpp +++ b/components/streams/src/receiver.cpp @@ -178,9 +178,9 @@ void Receiver::setStream(ftl::stream::Stream *s) { if (frame.state.getLeft().width == 0) { LOG(WARNING) << "Missing calibration, skipping frame"; - frame.frame.reset(); - frame.completed.clear(); - return; + //frame.frame.reset(); + //frame.completed.clear(); + //return; } // TODO: Have multiple builders for different framesets. diff --git a/components/streams/src/sender.cpp b/components/streams/src/sender.cpp index 44e5308f84ed189c9603b98a55198a473ddf1add..43588155adfd2f2fc075dfff50475a6f612996b1 100644 --- a/components/streams/src/sender.cpp +++ b/components/streams/src/sender.cpp @@ -9,7 +9,7 @@ using ftl::codecs::definition_t; using ftl::codecs::device_t; using ftl::codecs::codec_t; -Sender::Sender(nlohmann::json &config) : ftl::Configurable(config), stream_(nullptr), do_inject_(ATOMIC_FLAG_INIT) { +Sender::Sender(nlohmann::json &config) : ftl::Configurable(config), stream_(nullptr) { //do_inject_ = false; } @@ -42,6 +42,7 @@ class VectorBuffer2 { }; void Sender::_injectCalibration(const ftl::rgbd::FrameSet &fs, int ix) { + LOG(INFO) << "INJECT CALIBRATION"; ftl::codecs::StreamPacket spkt = { 4, fs.timestamp, @@ -168,8 +169,8 @@ void Sender::post(const ftl::rgbd::FrameSet &fs) { if (enc) { // FIXME: Timestamps may not always be aligned to interval. - if (do_inject || fs.timestamp % (10*ftl::timer::getInterval()) == 0) enc->reset(); - //if (do_inject) enc->reset(); + //if (do_inject || fs.timestamp % (10*ftl::timer::getInterval()) == 0) enc->reset(); + if (do_inject) enc->reset(); try { enc->encode(frame.get<cv::cuda::GpuMat>(c), 0, [this,&spkt](const ftl::codecs::Packet &pkt){ stream_->post(spkt, pkt);