Better handling of ISP dependencies between different hisi-v4(a) platforms

Author: wberube

README.md

@@ -41,6 +41,7 @@ In spite of these design choices, Divinus boasts numerous features that cater to
 | infinity6e[^15]         | ✔️           | ✔️           | ✔️          | ✔️          | ✔️                |
 | infinity6c[^16]         | ✔️           | ✔️           | ✔️          | ✔️          | ✔️                |
 | mercury6[^17]           | ✔️           | ✔️           | ✔️          | ✔️          | ✔️                |
+| sun8iw21p1[^18]         | ↻            | ↻            | ↻           | ↻           | ↻                 |
 
 _✔️ - supported, ↻ - in development, ✗ - unsupported, ⁿ/ₐ - not supported by hardware_
 
@@ -61,8 +62,9 @@ _* At the moment, text, RGB or bitfield bitmaps and PNG overlays are handled, mo
 [^13]: SSC323, SSC325\(D/DE\) and SSC327\(D/DE/Q\)
 [^14]: SSC33\[3/5/7\]\(DE\)
 [^15]: SSC30K\[D/Q\], SSC336\[D/Q\], SSC338\[D/G/Q\] and SSC339G
-[^16]: SSC377\(D/DE/QE\) or SSC378\[DE/QE\]
+[^16]: SSC377\(D/DE/QE\) and SSC378\[DE/QE\]
 [^17]: SSC359G
+[^18]: V851S\(E\) and V853
 
 
 ### Documentation

doc/config.md

@@ -78,7 +78,7 @@ This document describes the fields that can be found within a configuration file
 
 ## MP4 section
 
-- **enable**: Boolean to activate or deactivate MP4 encoding.
+- **enable**: Boolean to activate MP4 output (required by live streams and RTSP).
 - **codec**: Codec used for encoding (H.264 or H.265).
 - **mode**: Encoding mode.
 - **width**: Video width in pixels.
@@ -104,14 +104,14 @@ This document describes the fields that can be found within a configuration file
 
 ## JPEG section
 
-- **enable**: Boolean to activate or deactivate JPEG encoding.
+- **enable**: Boolean to activate JPEG output.
 - **width**: Image width in pixels.
 - **height**: Image height in pixels.
 - **qfactor**: JPEG compression quality factor.
 
 ## MJPEG section
 
-- **enable**: Boolean to activate or deactivate MJPEG encoding.
+- **enable**: Boolean to activate MJPEG output.
 - **mode**: Encoding mode.
 - **width**: Video width in pixels.
 - **height**: Video height in pixels.
@@ -120,8 +120,8 @@ This document describes the fields that can be found within a configuration file
 
 ## HTTP POST section
 
-- **enable**: Boolean to activate or deactivate HTTP POST requests.
-- **host**: Host for HTTP POST requests.
+- **enable**: Boolean to activate HTTP POST snapshots.
+- **host**: Hostname for HTTP POST requests.
 - **url**: URL for HTTP POST requests.
 - **login**: Login for HTTP POST authentication.
 - **password**: Password for HTTP POST authentication.

src/hal/hisi/v4_isp.h

