Sensor mirror/flip on all SigmaStar platforms, exchaging commands with drivers

Author: wberube

src/hal/star/i6_snr.h

@@ -88,6 +88,8 @@ typedef struct {
     int (*fnGetResolution)(unsigned int sensor, unsigned char index, i6_snr_res *resolution);
     int (*fnGetResolutionCount)(unsigned int sensor, unsigned int *count);
     int (*fnSetResolution)(unsigned int sensor, unsigned char index);
+
+    int (*fnCustomFunction)(unsigned int sensor, unsigned int command, unsigned int size, void *data, int drvOrUsr);
 } i6_snr_impl;
 
 static int i6_snr_load(i6_snr_impl *snr_lib) {
@@ -138,6 +140,10 @@ static int i6_snr_load(i6_snr_impl *snr_lib) {
         hal_symbol_load("i6_snr", snr_lib->handle, "MI_SNR_SetRes")))
         return EXIT_FAILURE;
 
+    if (!(snr_lib->fnCustomFunction = (int(*)(unsigned int sensor, unsigned int command, unsigned int size, void *data, int drvOrUsr))
+        hal_symbol_load("i6_snr", snr_lib->handle, "MI_SNR_CustFunction")))
+        return EXIT_FAILURE;
+
     return EXIT_SUCCESS;
 }
 

src/hal/star/i6c_hal.c

@@ -179,7 +179,7 @@ int i6c_channel_bind(char index, char framerate)
     return EXIT_SUCCESS;
 }
 
-int i6c_channel_create(char index, short width, short height, char mirror, char flip, char jpeg)
+int i6c_channel_create(char index, short width, short height, char jpeg)
 {
     i6c_scl_port port;
     port.crop.x = 0;
@@ -188,8 +188,8 @@ int i6c_channel_create(char index, short width, short height, char mirror, char
     port.crop.height = 0;
     port.output.width = width;
     port.output.height = height;
-    port.mirror = mirror;
-    port.flip = flip;
+    port.mirror = 0;
+    port.flip = 0;
     port.compress = jpeg ? I6C_COMPR_NONE : I6C_COMPR_IFC;
     port.pixFmt = jpeg ? I6C_PIXFMT_YUV422_YUYV : I6C_PIXFMT_YUV420SP;
 
@@ -225,7 +225,7 @@ int i6c_config_load(char *path)
     return i6c_isp.fnLoadChannelConfig(_i6c_isp_dev, _i6c_isp_chn, path, 1234);
 }
 
-int i6c_pipeline_create(char sensor, short width, short height, char framerate)
+int i6c_pipeline_create(char sensor, short width, short height, char mirror, char flip, char framerate)
 {
     int ret;
 
@@ -261,6 +261,9 @@ int i6c_pipeline_create(char sensor, short width, short height, char framerate)
             return EXIT_FAILURE;
     }
 
+    if (ret = i6c_snr.fnSetOrientation(_i6c_snr_index, mirror, flip))
+        return ret;
+
     if (ret = i6c_snr.fnGetPadInfo(_i6c_snr_index, &_i6c_snr_pad))
         return ret;
     if (ret = i6c_snr.fnGetPlaneInfo(_i6c_snr_index, 0, &_i6c_snr_plane))

src/hal/star/i6c_hal.h

@@ -28,13 +28,13 @@ int i6c_audio_init(int samplerate, int gain);
 void *i6c_audio_thread(void);
 
 int i6c_channel_bind(char index, char framerate);
-int i6c_channel_create(char index, short width, short height, char mirror, char flip, char jpeg);
+int i6c_channel_create(char index, short width, short height, char jpeg);
 int i6c_channel_grayscale(char enable);
 int i6c_channel_unbind(char index);
 
 int i6c_config_load(char *path);
 
-int i6c_pipeline_create(char sensor, short width, short height, char framerate);
+int i6c_pipeline_create(char sensor, short width, short height, char mirror, char flip, char framerate);
 void i6c_pipeline_destroy(void);
 
 int i6c_region_create(char handle, hal_rect rect, short opacity);

src/hal/star/i6c_snr.h

@@ -87,6 +87,7 @@ typedef struct {
     int (*fnEnable)(unsigned int sensor);
 
     int (*fnSetFramerate)(unsigned int sensor, unsigned int framerate);
+    int (*fnSetOrientation)(unsigned int sensor, unsigned char mirror, unsigned char flip);
 
     int (*fnGetPadInfo)(unsigned int sensor, i6c_snr_pad *info);
     int (*fnGetPlaneInfo)(unsigned int sensor, unsigned int index, i6c_snr_plane *info);
@@ -96,6 +97,8 @@ typedef struct {
     int (*fnGetResolution)(unsigned int sensor, unsigned char index, i6c_snr_res *resolution);
     int (*fnGetResolutionCount)(unsigned int sensor, unsigned int *count);
     int (*fnSetResolution)(unsigned int sensor, unsigned char index);
+
+    int (*fnCustomFunction)(unsigned int sensor, unsigned int command, unsigned int size, void *data, int drvOrUsr);
 } i6c_snr_impl;
 
 static int i6c_snr_load(i6c_snr_impl *snr_lib) {
@@ -114,6 +117,10 @@ static int i6c_snr_load(i6c_snr_impl *snr_lib) {
         hal_symbol_load("i6c_snr", snr_lib->handle, "MI_SNR_SetFps")))
         return EXIT_FAILURE;
 
+    if (!(snr_lib->fnSetOrientation = (int(*)(unsigned int sensor, unsigned char mirror, unsigned char flip))
+        hal_symbol_load("i6c_snr", snr_lib->handle, "MI_SNR_SetOrien")))
+        return EXIT_FAILURE;
+
     if (!(snr_lib->fnGetPadInfo = (int(*)(unsigned int sensor, i6c_snr_pad *info))
         hal_symbol_load("i6c_snr", snr_lib->handle, "MI_SNR_GetPadInfo")))
         return EXIT_FAILURE;
@@ -142,6 +149,10 @@ static int i6c_snr_load(i6c_snr_impl *snr_lib) {
         hal_symbol_load("i6c_snr", snr_lib->handle, "MI_SNR_SetRes")))
         return EXIT_FAILURE;
 
+   if (!(snr_lib->fnCustomFunction = (int(*)(unsigned int sensor, unsigned int command, unsigned int size, void *data, int drvOrUsr))
+        hal_symbol_load("i6c_snr", snr_lib->handle, "MI_SNR_CustFunction")))
+        return EXIT_FAILURE;
+
     return EXIT_SUCCESS;
 }
 

