An error occurred while fetching the assigned milestone of the selected merge_request.
Add configuration to stream, H264 support, codec selection
Compare changes
- Nicolas Pope authored
@@ -52,8 +52,8 @@ NetFrame &NetFrameQueue::getFrame(int64_t ts, const cv::Size &s, int c1type, int
@@ -52,8 +52,8 @@ NetFrame &NetFrameQueue::getFrame(int64_t ts, const cv::Size &s, int c1type, int
@@ -72,8 +72,8 @@ NetFrame &NetFrameQueue::getFrame(int64_t ts, const cv::Size &s, int c1type, int
@@ -72,8 +72,8 @@ NetFrame &NetFrameQueue::getFrame(int64_t ts, const cv::Size &s, int c1type, int
@@ -90,55 +90,6 @@ void NetFrameQueue::freeFrame(NetFrame &f) {
@@ -90,55 +90,6 @@ void NetFrameQueue::freeFrame(NetFrame &f) {
/*bool NetSource::_getCalibration(Universe &net, const UUID &peer, const string &src, ftl::rgbd::Camera &p, ftl::codecs::Channel chan) {
auto [cap,buf] = net.call<tuple<unsigned int,vector<unsigned char>>>(peer_, "source_details", src, chan);
@@ -149,8 +100,8 @@ NetSource::NetSource(ftl::rgbd::Source *host)
@@ -149,8 +100,8 @@ NetSource::NetSource(ftl::rgbd::Source *host)
@@ -222,8 +173,8 @@ NetSource::NetSource(ftl::rgbd::Source *host)
@@ -222,8 +173,8 @@ NetSource::NetSource(ftl::rgbd::Source *host)
@@ -261,35 +212,29 @@ NetSource::~NetSource() {
@@ -261,35 +212,29 @@ NetSource::~NetSource() {
void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) {
int64_t now = std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now()).time_since_epoch().count();
@@ -298,19 +243,33 @@ void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spk
@@ -298,19 +243,33 @@ void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spk
@@ -326,19 +285,19 @@ void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spk
@@ -326,19 +285,19 @@ void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spk
@@ -358,51 +317,41 @@ void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spk
@@ -358,51 +317,41 @@ void NetSource::_recvPacket(short ttimeoff, const ftl::codecs::StreamPacket &spk
if (frame.timestamp >= 0 && frame.chunk_count[0] == frame.chunk_total[0] && frame.chunk_count[1] == frame.chunk_total[1]) {
@@ -420,12 +369,6 @@ void NetSource::setPose(const Eigen::Matrix4d &pose) {
@@ -420,12 +369,6 @@ void NetSource::setPose(const Eigen::Matrix4d &pose) {
@@ -450,27 +393,11 @@ void NetSource::_updateURI() {
@@ -450,27 +393,11 @@ void NetSource::_updateURI() {
//has_calibration_ = _getCalibration(*host_->getNet(), peer_, *uri, params_, ftl::codecs::Channel::Left);
host_->getNet()->bind(*uri, [this](short ttimeoff, const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) {