diff --git a/components/codecs/include/ftl/codecs/packet.hpp b/components/codecs/include/ftl/codecs/packet.hpp index 2f808cc6d0a75735ade215b515c9864c96dccd6f..97bda6e826a52627e546f4537df6df30e12818d9 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 41d9e88b0a811ae487a308cbf15668da2734498f..5676c25d34dcc3dbbacd0460dbb6c993e4df3cc4 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 06470b21d513003fdc1d4b8accdcfcd6cb869c4c..d39ea51d587cc95d26727f0c63c7e207c6823aef 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 01dcbef368a8b642abbdf91b25aa31e3c8ee857c..539c9d3765d36a9970137265b4ebc96dab359a6b 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;