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

Minor changes to streaming code

parent 59335b59
No related branches found
No related tags found
No related merge requests found
Pipeline #9859 passed
...@@ -152,7 +152,7 @@ static void run(const string &file) { ...@@ -152,7 +152,7 @@ static void run(const string &file) {
//LZ4_decompress_safe((char*)d.data(), (char*)depth.data, d.size(), depth.step*depth.rows); //LZ4_decompress_safe((char*)d.data(), (char*)depth.data, d.size(), depth.step*depth.rows);
cv::imdecode(d, cv::IMREAD_UNCHANGED, &depth); cv::imdecode(d, cv::IMREAD_UNCHANGED, &depth);
depth.convertTo(depth, CV_32FC1, 1.0f/256.0f); //, 1.0f/16.0f); //, 1.0f/256.0f); depth.convertTo(depth, CV_32FC1, 1.0f/16.0f);
}); });
while (disp.active()) { while (disp.active()) {
......
...@@ -20,20 +20,13 @@ Streamer::~Streamer() { ...@@ -20,20 +20,13 @@ Streamer::~Streamer() {
} }
//static Mat last;
void Streamer::send(const Mat &rgb, const Mat &depth) { void Streamer::send(const Mat &rgb, const Mat &depth) {
// Compress the rgb as jpeg. // Compress the rgb as jpeg.
vector<unsigned char> rgb_buf; vector<unsigned char> rgb_buf;
cv::imencode(".jpg", rgb, rgb_buf); cv::imencode(".jpg", rgb, rgb_buf);
Mat d2; Mat d2;
depth.convertTo(d2, CV_16UC1, 256); depth.convertTo(d2, CV_16UC1, 16);
//if (last.rows == 0) d2.copyTo(last);
//Mat ddepth;
//ddepth = d2 - last;
vector<unsigned char> d_buf; vector<unsigned char> d_buf;
/*d_buf.resize(d2.step*d2.rows); /*d_buf.resize(d2.step*d2.rows);
...@@ -58,9 +51,7 @@ void Streamer::send(const Mat &rgb, const Mat &depth) { ...@@ -58,9 +51,7 @@ void Streamer::send(const Mat &rgb, const Mat &depth) {
// d_buf.resize(LZ4_compressBound(depth.step*depth.rows)); // d_buf.resize(LZ4_compressBound(depth.step*depth.rows));
// int s = LZ4_compress_default((char*)depth.data, (char*)d_buf.data(), depth.step*depth.rows, d_buf.size()); // int s = LZ4_compress_default((char*)depth.data, (char*)d_buf.data(), depth.step*depth.rows, d_buf.size());
// d_buf.resize(s); // d_buf.resize(s);
//Mat d2;
//depth.convertTo(d2, CV_16UC1, 256);
cv::imencode(".png", d2, d_buf); cv::imencode(".png", d2, d_buf);
LOG(INFO) << "Depth Size = " << ((float)d_buf.size() / (1024.0f*1024.0f)); LOG(INFO) << "Depth Size = " << ((float)d_buf.size() / (1024.0f*1024.0f));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment