compiles for sigmastar6e

henkwiedig · Aug 10, 2024 · 6db0ef4 · 6db0ef4
1 parent e484d56
commit 6db0ef4
Show file tree

Hide file tree

Showing 11 changed files with 326 additions and 155 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,11 @@
         "string_view": "c",
         "msp_displayport.h": "c",
         "msp.h": "c",
-        "graphics.h": "c"
+        "graphics.h": "c",
+        "thread": "c",
+        "mi_rgn.h": "c",
+        "mi_common.h": "c",
+        "bitmap.h": "c",
+        "random": "c"
     }
 }
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ LDLIBS=-levent_core
 
 
 #SRCS := lib/schrift.c compat.c bitmap.c net.c region.c text.c main.c
-SRCS := mavfwd.c
+SRCS := mavfwd.c bmp/bitmap.c bmp/region.c osd/net/network.c osd/msp/msp.c
 #BUILD = $(CC) $(SRCS) -I $(SDK)/include -L $(DRV) $(LIB) -Os -s -o $(or $(TARGET),$@)
 
 #BUILD = $(CC) $(SRCS) -I $(SDK)/include -L $(DRV) $(LIB) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -o $(or $(TARGET),$@)
@@ -18,28 +18,28 @@ clean:
 
 
 osd-goke:
-	$(eval SDK = ../sdk/gk7205v300)
+	$(eval SDK = ./sdk/gk7205v300)
 	$(eval LIB = -ldnvqe -lgk_api -lhi_mpi -lsecurec -lupvqe -lvoice_engine)
 	$(BUILD)
 
 osd-hisi:
-	$(eval SDK = ../sdk/hi3516ev300)
-	$(eval LIB = -ldnvqe -lmpi -lsecurec -lupvqe -lVoiceEngine)
+	$(eval SDK = ./sdk/hi3516ev300)
+	$(eval LIB = -D__GOKE__ -ldnvqe -lmpi -lsecurec -lupvqe -lVoiceEngine)
 	$(BUILD)
 
 osd-star6b0:
-	$(eval SDK = ../sdk/infinity6)
+	$(eval SDK = ./sdk/infinity6)
 	$(eval LIB = -D__SIGMASTAR__ -D__INFINITY6__ -D__INFINITY6B0__ -lcam_os_wrapper -lm -lmi_rgn -lmi_sys)
 	$(BUILD)
 
 osd-star6e:
-	$(eval SDK = ../sdk/infinity6)
+	$(eval SDK = ./sdk/infinity6)
 	$(eval LIB = -D__SIGMASTAR__ -D__INFINITY6__ -D__INFINITY6E__ -lcam_os_wrapper -lm -lmi_rgn -lmi_sys)
 	$(BUILD)
 
 
 osd-x86:
-	$(eval SDK = .)
+	$(eval SDK = ./sdk/gk7205v300)
 	$(eval CFLAGS += -D_x86)
 	$(eval LIB = -lcsfml-graphics -lcsfml-window -lcsfml-system)
 	$(eval TARGET = msposd)

diff --git a/bmp/bitmap.c b/bmp/bitmap.c
@@ -1,5 +1,4 @@
 #include "bitmap.h"
-#include "common.h"
 
 OSD_COMP_INFO s_OSDCompInfo[OSD_COLOR_FMT_BUTT] = {
     {0, 4, 4, 4}, /*RGB444*/
@@ -564,114 +563,4 @@ int CreateSurfaceByCanvas(const char *pszFileName, OSD_SURFACE_S *pstSurface, un
     pstSurface->u16Stride = u32Stride;
 
     return 0;
-}
-
-
-int prepare_bitmap(const char *filename, BITMAP *bitmap, int bFil, unsigned int u16FilColor, int enPixelFmt)
-{
-    OSD_SURFACE_S Surface;
-    OSD_BITMAPFILEHEADER bmpFileHeader;
-    OSD_BITMAPINFO bmpInfo;
-    int s32BytesPerPix = 2;
-    unsigned char *pu8Data;
-    int R_Value;
-    int G_Value;
-    int B_Value;
-    int Gr_Value;
-    unsigned char Value_tmp;
-    unsigned char Value;
-    int s32Width;
-
-    if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0)
-    {
-        fprintf(stderr, "GetBmpInfo err!\n");
-        return -1;
-    }
-
-    switch (enPixelFmt)
-    {
-    case PIXEL_FORMAT_4444:
-        Surface.enColorFmt = OSD_COLOR_FMT_RGB4444;
-        break;
-    case PIXEL_FORMAT_1555:
-    case PIXEL_FORMAT_2BPP:
-        Surface.enColorFmt = OSD_COLOR_FMT_RGB1555;
-        break;
-    case PIXEL_FORMAT_8888:
-        Surface.enColorFmt = OSD_COLOR_FMT_RGB8888;
-        s32BytesPerPix = 4;
-        break;
-    default:
-        fprintf(stderr, "enPixelFormat err %d \n", enPixelFmt);
-        return -1;
-    }
-
-    if (!(bitmap->pData = malloc(s32BytesPerPix * bmpInfo.bmiHeader.biWidth * bmpInfo.bmiHeader.biHeight)))
-    {
-        fputs("malloc osd memory err!\n", stderr);
-        return -1;
-    }
-
-    CreateSurfaceByBitMap(filename, &Surface, (unsigned char *)(bitmap->pData));
-
-    bitmap->u32Width = Surface.u16Width;
-    bitmap->u32Height = Surface.u16Height;
-    bitmap->enPixelFormat = enPixelFmt;
-
-    int i, j, k;
-    unsigned char *pu8Temp;
-
-
-    long ccc=0;
-    if (enPixelFmt != PIXEL_FORMAT_2BPP)
-    {
-        unsigned short *pu16Temp;
-        pu16Temp = (unsigned short *)bitmap->pData;
-        if (bFil){             
-            for (i = 0; i < bitmap->u32Height; i++)            
-                for (j = 0; j < bitmap->u32Width; j++){
-                    if (u16FilColor == *pu16Temp){
-                        *pu16Temp &= 0x7FFF;                        
-                    }
-                    pu16Temp++;
-                }
-            }        
-        printf("enPixelFmt:%d\n",ccc);
-    }
-    else
-    {
-        unsigned short *pu16Temp;
-
-        pu16Temp = (unsigned short *)bitmap->pData;
-        pu8Temp = (unsigned char *)pu8Data;
-
-        for (i = 0; i < bitmap->u32Height; i++)
-        {
-            for (j = 0; j < bitmap->u32Width / 4; j++)
-            {
-                Value = 0;
-
-                for (k = j; k < j + 4; k++)
-                {
-                    B_Value = *pu16Temp & 0x001F;
-                    G_Value = *pu16Temp >> 5 & 0x001F;
-                    R_Value = *pu16Temp >> 10 & 0x001F;
-                    pu16Temp++;
-
-                    Gr_Value = (R_Value * 299 + G_Value * 587 + B_Value * 144 + 500) / 1000;
-                    if (Gr_Value > 16)
-                        Value_tmp = 0x01;
-                    else
-                        Value_tmp = 0x00;
-                    Value = (Value << 2) + Value_tmp;
-                }
-                *pu8Temp = Value;
-                pu8Temp++;
-            }
-        }
-        free(bitmap->pData);
-        bitmap->pData = pu8Data;
-    }
-
-    return 0;
-}
+}
diff --git a/bmp/bitmap.h b/bmp/bitmap.h
@@ -8,6 +8,7 @@ extern "C"
 #endif
 #endif
 
