Merge pull request #127 from strykeforce/portrait-aspect

Display stream correctly for portrait orientation

Author: jhh

ansible/roles/deadeye/tasks/deadeyed.yaml

@@ -21,7 +21,7 @@
       - -GNinja
       - -DCMAKE_BUILD_TYPE={{ build_type }}
       - -DCMAKE_INSTALL_PREFIX=/opt/deadeye
-      - >
+      - >-
         -DCMAKE_CXX_FLAGS_RELEASE=-Ofast
         -march=native -mtune=native -flto -ffat-lto-objects
         -DNDEBUG

daemon/src/capture/video_test.cpp

@@ -17,13 +17,17 @@ VideoTest::VideoTest(const CaptureConfig& config) {
   auto background_color = j.value("backgroundColor", "000000");
   auto speed = j.value("speed", 0);
 
+  std::string_view flip = config.width == 720 && config.height == 1280
+                              ? "videoflip method=clockwise !"
+                              : "";
+
   auto pipeline = fmt::format(
       "videotestsrc pattern={} foreground-color=0x{} background-color=0x{} "
       "horizontal-speed={} ! video/x-raw, width={}, height={}, "
-      "framerate={}/1 ! videoconvert ! video/x-raw, format=(string)BGR ! "
+      "framerate={}/1 ! {}  videoconvert ! video/x-raw, format=(string)BGR ! "
       "appsink",
       pattern, foreground_color, background_color, speed, config.width,
-      config.height, config.frame_rate);
+      config.height, config.frame_rate, flip);
 
   cap_.open(pipeline, cv::CAP_GSTREAMER);
   spdlog::debug("VideoTest: opened cap_: {}", pipeline);

daemon/src/hardware/led_drive.cpp

@@ -7,6 +7,7 @@ using ::deadeye::LedDrive;
 #ifdef __aarch64__
 #include <cassert>
 using ::gpiod::chip;
+using ::gpiod::line_request;
 
 LedDrive::LedDrive(int inum) {
   assert(inum >= 0 && inum < 5);

daemon/src/pipeline/streamer.cpp

@@ -34,17 +34,24 @@ Streamer::Streamer(const Pipeline* pipeline, const cv::Size size)
   int hr = h / r;
   spdlog::debug("Streamer: capture output: {}x{} ({}:{})", w, h, wr, hr);
 
+  tb_border_ = 0;
+  lr_border_ = 0;
+  frame_tb_border_ = 2;
+  frame_lr_border_ = 2;
   if (wr == 4 && hr == 3) {  // 4:3
-    border_ = 0;
+    // no change
   } else if (wr == 16 && hr == 9) {
-    border_ = h / 6;
+    tb_border_ = h / 6;
+  } else if (wr == 9 && hr == 16) {
+    lr_border_ = w * 2 / 3;
+    frame_tb_border_ = 1;
   } else {
     spdlog::error("Streamer: invalid aspect ratio: {}:{}", wr, hr);
-    border_ = 0;
+    tb_border_ = 0;
   }
 
-  spdlog::debug("Streamer border: {} {}", border_,
-                resize_ ? "[output resized]" : "");
+  spdlog::debug("Streamer tb_border: {}, lr_border_ {} {}", tb_border_,
+                lr_border_, resize_ ? "[output resized]" : "");
 
   server_.SetSource(source_);
   spdlog::info("{} streaming on port {}", *pipeline_, server_.GetPort());
@@ -61,6 +68,9 @@ void Streamer::Process(const cv::Mat& frame, const TargetData* target) {
       if (config_.contour != Contour::none) {
         output_ = cv::Mat::zeros(frame.size(), CV_8UC3);
       }
+      cv::copyMakeBorder(output_, output_, frame_tb_border_, frame_tb_border_,
+                         frame_lr_border_, frame_lr_border_,
+                         cv::BORDER_CONSTANT, cv::Scalar(255, 255, 255));
       break;
     case View::original:
       if (config_.contour != Contour::none) {
@@ -72,6 +82,9 @@ void Streamer::Process(const cv::Mat& frame, const TargetData* target) {
       break;
     case View::mask:
       cv::cvtColor(pipeline_->GetMask(), output_, cv::COLOR_GRAY2BGR);
+      cv::copyMakeBorder(output_, output_, frame_tb_border_, frame_tb_border_,
+                         frame_lr_border_, frame_lr_border_,
+                         cv::BORDER_CONSTANT, cv::Scalar(255, 255, 255));
       break;
   }
 
@@ -90,8 +103,12 @@ void Streamer::Process(const cv::Mat& frame, const TargetData* target) {
       break;
   }
 
-  if (border_ != 0)
-    cv::copyMakeBorder(output_, output_, border_, border_, 0, 0,
+  if (tb_border_ != 0)
+    cv::copyMakeBorder(output_, output_, tb_border_, tb_border_, 0, 0,
+                       cv::BORDER_CONSTANT, cv::Scalar(0, 0, 0));
+
+  if (lr_border_ != 0)
+    cv::copyMakeBorder(output_, output_, 0, 0, lr_border_, lr_border_,
                        cv::BORDER_CONSTANT, cv::Scalar(0, 0, 0));
 
   if (resize_) cv::resize(output_, output_, kStreamSize, 0, 0, cv::INTER_AREA);

daemon/src/pipeline/streamer.h

@@ -24,7 +24,10 @@ class Streamer {
   const Pipeline* pipeline_;
   cv::Mat output_;
   StreamConfig config_;
-  int border_;
+  int tb_border_;
+  int lr_border_;
+  int frame_tb_border_;
+  int frame_lr_border_;
   bool resize_;
   cs::MjpegServer server_;
   cs::CvSource source_;