Mirror and flip handled before the video processor, and exposure setting on infinity6

Author: wberube

src/hal/star/i6_hal.c

@@ -170,13 +170,13 @@ int i6_channel_bind(char index, char framerate)
     return EXIT_SUCCESS;
 }
 
-int i6_channel_create(char index, short width, short height, char mirror, char flip, char jpeg)
+int i6_channel_create(char index, short width, short height, char jpeg)
 {
     i6_vpe_port port;
     port.output.width = width;
     port.output.height = height;
-    port.mirror = mirror;
-    port.flip = flip;
+    port.mirror = 0;
+    port.flip = 0;
     port.compress = I6_COMPR_NONE;
     port.pixFmt = jpeg ? I6_PIXFMT_YUV422_YUYV : I6_PIXFMT_YUV420SP;
 
@@ -215,7 +215,7 @@ int i6_config_load(char *path)
     return i6_isp.fnLoadChannelConfig(_i6_isp_chn, path, 1234);
 }
 
-int i6_pipeline_create(char sensor, short width, short height, char framerate)
+int i6_pipeline_create(char sensor, short width, short height, char mirror, char flip, char framerate)
 {
     int ret;
 
@@ -251,6 +251,9 @@ int i6_pipeline_create(char sensor, short width, short height, char framerate)
             return EXIT_FAILURE;
     }
 
+    if (ret = i6_snr.fnSetOrientation(_i6_snr_index, mirror, flip))
+        return ret;
+
     if (ret = i6_snr.fnGetPadInfo(_i6_snr_index, &_i6_snr_pad))
         return ret;
     if (ret = i6_snr.fnGetPlaneInfo(_i6_snr_index, 0, &_i6_snr_plane))
@@ -473,6 +476,23 @@ int i6_region_setbitmap(int handle, hal_bitmap *bitmap)
     return i6_rgn.fnSetBitmap(handle, &nativeBmp);
 }
 