src/hal/star/m6_hal.c

@@ -172,7 +172,7 @@ int m6_channel_bind(char index, char framerate)
     return EXIT_SUCCESS;
 }
 
-int m6_channel_create(char index, short width, short height, char mirror, char flip, char jpeg)
+int m6_channel_create(char index, short width, short height, char jpeg)
 {
     m6_scl_port port;
     port.crop.x = 0;
@@ -181,8 +181,8 @@ int m6_channel_create(char index, short width, short height, char mirror, char f
     port.crop.height = 0;
     port.output.width = width;
     port.output.height = height;
-    port.mirror = mirror;
-    port.flip = flip;
+    port.mirror = 0;
+    port.flip = 0;
     port.compress = M6_COMPR_NONE;
     port.pixFmt = jpeg ? M6_PIXFMT_YUV422_YUYV : M6_PIXFMT_YUV420SP;
 
@@ -218,7 +218,7 @@ int m6_config_load(char *path)
     return m6_isp.fnLoadChannelConfig(_m6_isp_dev, _m6_isp_chn, path, 1234);
 }
 
-int m6_pipeline_create(char sensor, short width, short height, char framerate)
+int m6_pipeline_create(char sensor, short width, short height, char mirror, char flip, char framerate)
 {
     int ret;
 
@@ -254,6 +254,9 @@ int m6_pipeline_create(char sensor, short width, short height, char framerate)
             return EXIT_FAILURE;
     }
 
+    if (ret = m6_snr.fnSetOrientation(_m6_snr_index, mirror, flip))
+        return ret;
+
     if (ret = m6_snr.fnGetPadInfo(_m6_snr_index, &_m6_snr_pad))
         return ret;
     if (ret = m6_snr.fnGetPlaneInfo(_m6_snr_index, 0, &_m6_snr_plane))

src/hal/star/m6_hal.h

@@ -26,13 +26,13 @@ int m6_audio_init(int samplerate, int gain);
 void *m6_audio_thread(void);
 
 int m6_channel_bind(char index, char framerate);
-int m6_channel_create(char index, short width, short height, char mirror, char flip, char jpeg);
+int m6_channel_create(char index, short width, short height, char jpeg);
 int m6_channel_grayscale(char enable);
 int m6_channel_unbind(char index);
 
 int m6_config_load(char *path);
 
-int m6_pipeline_create(char sensor, short width, short height, char framerate);
+int m6_pipeline_create(char sensor, short width, short height, char mirror, char flip, char framerate);
 void m6_pipeline_destroy(void);
 
 int m6_region_create(char handle, hal_rect rect, short opacity);

src/hal/star/m6_snr.h

@@ -87,6 +87,7 @@ typedef struct {
     int (*fnEnable)(unsigned int sensor);
 
     int (*fnSetFramerate)(unsigned int sensor, unsigned int framerate);
+    int (*fnSetOrientation)(unsigned int sensor, unsigned char mirror, unsigned char flip);
 
     int (*fnGetPadInfo)(unsigned int sensor, m6_snr_pad *info);
     int (*fnGetPlaneInfo)(unsigned int sensor, unsigned int index, m6_snr_plane *info);
@@ -96,6 +97,8 @@ typedef struct {
     int (*fnGetResolution)(unsigned int sensor, unsigned char index, m6_snr_res *resolution);
     int (*fnGetResolutionCount)(unsigned int sensor, unsigned int *count);
     int (*fnSetResolution)(unsigned int sensor, unsigned char index);
+
+    int (*fnCustomFunction)(unsigned int sensor, unsigned int command, unsigned int size, void *data, int drvOrUsr);
 } m6_snr_impl;
 
 static int m6_snr_load(m6_snr_impl *snr_lib) {
@@ -114,6 +117,10 @@ static int m6_snr_load(m6_snr_impl *snr_lib) {
         hal_symbol_load("m6_snr", snr_lib->handle, "MI_SNR_SetFps")))
         return EXIT_FAILURE;
 
+    if (!(snr_lib->fnSetOrientation = (int(*)(unsigned int sensor, unsigned char mirror, unsigned char flip))
+        hal_symbol_load("m6_snr", snr_lib->handle, "MI_SNR_SetOrien")))
+        return EXIT_FAILURE;
+
     if (!(snr_lib->fnGetPadInfo = (int(*)(unsigned int sensor, m6_snr_pad *info))
         hal_symbol_load("m6_snr", snr_lib->handle, "MI_SNR_GetPadInfo")))
         return EXIT_FAILURE;
@@ -142,6 +149,10 @@ static int m6_snr_load(m6_snr_impl *snr_lib) {
         hal_symbol_load("m6_snr", snr_lib->handle, "MI_SNR_SetRes")))
         return EXIT_FAILURE;
 
+   if (!(snr_lib->fnCustomFunction = (int(*)(unsigned int sensor, unsigned int command, unsigned int size, void *data, int drvOrUsr))
+        hal_symbol_load("m6_snr", snr_lib->handle, "MI_SNR_CustFunction")))
+        return EXIT_FAILURE;
+
     return EXIT_SUCCESS;
 }
 

