From c6a443514184e9e54bc9777df81392165d49e60e Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 6 Jun 2020 13:24:58 +0300
Subject: [PATCH] Remove more refs to definition field
---
applications/tools/codec_eval/src/main.cpp | 2 --
.../tools/middlebury_gen/src/main.cpp | 3 ---
components/codecs/src/nvidia_encoder.cpp | 19 ++-----------------
components/codecs/src/opencv_decoder.cpp | 3 +--
components/codecs/src/opencv_encoder.cpp | 18 ------------------
components/streams/src/sender.cpp | 6 +-----
components/streams/test/receiver_unit.cpp | 3 ---
7 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/applications/tools/codec_eval/src/main.cpp b/applications/tools/codec_eval/src/main.cpp
index 1f7713fbb..38acb4c45 100644
--- a/applications/tools/codec_eval/src/main.cpp
+++ b/applications/tools/codec_eval/src/main.cpp
@@ -87,7 +87,6 @@ static void run(ftl::Configurable *root) {
ftl::codecs::Packet pkt;
pkt.codec = codec_t::HEVC;
pkt.bitrate = 255;
- pkt.definition = definition_t::Any;
pkt.flags = ftl::codecs::kFlagFloat | ftl::codecs::kFlagMappedDepth;
pkt.frame_count = 1;
@@ -154,7 +153,6 @@ static void run(ftl::Configurable *root) {
ftl::codecs::Packet pkt;
pkt.codec = codec_t::HEVC;
pkt.bitrate = 255;
- pkt.definition = definition_t::Any;
pkt.flags = ftl::codecs::kFlagFloat | ftl::codecs::kFlagMappedDepth;
pkt.frame_count = 1;
diff --git a/applications/tools/middlebury_gen/src/main.cpp b/applications/tools/middlebury_gen/src/main.cpp
index 043db7d47..04c040d36 100644
--- a/applications/tools/middlebury_gen/src/main.cpp
+++ b/applications/tools/middlebury_gen/src/main.cpp
@@ -297,7 +297,6 @@ int main(int argc, char **argv) {
spkt.streamID = 0;
spkt.version = 4;
pkt.codec = codec_t::Any;
- pkt.definition = definition_t::Any;
pkt.bitrate = 0;
pkt.flags = 0;
pkt.frame_count = 1;
@@ -309,7 +308,6 @@ int main(int argc, char **argv) {
out->post(spkt, pkt);
pkt.codec = codec_t::Any;
- pkt.definition = definition_t::Any;
spkt.channel = Channel::Colour2;
if (!encoder.encode(frame.get<cv::cuda::GpuMat>(Channel::Colour2), pkt)) {
LOG(ERROR) << "Encode failed for colour2";
@@ -319,7 +317,6 @@ int main(int argc, char **argv) {
spkt.channel = Channel::GroundTruth;
pkt.flags = ftl::codecs::kFlagFloat;
pkt.codec = codec_t::Any;
- pkt.definition = definition_t::Any;
if (!encoder.encode(frame.get<cv::cuda::GpuMat>(Channel::Depth), pkt)) {
LOG(ERROR) << "Encode failed for depth";
}
diff --git a/components/codecs/src/nvidia_encoder.cpp b/components/codecs/src/nvidia_encoder.cpp
index 3aaad2e7c..65fcc88cb 100644
--- a/components/codecs/src/nvidia_encoder.cpp
+++ b/components/codecs/src/nvidia_encoder.cpp
@@ -149,19 +149,11 @@ static bool validate(const cv::cuda::GpuMat &in, ftl::codecs::Packet &pkt) {
}
if (pkt.frame_count == 0) {
- //pkt.definition = definition_t::Invalid;
return false;
}
- /*auto [tx,ty] = ftl::codecs::chooseTileConfig(pkt.frame_count);
- pkt.definition = (pkt.definition == definition_t::Any) ? ftl::codecs::findDefinition(in.cols/tx, in.rows/ty) : pkt.definition;
- if (pkt.definition == definition_t::Invalid || pkt.definition == definition_t::Any) {
- LOG(ERROR) << "Could not find appropriate definition";
- return false;
- }*/
-
- auto width = in.cols; //ftl::codecs::getWidth(pkt.definition)*tx;
- auto height = in.rows; //ftl::codecs::getHeight(pkt.definition)*ty;
+ auto width = in.cols;
+ auto height = in.rows;
if (in.empty()) {
LOG(WARNING) << "No data";
@@ -174,13 +166,6 @@ static bool validate(const cv::cuda::GpuMat &in, ftl::codecs::Packet &pkt) {
return false;
}
- /*if (width != in.cols || height != in.rows) {
- // TODO: Resize if lower definition requested...
- LOG(ERROR) << "Input size does not match expected: " << in.cols << " != " << width;
- pkt.definition = definition_t::Invalid;
- return false;
- }*/
-
return true;
}
diff --git a/components/codecs/src/opencv_decoder.cpp b/components/codecs/src/opencv_decoder.cpp
index 981bac10e..13f47f19b 100644
--- a/components/codecs/src/opencv_decoder.cpp
+++ b/components/codecs/src/opencv_decoder.cpp
@@ -19,8 +19,7 @@ bool OpenCVDecoder::accepts(const ftl::codecs::Packet &pkt) {
return (pkt.codec == codec_t::JPG || pkt.codec == codec_t::PNG);
}
-bool OpenCVDecoder::decode(const ftl::codecs::Packet &pkt, cv::cuda::GpuMat &out) {
- //CHECK(cv::Size(ftl::codecs::getWidth(pkt.definition), ftl::codecs::getHeight(pkt.definition)) == out.size());
+bool OpenCVDecoder::decode(const ftl::codecs::Packet &pkt, cv::cuda::GpuMat &out) {
int chunk_dim = 1; //std::sqrt(pkt.frame_count);
int chunk_width = out.cols / chunk_dim;
int chunk_height = out.rows / chunk_dim;
diff --git a/components/codecs/src/opencv_encoder.cpp b/components/codecs/src/opencv_encoder.cpp
index 75f1a0553..aed7fb33f 100644
--- a/components/codecs/src/opencv_encoder.cpp
+++ b/components/codecs/src/opencv_encoder.cpp
@@ -38,30 +38,12 @@ bool OpenCVEncoder::encode(const cv::cuda::GpuMat &in, ftl::codecs::Packet &pkt)
return false;
}
- auto [tx,ty] = ftl::codecs::chooseTileConfig(pkt.frame_count);
- pkt.definition = (pkt.definition == definition_t::Any) ? ftl::codecs::findDefinition(in.cols/tx, in.rows/ty) : pkt.definition;
- if (pkt.definition == definition_t::Invalid || pkt.definition == definition_t::Any) {
- LOG(ERROR) << "Could not find appropriate definition";
- return false;
- }
-
- // Ensure definition does not exceed max
- current_definition_ = pkt.definition; //((int)pkt.definition < (int)max_definition) ? max_definition : pkt.definition;
-
in.download(tmp_);
if (!is_colour && in.type() == CV_32F) {
tmp_.convertTo(tmp_, CV_16U, 1000.0f);
}
- int width = ftl::codecs::getWidth(current_definition_);
- int height = ftl::codecs::getHeight(current_definition_);
-
- if (tx*width != in.cols || ty*height != in.rows) {
- LOG(ERROR) << "Input does not match requested definition";
- return false;
- }
-
//for (int i=0; i<chunk_count_; ++i) {
// Add chunk job to thread pool
//ftl::pool.push([this,i,cb,is_colour,bitrate](int id) {
diff --git a/components/streams/src/sender.cpp b/components/streams/src/sender.cpp
index 8667adb5f..aff7cd9a1 100644
--- a/components/streams/src/sender.cpp
+++ b/components/streams/src/sender.cpp
@@ -145,7 +145,7 @@ static void mergeNALUnits(const std::list<ftl::codecs::Packet> &pkts, ftl::codec
const auto &first = pkts.front();
pkt.codec = first.codec;
- pkt.definition = first.definition;
+ //pkt.definition = first.definition;
pkt.frame_count = first.frame_count;
pkt.bitrate = first.bitrate;
pkt.flags = first.flags | ftl::codecs::kFlagMultiple; // means merged packets
@@ -185,7 +185,6 @@ void Sender::post(ftl::rgbd::FrameSet &fs) {
ftl::codecs::Packet pkt;
pkt.codec = ftl::codecs::codec_t::MSGPACK;
- pkt.definition = ftl::codecs::definition_t::Any;
pkt.frame_count = 1;
pkt.flags = 0;
pkt.bitrate = 0;
@@ -220,7 +219,6 @@ void Sender::post(ftl::rgbd::FrameSet &fs) {
ftl::codecs::Packet pkt;
pkt.codec = ftl::codecs::codec_t::MSGPACK;
- pkt.definition = ftl::codecs::definition_t::Any;
pkt.frame_count = 1;
pkt.flags = 0;
pkt.bitrate = 0;
@@ -276,7 +274,6 @@ void Sender::post(ftl::rgbd::FrameSet &fs) {
Packet pkt;
pkt.codec = codec_t::Any;
- pkt.definition = definition_t::Any;
pkt.frame_count = 1;
pkt.bitrate = 0;
stream_->post(spkt, pkt);
@@ -357,7 +354,6 @@ void Sender::_encodeChannel(ftl::rgbd::FrameSet &fs, Channel c, bool reset) {
ftl::codecs::Packet pkt;
pkt.frame_count = count;
pkt.codec = codec;
- pkt.definition = definition_t::Any;
pkt.bitrate = (!lossless && ftl::codecs::isFloatChannel(cc)) ? max_bitrate : max_bitrate/2;
pkt.flags = 0;
diff --git a/components/streams/test/receiver_unit.cpp b/components/streams/test/receiver_unit.cpp
index 7ff3df42d..0ed51f850 100644
--- a/components/streams/test/receiver_unit.cpp
+++ b/components/streams/test/receiver_unit.cpp
@@ -70,7 +70,6 @@ TEST_CASE( "Receiver generating onFrameSet" ) {
ftl::codecs::Packet pkt;
pkt.codec = codec_t::Any;
pkt.bitrate = 255;
- pkt.definition = definition_t::Any;
pkt.flags = 0;
pkt.frame_count = 1;
@@ -269,7 +268,6 @@ TEST_CASE( "Receiver sync bugs" ) {
ftl::codecs::Packet pkt;
pkt.codec = codec_t::Any;
pkt.bitrate = 255;
- pkt.definition = definition_t::Any;
pkt.flags = 0;
pkt.frame_count = 1;
@@ -354,7 +352,6 @@ TEST_CASE( "Receiver non zero buffer" ) {
ftl::codecs::Packet pkt;
pkt.codec = codec_t::Any;
pkt.bitrate = 255;
- pkt.definition = definition_t::Any;
pkt.flags = 0;
pkt.frame_count = 1;
--
GitLab