@@ -49,15 +49,15 @@ typedef struct {
 } v4_isp_impl;
 
 static int v4_isp_load(v4_isp_impl *isp_lib) {
-    if ((isp_lib->handleCalcFlick = dlopen("lib_hicalcflicker.so", RTLD_LAZY | RTLD_GLOBAL)) &&
-        (isp_lib->handle = dlopen("libisp.so", RTLD_LAZY | RTLD_GLOBAL)) &&
+    isp_lib->handleCalcFlick = dlopen("lib_hicalcflicker.so", RTLD_LAZY | RTLD_GLOBAL);
+
+    if ((isp_lib->handle = dlopen("libisp.so", RTLD_LAZY | RTLD_GLOBAL)) &&
         (isp_lib->handleAe = dlopen("lib_hiae.so", RTLD_LAZY | RTLD_GLOBAL)) &&
         (isp_lib->handleAwb = dlopen("lib_hiawb.so", RTLD_LAZY | RTLD_GLOBAL)) &&
         (isp_lib->handleIrAuto = dlopen("lib_hiir_auto.so", RTLD_LAZY | RTLD_GLOBAL)) &&
         (isp_lib->handleLdci = dlopen("lib_hildci.so", RTLD_LAZY | RTLD_GLOBAL)) &&
         (isp_lib->handleDehaze = dlopen("lib_hidehaze.so", RTLD_LAZY | RTLD_GLOBAL)) &&
-        (isp_lib->handleDrc = dlopen("lib_hidrc.so", RTLD_LAZY | RTLD_GLOBAL)) &&
-        (isp_lib->handleAcs = dlopen("lib_hiacs.so", RTLD_LAZY | RTLD_GLOBAL)))
+        (isp_lib->handleDrc = dlopen("lib_hidrc.so", RTLD_LAZY | RTLD_GLOBAL)))
         goto loaded;
 
     if ((isp_lib->handleGoke = dlopen("libgk_isp.so", RTLD_LAZY | RTLD_GLOBAL)) &&
@@ -75,30 +75,26 @@ static int v4_isp_load(v4_isp_impl *isp_lib) {
     HAL_ERROR("v4_isp", "Failed to load library!\nError: %s\n", dlerror());
 
 loaded:
+    isp_lib->handleAcs = dlopen("lib_hiacs.so", RTLD_LAZY | RTLD_GLOBAL);
+
     if (!isp_lib->handleGoke) {
-        if (!(fnIsp_Malloc = (void*(*)(unsigned long))
-            hal_symbol_load("v4_isp", isp_lib->handle, "isp_malloc")))
-            return EXIT_FAILURE;
+        hal_symbol_load("v4_isp", isp_lib->handle, "isp_malloc");
 
         if (!(fnISP_AlgRegisterAcs = (int(*)(int))
             hal_symbol_load("v4_isp", isp_lib->handleAcs, "isp_alg_register_acs")))
             return EXIT_FAILURE;
 
-        if (!(fnISP_AlgRegisterDehaze = (int(*)(int))
-            hal_symbol_load("v4_isp", isp_lib->handleDehaze, "isp_alg_register_dehaze")))
-            return EXIT_FAILURE;
+        if (!(fnISP_AlgRegisterDehaze = (int(*)(int))hal_symbol_load("v4_isp", isp_lib->handleDehaze, "ISP_AlgRegisterDehaze")))
+            fnISP_AlgRegisterDehaze = (int(*)(int))hal_symbol_load("v4_isp", isp_lib->handleDehaze, "isp_alg_register_dehaze");
 
-        if (!(fnISP_AlgRegisterDrc = (int(*)(int))
-            hal_symbol_load("v4_isp", isp_lib->handleDrc, "isp_alg_register_drc")))
-            return EXIT_FAILURE;
+        if (!(fnISP_AlgRegisterDrc = (int(*)(int))hal_symbol_load("v4_isp", isp_lib->handleDrc, "ISP_AlgRegisterDrc")))
+            fnISP_AlgRegisterDrc = (int(*)(int))hal_symbol_load("v4_isp", isp_lib->handleDrc, "isp_alg_register_drc");
 
-        if (!(fnISP_AlgRegisterLdci = (int(*)(int))
-            hal_symbol_load("v4_isp", isp_lib->handleLdci, "isp_alg_register_ldci")))
-            return EXIT_FAILURE;
+        if (!(fnISP_AlgRegisterLdci = (int(*)(int))hal_symbol_load("v4_isp", isp_lib->handleLdci, "ISP_AlgRegisterLdci")))
+            fnISP_AlgRegisterLdci = (int(*)(int))hal_symbol_load("v4_isp", isp_lib->handleLdci, "isp_alg_register_ldci");
 
-        if (!(fnMPI_ISP_IrAutoRunOnce = (int(*)(int, void*))
-            hal_symbol_load("v4_isp", isp_lib->handleIrAuto, "isp_ir_auto_run_once")))
-            return EXIT_FAILURE;
+        if (!(fnMPI_ISP_IrAutoRunOnce = (int(*)(int, void*))hal_symbol_load("v4_isp", isp_lib->handleIrAuto, "HI_MPI_ISP_IrAutoRunOnce")))
+            fnMPI_ISP_IrAutoRunOnce = (int(*)(int, void*))hal_symbol_load("v4_isp", isp_lib->handleIrAuto, "isp_ir_auto_run_once");
     } else {
         if (!(fnISP_AlgRegisterDehaze = (int(*)(int))
             hal_symbol_load("v4_isp", isp_lib->handleDehaze, "ISP_AlgRegisterDehaze")))