Unifying *_video_create presentation and correcting the MP4 shutdown

routine

Author: wberube

src/hal/hisi/v4_hal.c

@@ -602,6 +602,7 @@ int v4_video_create(char index, hal_vidconfig *config)
     int ret;
     v4_venc_chn channel;
     memset(&channel, 0, sizeof(channel));
+
     channel.gop.mode = V4_VENC_GOPMODE_NORMALP;
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         channel.attrib.codec = V4_VENC_CODEC_MJPG;

src/hal/plus/ak_hal.c

@@ -119,7 +119,6 @@ void ak_pipeline_destroy(void)
 int ak_video_create(char index, hal_vidconfig *config)
 {
     int ret;
-
     ak_venc_codec codec;
     char ratemode;
     ak_venc_prof profile;
@@ -151,10 +150,10 @@ int ak_video_create(char index, hal_vidconfig *config)
 
     {
         ak_venc_cnf channel = {.codec = codec, .width = config->width, .height = config->height,
-            .minQual = MIN(MAX(config->minQual, 20), 50), 
-            .maxQual = MIN(MAX(config->maxQual ? config->maxQual : 50, 20), 50), 
-            .dstFps = config->framerate, .gop = config->gop, .maxBitrate = config->maxBitrate, 
-            .profile = profile, .subChnOn = index, 
+            .minQual = MIN(MAX(config->minQual, 20), 50),
+            .maxQual = MIN(MAX(config->maxQual ? config->maxQual : 50, 20), 50),
+            .dstFps = config->framerate, .gop = config->gop, .maxBitrate = config->maxBitrate,
+            .profile = profile, .subChnOn = index,
             .output = index ? AK_VENC_OUT_SUBSTRM : AK_VENC_OUT_MAINSTRM, .vbrModeOn = ratemode};
 
         if (!(_ak_venc_dev[index] = ak_venc.fnEnableChannel(&channel)))
@@ -247,7 +246,7 @@ int ak_system_init(char *snrConfig)
 
     // Disable the watchdog timer if it isn't already
     hal_registry(0x080080E8, &val, OP_WRITE);
-    
+
     if (ak_vi.fnLoadSensorConfig(snrConfig))
         HAL_DANGER("ak_vi", "Loading the sensor config failed"
             " with %#x!\n%s\n", ret = ak_sys.fnGetErrorNum(),
@@ -256,4 +255,4 @@ int ak_system_init(char *snrConfig)
     return ret;
 }
 
-#endif
+#endif

src/hal/plus/cvi_hal.c

@@ -518,6 +518,7 @@ int cvi_video_create(char index, hal_vidconfig *config)
     int ret;
     cvi_venc_chn channel;
     memset(&channel, 0, sizeof(channel));
+
     channel.gop.mode = CVI_VENC_GOPMODE_NORMALP;
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         channel.attrib.codec = CVI_VENC_CODEC_MJPG;

src/hal/plus/rk_hal.c

@@ -440,6 +440,7 @@ int rk_video_create(char index, hal_vidconfig *config)
     int ret;
     rk_venc_chn channel;
     memset(&channel, 0, sizeof(channel));
+
     channel.gop.mode = RK_VENC_GOPMODE_NORMALP;
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         channel.attrib.codec = RK_VENC_CODEC_MJPG;

src/hal/star/i3_hal.c

@@ -395,6 +395,7 @@ int i3_video_create(char index, hal_vidconfig *config)
     int ret;
     i3_venc_chn channel;
     i3_venc_attr_h26x *attrib;
+    memset(&channel, 0, sizeof(channel));
 
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         channel.attrib.codec = I3_VENC_CODEC_MJPG;
@@ -410,7 +411,7 @@ int i3_video_create(char index, hal_vidconfig *config)
                 channel.rate.mode = series == 0xEF ? I3OG_VENC_RATEMODE_MJPGQP : I3_VENC_RATEMODE_MJPGQP;
                 channel.rate.mjpgQp.fpsNum =
                     config->codec == HAL_VIDCODEC_JPG ? 1 : config->framerate;
-                channel.rate.mjpgCbr.fpsDen = 1;
+                channel.rate.mjpgQp.fpsDen = 1;
                 channel.rate.mjpgQp.quality = MAX(config->minQual, config->maxQual);
                 break;
             default:

src/hal/star/i6_hal.c

@@ -499,6 +499,7 @@ int i6_video_create(char index, hal_vidconfig *config)
     int ret;
     i6_venc_chn channel;
     i6_venc_attr_h26x *attrib;
+    memset(&channel, 0, sizeof(channel));
 
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         channel.attrib.codec = I6_VENC_CODEC_MJPG;
@@ -514,7 +515,7 @@ int i6_video_create(char index, hal_vidconfig *config)
                 channel.rate.mode = series == 0xEF ? I6OG_VENC_RATEMODE_MJPGQP : I6_VENC_RATEMODE_MJPGQP;
                 channel.rate.mjpgQp.fpsNum =
                     config->codec == HAL_VIDCODEC_JPG ? 1 : config->framerate;
-                channel.rate.mjpgCbr.fpsDen = 1;
+                channel.rate.mjpgQp.fpsDen = 1;
                 channel.rate.mjpgQp.quality = MAX(config->minQual, config->maxQual);
                 break;
             default:

src/hal/star/i6c_hal.c

@@ -547,6 +547,7 @@ int i6c_video_create(char index, hal_vidconfig *config)
     int ret;
     i6c_venc_chn channel;
     i6c_venc_attr_h26x *attrib;
+    memset(&channel, 0, sizeof(channel));
 
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         _i6c_venc_dev[index] = I6C_VENC_DEV_MJPG_0;

src/hal/star/m6_hal.c

@@ -524,6 +524,7 @@ int m6_video_create(char index, hal_vidconfig *config)
     int ret;
     m6_venc_chn channel;
     m6_venc_attr_h26x *attrib;
+    memset(&channel, 0, sizeof(channel));
 
     if (config->codec == HAL_VIDCODEC_JPG || config->codec == HAL_VIDCODEC_MJPG) {
         _m6_venc_dev[index] = M6_VENC_DEV_MJPG_0;

src/media.c

@@ -566,7 +566,7 @@ int media_mp4_disable(void) {
 
     for (char i = 0; i < chnCount; i++) {
         if (!chnState[i].enable) continue;
-        if (chnState[i].payload != HAL_VIDCODEC_H264 ||
+        if (chnState[i].payload != HAL_VIDCODEC_H264 &&
             chnState[i].payload != HAL_VIDCODEC_H265) continue;
 
         if (ret = unbind_channel(i, 1))