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

Remove more use of definition field

parent 82a789a7
No related branches found
No related tags found
1 merge request!311Resolves #296 removal of NvPipe
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment