From bbf52315b36139c25925d30bfdb3c6af9c89d83c Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 6 Jun 2020 11:50:08 +0300
Subject: [PATCH] Remove more use of definition field
---
components/codecs/include/ftl/codecs/packet.hpp | 4 ++--
components/rgbd-sources/include/ftl/rgbd/source.hpp | 2 +-
components/rgbd-sources/src/source.cpp | 2 +-
components/streams/src/injectors.cpp | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/codecs/include/ftl/codecs/packet.hpp b/components/codecs/include/ftl/codecs/packet.hpp
index 2f808cc6d..97bda6e82 100644
--- a/components/codecs/include/ftl/codecs/packet.hpp
+++ b/components/codecs/include/ftl/codecs/packet.hpp
@@ -39,7 +39,7 @@ struct Packet {
union {
[[deprecated]] ftl::codecs::definition_t definition; // Data resolution
- uint8_t reserved=0;
+ uint8_t reserved=7;
};
uint8_t frame_count; // v4+ Frames included in this packet
@@ -47,7 +47,7 @@ struct Packet {
uint8_t flags; // Codec dependent flags (eg. I-Frame or P-Frame)
std::vector<uint8_t> data;
- MSGPACK_DEFINE(codec, definition, frame_count, bitrate, flags, data);
+ MSGPACK_DEFINE(codec, reserved, frame_count, bitrate, flags, data);
};
static constexpr unsigned int kStreamCap_Static = 0x01;
diff --git a/components/rgbd-sources/include/ftl/rgbd/source.hpp b/components/rgbd-sources/include/ftl/rgbd/source.hpp
index 41d9e88b0..5676c25d3 100644
--- a/components/rgbd-sources/include/ftl/rgbd/source.hpp
+++ b/components/rgbd-sources/include/ftl/rgbd/source.hpp
@@ -274,7 +274,7 @@ void ftl::rgbd::Source::inject(ftl::codecs::Channel c, ARGS... args) {
pkt.codec = ftl::codecs::codec_t::MSGPACK;
pkt.bitrate = 0;
pkt.frame_count = 1;
- pkt.definition = ftl::codecs::definition_t::Any;
+ //pkt.definition = ftl::codecs::definition_t::Any;
pkt.flags = 0;
VectorBuffer buf(pkt.data);
diff --git a/components/rgbd-sources/src/source.cpp b/components/rgbd-sources/src/source.cpp
index 06470b21d..d39ea51d5 100644
--- a/components/rgbd-sources/src/source.cpp
+++ b/components/rgbd-sources/src/source.cpp
@@ -323,7 +323,7 @@ void Source::inject(const Eigen::Matrix4d &pose) {
spkt.channel = Channel::Pose;
spkt.streamID = 0;
pkt.codec = ftl::codecs::codec_t::MSGPACK;
- pkt.definition = ftl::codecs::definition_t::Any;
+ //pkt.definition = ftl::codecs::definition_t::Any;
pkt.bitrate = 0;
pkt.frame_count = 1;
pkt.flags = 0;
diff --git a/components/streams/src/injectors.cpp b/components/streams/src/injectors.cpp
index 01dcbef36..539c9d376 100644
--- a/components/streams/src/injectors.cpp
+++ b/components/streams/src/injectors.cpp
@@ -23,7 +23,7 @@ void ftl::stream::injectConfig(ftl::stream::Stream *stream, const ftl::rgbd::Fra
ftl::codecs::Packet pkt;
pkt.codec = ftl::codecs::codec_t::MSGPACK;
- pkt.definition = ftl::codecs::definition_t::Any;
+ //pkt.definition = ftl::codecs::definition_t::Any;
pkt.bitrate = 0;
pkt.frame_count = 1;
pkt.flags = 0;
@@ -45,7 +45,7 @@ void ftl::stream::injectPose(ftl::stream::Stream *stream, const ftl::rgbd::Frame
ftl::codecs::Packet pkt;
pkt.codec = ftl::codecs::codec_t::MSGPACK;
- pkt.definition = ftl::codecs::definition_t::Any;
+ //pkt.definition = ftl::codecs::definition_t::Any;
pkt.bitrate = 0;
pkt.frame_count = 1;
pkt.flags = 0;
@@ -73,7 +73,7 @@ void ftl::stream::injectCalibration(ftl::stream::Stream *stream, const ftl::rgbd
ftl::codecs::Packet pkt;
pkt.codec = ftl::codecs::codec_t::MSGPACK;
- pkt.definition = ftl::codecs::definition_t::Any;
+ //pkt.definition = ftl::codecs::definition_t::Any;
pkt.bitrate = 0;
pkt.frame_count = 1;
pkt.flags = 0;
--
GitLab