Fix rgb888 to rgb565 conversion (#7)

* Fix rgb888 to rgb565 conversion Old variants of LCD swapped R and B channels, so the corresponding hack was added to the DSP modules. Now LCD display works correctly, so this hack is not needed anymore. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com> * Update binaries Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>
trikset · Jun 13, 2022 · 40426d9 · 40426d9
1 parent 214607d
commit 40426d9
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 10 deletions.
diff --git a/trik/ov7670/edge_line_sensor/dsp_server/bin/dsp_server.xe674 b/trik/ov7670/edge_line_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/ov7670/edge_line_sensor/include/internal/cv_ball_detector_seqpass.hpp b/trik/ov7670/edge_line_sensor/include/internal/cv_ball_detector_seqpass.hpp
@@ -91,7 +91,7 @@ class BallDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422P, TRIK_VIDTRANSCODE_
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/ov7670/jpeg_encoder/dsp_server/bin/dsp_server.xe674 b/trik/ov7670/jpeg_encoder/dsp_server/bin/dsp_server.xe674
diff --git a/trik/ov7670/line_sensor/dsp_server/bin/dsp_server.xe674 b/trik/ov7670/line_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/ov7670/line_sensor/include/internal/cv_line_detector_seqpass.hpp b/trik/ov7670/line_sensor/include/internal/cv_line_detector_seqpass.hpp
@@ -54,7 +54,7 @@ class LineDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422P, TRIK_VIDTRANSCODE_
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/ov7670/motion_sensor/dsp_server/bin/dsp_server.xe674 b/trik/ov7670/motion_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/ov7670/motion_sensor/include/internal/cv_motion_detector_seqpass.hpp b/trik/ov7670/motion_sensor/include/internal/cv_motion_detector_seqpass.hpp
@@ -96,7 +96,7 @@ class MotionDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422P, TRIK_VIDTRANSCOD
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/ov7670/mxn_sensor/dsp_server/bin/dsp_server.xe674 b/trik/ov7670/mxn_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/ov7670/mxn_sensor/include/internal/cv_ball_detector_seqpass.hpp b/trik/ov7670/mxn_sensor/include/internal/cv_ball_detector_seqpass.hpp
@@ -67,7 +67,7 @@ class BallDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422P, TRIK_VIDTRANSCODE_
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/ov7670/object_sensor/dsp_server/bin/dsp_server.xe674 b/trik/ov7670/object_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/ov7670/object_sensor/include/internal/cv_ball_detector_seqpass.hpp b/trik/ov7670/object_sensor/include/internal/cv_ball_detector_seqpass.hpp
@@ -74,7 +74,7 @@ class BallDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422P, TRIK_VIDTRANSCODE_
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/webcam/edge_line_sensor/dsp_server/bin/dsp_server.xe674 b/trik/webcam/edge_line_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/webcam/edge_line_sensor/include/internal/cv_ball_detector_seqpass.hpp b/trik/webcam/edge_line_sensor/include/internal/cv_ball_detector_seqpass.hpp
@@ -92,7 +92,7 @@ class BallDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422, TRIK_VIDTRANSCODE_C
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/webcam/jpeg_encoder/dsp_server/bin/dsp_server.xe674 b/trik/webcam/jpeg_encoder/dsp_server/bin/dsp_server.xe674
diff --git a/trik/webcam/line_sensor/dsp_server/bin/dsp_server.xe674 b/trik/webcam/line_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/webcam/line_sensor/include/internal/cv_line_detector_seqpass.hpp b/trik/webcam/line_sensor/include/internal/cv_line_detector_seqpass.hpp
@@ -55,7 +55,7 @@ class LineDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422, TRIK_VIDTRANSCODE_C
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/webcam/motion_sensor/dsp_server/bin/dsp_server.xe674 b/trik/webcam/motion_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/webcam/motion_sensor/include/internal/cv_motion_detector_seqpass.hpp b/trik/webcam/motion_sensor/include/internal/cv_motion_detector_seqpass.hpp
@@ -96,7 +96,7 @@ class MotionDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422, TRIK_VIDTRANSCODE
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/webcam/mxn_sensor/dsp_server/bin/dsp_server.xe674 b/trik/webcam/mxn_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/webcam/mxn_sensor/include/internal/cv_ball_detector_seqpass.hpp b/trik/webcam/mxn_sensor/include/internal/cv_ball_detector_seqpass.hpp
@@ -67,7 +67,7 @@ class BallDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422, TRIK_VIDTRANSCODE_C
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,

diff --git a/trik/webcam/object_sensor/dsp_server/bin/dsp_server.xe674 b/trik/webcam/object_sensor/dsp_server/bin/dsp_server.xe674
diff --git a/trik/webcam/object_sensor/include/internal/cv_ball_detector_seqpass.hpp b/trik/webcam/object_sensor/include/internal/cv_ball_detector_seqpass.hpp
@@ -74,7 +74,7 @@ class BallDetector<TRIK_VIDTRANSCODE_CV_VIDEO_FORMAT_YUV422, TRIK_VIDTRANSCODE_C
     static void __attribute__((always_inline)) writeOutputPixel(uint16_t* restrict _rgb565ptr,
                                                                 const uint32_t _rgb888)
     {
-      *_rgb565ptr = ((_rgb888>>19)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888<<8)&0xf800);
+      *_rgb565ptr = ((_rgb888>>3)&0x001f) | ((_rgb888>>5)&0x07e0) | ((_rgb888>>8)&0xf800);
     }
 
     void __attribute__((always_inline)) drawOutputPixelBound(const int32_t _srcCol,