+int i6_sensor_exposure(unsigned int micros)
+{
+    int ret;
+
+    {
+        i6_isp_exp config;
+        if (ret = i6_isp.fnGetExposureLimit(0, &config))
+            return ret;
+
+        config.maxShutterUs = micros;
+        if (ret = i6_isp.fnSetExposureLimit(0, &config))
+            return ret;
+    }
+
+    return ret;
+}
+
 int i6_video_create(char index, hal_vidconfig *config)
 {
     int ret;

src/hal/star/i6_hal.h

@@ -30,13 +30,13 @@ int i6_audio_init(int samplerate, int gain);
 void *i6_audio_thread(void);
 
 int i6_channel_bind(char index, char framerate);
-int i6_channel_create(char index, short width, short height, char mirror, char flip, char jpeg);
+int i6_channel_create(char index, short width, short height, char jpeg);
 int i6_channel_grayscale(char enable);
 int i6_channel_unbind(char index);
 
 int i6_config_load(char *path);
 
-int i6_pipeline_create(char sensor, short width, short height, char framerate);
+int i6_pipeline_create(char sensor, short width, short height, char mirror, char flip, char framerate);
 void i6_pipeline_destroy(void);
 
 int i6_region_create(char handle, hal_rect rect, short opacity);
@@ -45,6 +45,8 @@ void i6_region_destroy(char handle);
 void i6_region_init(void);
 int i6_region_setbitmap(int handle, hal_bitmap *bitmap);
 
+int i6_sensor_exposure(unsigned int micros);
+
 int i6_video_create(char index, hal_vidconfig *config);
 int i6_video_destroy(char index);
 int i6_video_destroy_all(void);

src/hal/star/i6_isp.h

@@ -2,11 +2,30 @@
 
 #include "i6_common.h"
 
+typedef struct {
+    unsigned int minShutterUs;
+    unsigned int maxShutterUs;
+    unsigned int minApertX10;
+    unsigned int maxApertX10;
+    unsigned int minSensorGain;
+    unsigned int minIspGain;
+    unsigned int maxSensorGain;
+    unsigned int maxIspGain;
+} i6_isp_exp;
+
+typedef struct {
+    int params[13];
+} i6_isp_p3a;
+
 typedef struct {
     void *handle, *handleCus3a, *handleIspAlgo;
 
+    int (*fnDisableUserspace3A)(int channel);
+    int (*fnEnableUserspace3A)(int channel, i6_isp_p3a *params);
     int (*fnLoadChannelConfig)(int channel, char *path, unsigned int key);
     int (*fnSetColorToGray)(int channel, char *enable);
+    int (*fnGetExposureLimit)(int channel, i6_isp_exp *config);
+    int (*fnSetExposureLimit)(int channel, i6_isp_exp *config);
 } i6_isp_impl;
 
 static int i6_isp_load(i6_isp_impl *isp_lib) {
@@ -17,6 +36,14 @@ static int i6_isp_load(i6_isp_impl *isp_lib) {
     if (!(isp_lib->handle = dlopen("libmi_isp.so", RTLD_LAZY | RTLD_GLOBAL)))
         HAL_ERROR("i6_isp", "Failed to load library!\nError: %s\n", dlerror());
 
+    if (!(isp_lib->fnDisableUserspace3A = (int(*)(int channel))
+        hal_symbol_load("i6_isp", isp_lib->handle, "MI_ISP_DisableUserspace3A")))
+        return EXIT_FAILURE;
+
+    if (!(isp_lib->fnEnableUserspace3A = (int(*)(int channel, i6_isp_p3a *params))
+        hal_symbol_load("i6_isp", isp_lib->handle, "MI_ISP_CUS3A_Enable")))
+        return EXIT_FAILURE;
+
     if (!(isp_lib->fnLoadChannelConfig = (int(*)(int channel, char *path, unsigned int key))
         hal_symbol_load("i6_isp", isp_lib->handle, "MI_ISP_API_CmdLoadBinFile")))
         return EXIT_FAILURE;
@@ -25,6 +52,14 @@ static int i6_isp_load(i6_isp_impl *isp_lib) {
         hal_symbol_load("i6_isp", isp_lib->handle, "MI_ISP_IQ_SetColorToGray")))
         return EXIT_FAILURE;
 
+    if (!(isp_lib->fnGetExposureLimit = (int(*)(int channel, i6_isp_exp *config))
+        hal_symbol_load("i6_isp", isp_lib->handle, "MI_ISP_AE_GetExposureLimit")))
+        return EXIT_FAILURE;
+
+    if (!(isp_lib->fnSetExposureLimit = (int(*)(int channel, i6_isp_exp *config))
+        hal_symbol_load("i6_isp", isp_lib->handle, "MI_ISP_AE_SetExposureLimit")))
+        return EXIT_FAILURE;
+
     return EXIT_SUCCESS;
 }
 

src/hal/star/i6_snr.h

@@ -78,6 +78,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, i6_snr_pad *info);
     int (*fnGetPlaneInfo)(unsigned int sensor, unsigned int index, i6_snr_plane *info);
@@ -105,6 +106,10 @@ static int i6_snr_load(i6_snr_impl *snr_lib) {
         hal_symbol_load("i6_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("i6_snr", snr_lib->handle, "MI_SNR_SetOrien")))
+        return EXIT_FAILURE;
+
     if (!(snr_lib->fnGetPadInfo = (int(*)(unsigned int sensor, i6_snr_pad *info))
         hal_symbol_load("i6_snr", snr_lib->handle, "MI_SNR_GetPadInfo")))
         return EXIT_FAILURE;

src/media.c

@@ -275,8 +275,7 @@ int take_next_free_channel(bool mainLoop) {
 int create_channel(char index, short width, short height, char framerate, char jpeg) {
     switch (plat) {
 #if defined(__ARM_PCS_VFP)
-        case HAL_PLATFORM_I6:  return i6_channel_create(index, width, height,
-            app_config.mirror, app_config.flip, jpeg);
+        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,
@@ -747,7 +746,7 @@ int start_sdk(void) {
     switch (plat) {
 #if defined(__ARM_PCS_VFP)
         case HAL_PLATFORM_I6:  ret = i6_pipeline_create(0, width,
-            height, framerate); break;
+            height, app_config.mirror, app_config.flip, framerate); break;
         case HAL_PLATFORM_I6C: ret = i6c_pipeline_create(0, width,
             height, framerate); break;
         case HAL_PLATFORM_M6:  ret = m6_pipeline_create(0, width,