From dcdd9f53f02c404d2e09ad4807937321ffd9c913 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 5 Jun 2020 20:42:50 +0300
Subject: [PATCH] Fix remaining unit tests
---
components/streams/test/receiver_unit.cpp | 9 +++++----
components/streams/test/sender_unit.cpp | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/components/streams/test/receiver_unit.cpp b/components/streams/test/receiver_unit.cpp
index 7b0e7f215..1a00ad4ee 100644
--- a/components/streams/test/receiver_unit.cpp
+++ b/components/streams/test/receiver_unit.cpp
@@ -174,12 +174,12 @@ TEST_CASE( "Receiver generating onFrameSet" ) {
}
SECTION("a tiled lossy depth frame") {
- cv::cuda::GpuMat m(cv::Size(2560,720), CV_8UC4, cv::Scalar(0));
+ cv::cuda::GpuMat m(cv::Size(2560,720), CV_32F, cv::Scalar(0));
ftl::stream::injectCalibration(&stream, dummy, 0, 0, 1);
spkt.channel = Channel::Depth;
pkt.frame_count = 2;
- pkt.flags = ftl::codecs::kFlagFloat | ftl::codecs::kFlagMappedDepth;
+ pkt.flags = 0;
bool r = encoder.encode(m, pkt);
REQUIRE( r );
@@ -208,12 +208,13 @@ TEST_CASE( "Receiver generating onFrameSet" ) {
}
SECTION("a tiled lossless depth frame") {
- cv::cuda::GpuMat m(cv::Size(2560,720), CV_16U, cv::Scalar(0));
+ cv::cuda::GpuMat m(cv::Size(2560,720), CV_32F, cv::Scalar(0));
ftl::stream::injectCalibration(&stream, dummy, 0, 0, 1);
spkt.channel = Channel::Depth;
pkt.frame_count = 2;
- pkt.flags = ftl::codecs::kFlagFloat;
+ pkt.flags = 0;
+ pkt.codec = codec_t::HEVC_LOSSLESS;
bool r = encoder.encode(m, pkt);
REQUIRE( r );
diff --git a/components/streams/test/sender_unit.cpp b/components/streams/test/sender_unit.cpp
index d5a087328..1359eb4d6 100644
--- a/components/streams/test/sender_unit.cpp
+++ b/components/streams/test/sender_unit.cpp
@@ -201,7 +201,7 @@ TEST_CASE( "Sender::post() video frames" ) {
fs.frames[1].create<cv::cuda::GpuMat>(Channel::Depth).create(cv::Size(1280,720), CV_32F);
fs.frames[1].get<cv::cuda::GpuMat>(Channel::Depth).setTo(cv::Scalar(0.0f));
- sender->set("lossless", true);
+ sender->set("codec", (int)codec_t::HEVC_LOSSLESS);
sender->post(fs);
REQUIRE( count == 1 );
--
GitLab