src/media.c

@@ -276,10 +276,8 @@ int create_channel(char index, short width, short height, char framerate, char j
     switch (plat) {
 #if defined(__ARM_PCS_VFP)
         case HAL_PLATFORM_I6:  return i6_channel_create(index, width, height, jpeg);
-        case HAL_PLATFORM_I6C: return i6c_channel_create(index, width, height,
-            app_config.mirror, app_config.flip, jpeg);
-        case HAL_PLATFORM_M6:  return m6_channel_create(index, width, height,
-            app_config.mirror, app_config.flip, jpeg);
+        case HAL_PLATFORM_I6C: return i6c_channel_create(index, width, height, jpeg);
+        case HAL_PLATFORM_M6:  return m6_channel_create(index, width, height, jpeg);
         case HAL_PLATFORM_RK:  return rk_channel_create(index, width, height,
             app_config.mirror, app_config.flip);
 #elif defined(__arm__) && !defined(__ARM_PCS_VFP)
@@ -748,9 +746,9 @@ int start_sdk(void) {
         case HAL_PLATFORM_I6:  ret = i6_pipeline_create(0, width,
             height, app_config.mirror, app_config.flip, framerate); break;
         case HAL_PLATFORM_I6C: ret = i6c_pipeline_create(0, width,
-            height, framerate); break;
+            height, app_config.mirror, app_config.flip, framerate); break;
         case HAL_PLATFORM_M6:  ret = m6_pipeline_create(0, width,
-            height, framerate); break;
+            height, app_config.mirror, app_config.flip, framerate); break;
         case HAL_PLATFORM_RK:  ret = rk_pipeline_create(width, height); break;
 #elif defined(__arm__) && !defined(__ARM_PCS_VFP)
         case HAL_PLATFORM_AK:  ret = ak_pipeline_create(app_config.mirror,