Merge pull request #292 from ros-drivers/288-fix-uyvy2rgb-size

288 fix uyvy2rgb size
ros-drivers · Nov 13, 2023 · c052be0 · c052be0
2 parents aa11493 + 140b6d6
commit c052be0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/include/usb_cam/formats/pixel_format_base.hpp b/include/usb_cam/formats/pixel_format_base.hpp
@@ -79,6 +79,9 @@ class pixel_format_base
   /// @return
   inline uint8_t bit_depth() {return m_bit_depth;}
 
+  /// @brief Number of bytes per channel
+  inline uint8_t byte_depth() {return m_bit_depth / 8;}
+
   /// @brief True if the current pixel format requires a call to the `convert` method
   /// Used in the usb_cam library logic to determine if a plain `memcopy` call can be
   /// used instead of a call to the `convert` method of this class.

diff --git a/include/usb_cam/formats/uyvy.hpp b/include/usb_cam/formats/uyvy.hpp
@@ -64,7 +64,7 @@ class UYVY2RGB : public pixel_format_base
       "uyvy2rgb",
       V4L2_PIX_FMT_UYVY,
       usb_cam::constants::RGB8,
-      2,
+      3,
       8,
       true),
     m_number_of_pixels(number_of_pixels)

diff --git a/include/usb_cam/usb_cam.hpp b/include/usb_cam/usb_cam.hpp
@@ -117,12 +117,12 @@ typedef struct
   }
   size_t set_bytes_per_line()
   {
-    bytes_per_line = width * pixel_format->channels();
+    bytes_per_line = width * pixel_format->byte_depth() * pixel_format->channels();
     return bytes_per_line;
   }
   size_t set_size_in_bytes()
   {
-    size_in_bytes = width * height * pixel_format->channels();
+    size_in_bytes = height * bytes_per_line;
     return size_in_bytes;
   }