+#include "common.h"
 
     typedef enum osd_color_fmt
     {

diff --git a/bmp/common.h b/bmp/common.h
@@ -1,8 +1,6 @@
 #ifndef COMMON_H_
 #define COMMON_H_
 
-#define __SIGMASTAR__
-
 #include <stdio.h>  // FILE, fseek, (f|p)open, (as|f)printf
 #include <stdlib.h> // abort, atoi, exit, free, malloc
 #include <string.h> // memcpy, memset, strcmp, strlen
@@ -31,26 +29,37 @@ extern "C"
 
 #include "config.h"
 
-
- typedef enum
-{
-    E_MI_RGN_PIXEL_FORMAT_ARGB1555 = 0,
-    E_MI_RGN_PIXEL_FORMAT_ARGB4444,
-    E_MI_RGN_PIXEL_FORMAT_I2,
-    E_MI_RGN_PIXEL_FORMAT_I4,
-    E_MI_RGN_PIXEL_FORMAT_I8,
-    E_MI_RGN_PIXEL_FORMAT_RGB565,
-    E_MI_RGN_PIXEL_FORMAT_ARGB8888,
-    E_MI_RGN_PIXEL_FORMAT_MAX
-} MI_RGN_PixelFormat_e;
+#ifdef __SIGMASTAR__
+#include "mi_common.h"
+#include "mi_rgn.h"
 
 #define IO_BASE 0x1F000000
 #define IO_SIZE 0x400000
 #define PIXEL_FORMAT_4444 E_MI_RGN_PIXEL_FORMAT_ARGB4444
 #define PIXEL_FORMAT_1555 E_MI_RGN_PIXEL_FORMAT_ARGB1555
 #define PIXEL_FORMAT_2BPP E_MI_RGN_PIXEL_FORMAT_I2
 #define PIXEL_FORMAT_8888 E_MI_RGN_PIXEL_FORMAT_ARGB8888
-
+#elif defined(__INGENIC__)
+#include "imp_system.h"
+#include "imp_osd.h"
+#include "imp_isp.h"
+
+#define PIXEL_FORMAT_4444 0
+#define PIXEL_FORMAT_1555 PIX_FMT_RGB555LE
+#define PIXEL_FORMAT_2BPP PIX_FMT_0RGB
+#define PIXEL_FORMAT_8888 PIX_FMT_ARGB
+#else
+#include "hi_common.h"
+#include "hi_math.h"
+#include "mpi_region.h"
+
+#define IO_BASE 0x12000000
+#define IO_SIZE 0x100000
+#define PIXEL_FORMAT_4444 PIXEL_FORMAT_ARGB_4444
+#define PIXEL_FORMAT_1555 PIXEL_FORMAT_ARGB_1555
+#define PIXEL_FORMAT_2BPP PIXEL_FORMAT_ARGB_2BPP
+#define PIXEL_FORMAT_8888 PIXEL_FORMAT_ARGB_8888
+#endif
 
 #ifndef DIV_UP
 #define DIV_UP(x, a) (((x) + ((a)-1)) / a)
@@ -93,7 +102,7 @@ extern "C"
         short width, height;
     } RECT;
 
-
+    int sysinfo(struct sysinfo *);
 
     static void fatal(const char *message)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ extern "C" @@
     #endif
     #endif
+    #include "common.h"
         typedef enum osd_color_fmt
         {
@@ Expand Down @@