Correcting the pixel formats and getting OSDs on Rockchip closer to reality

Author: wberube

src/hal/plus/rk_common.h

@@ -40,7 +40,8 @@ typedef enum {
 } rk_common_mirr;
 
 typedef enum {
-  RK_PIXFMT_YUV420SP, RK_PIXFMT_YUV = RK_PIXFMT_YUV420SP,
+  RK_PIXFMT_YUV = 0x0,
+  RK_PIXFMT_YUV420SP = RK_PIXFMT_YUV, 
   RK_PIXFMT_YUV420SP_10BIT,
   RK_PIXFMT_YUV422SP,
   RK_PIXFMT_YUV422SP_10BIT,
@@ -60,7 +61,9 @@ typedef enum {
   RK_PIXFMT_YUV422_YVYU,
   RK_PIXFMT_YUV422_VYUY,
   RK_PIXFMT_YUV_END,
-  RK_PIXFMT_RGB565, RK_PIXFMT_RGB = RK_PIXFMT_RGB565,
+
+  RK_PIXFMT_RGB = 0x10000,
+  RK_PIXFMT_RGB565 = RK_PIXFMT_RGB,
   RK_PIXFMT_BGR565,
   RK_PIXFMT_RGB555,
   RK_PIXFMT_BGR555,
@@ -86,8 +89,11 @@ typedef enum {
   RK_PIXFMT_RGBA4444,
   RK_PIXFMT_XBGR8888,
   RK_PIXFMT_RGB_END,
+
   RK_PIXFMT_2BPP,
-  RK_PIXFMT_BAYER_SBGGR_8BPP, RK_PIXFMT_BAYER = RK_PIXFMT_BAYER_SBGGR_8BPP,
+
+  RK_PIXFMT_BAYER = 0x20000,
+  RK_PIXFMT_BAYER_SBGGR_8BPP = RK_PIXFMT_BAYER,
   RK_PIXFMT_BAYER_SGBRG_8BPP,
   RK_PIXFMT_BAYER_SGRBG_8BPP,
   RK_PIXFMT_BAYER_SRGGB_8BPP,

src/hal/plus/rk_hal.c

@@ -348,7 +348,6 @@ int rk_region_create(char handle, hal_rect rect, short opacity)
     region.overlay.pixFmt = RK_PIXFMT_ARGB1555;
     region.overlay.size.width = rect.width;
     region.overlay.size.height = rect.height;
-    region.overlay.canvas = handle + 1;
 
     if (rk_rgn.fnGetRegionConfig(handle, &regionCurr)) {
         HAL_INFO("rk_rgn", "Creating region %d...\n", handle);
@@ -398,7 +397,8 @@ void rk_region_destroy(char handle)
 int rk_region_setbitmap(int handle, hal_bitmap *bitmap)
 {
     rk_rgn_bmp nativeBmp = { .data = bitmap->data, .pixFmt = RK_PIXFMT_ARGB1555,
-        .size.height = bitmap->dim.height, .size.width = bitmap->dim.width };
+        .size.height = bitmap->dim.height,
+        .size.width = bitmap->dim.width };
 
     return rk_rgn.fnSetBitmap(handle, &nativeBmp);
 }

src/hal/plus/rk_rgn.h

@@ -13,7 +13,6 @@ typedef enum {
 
 typedef enum {
     RK_RGN_TYPE_OVERLAY,
-    RK_RGN_TYPE_OVERLAYEX,
     RK_RGN_TYPE_COVER,
     RK_RGN_TYPE_MOSAIC,
     RK_RGN_TYPE_LINE,
@@ -34,20 +33,15 @@ typedef struct {
     unsigned int layer;
     int qpProtOn;
     int absQualOn;
-    int forceIpmbOn;
+    int forceIntraOn;
     int quality;
-    unsigned short colorLut[2];
+    unsigned int colorLut[2];
+    rk_common_dim invColorArea;
+    unsigned int lumThresh;
+    int lumThreshHighOn;
+    int invColorOn;
 } rk_rgn_ovlc;
 
-typedef struct {
-    rk_common_pnt point;
-    unsigned int fgAlpha;
-    unsigned int bgAlpha;
-    // Accepts values from 0-15
-    unsigned int layer;
-    unsigned short colorLut[2];
-} rk_rgn_ovlxc;
-
 typedef struct {
     rk_common_rect rect;
     unsigned int color;
@@ -62,13 +56,21 @@ typedef struct {
     unsigned int layer;
 } rk_rgn_mosc;
 
+typedef struct {
+    unsigned int thick;
+    unsigned int color;
+    rk_common_pnt start;
+    rk_common_pnt end;
+} rk_rgn_linc;
+
 typedef struct {
     int show;
     rk_rgn_type type;
     union {
         rk_rgn_ovlc overlay;
         rk_rgn_covc cover;
         rk_rgn_mosc mosaic;
+        rk_rgn_linc line;
     };
 } rk_rgn_chn;
 
@@ -77,6 +79,7 @@ typedef struct {
     rk_common_dim size;
     unsigned int canvas;
     unsigned int colorLutNum;
+    // Only supported with BGRA8888
     unsigned int colorLut[256];
 } rk_rgn_ovl;
 

src/region.c

@@ -353,10 +353,11 @@ void *region_thread(void) {
                 if (osds[id].updt) {
                     char font[256];
                     char *dirs[] = {
+                        ".",
+                        "/oem/usr/share",
                         "/usr/local/share/fonts",
                         "/usr/share/fonts/truetype",
                         "/usr/share/fonts",
-                        ".",
                         NULL};
                     char **dir = dirs;
                     while (*dir) {