Pass resolution and FPS infos on MP4 stream, allow loading sensor con…

…figuration files on T31
OpenIPC · Jun 3, 2024 · 5f40539 · 5f40539
1 parent 0b4e200
commit 5f40539
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/hal/inge/t31_hal.c b/src/hal/inge/t31_hal.c
@@ -157,6 +157,11 @@ int t31_channel_unbind(char index)
     return EXIT_SUCCESS;
 }
 
+int t31_config_load(char *path)
+{
+    return t31_isp.fnLoadConfig(path);
+}
+
 int t31_region_create(int *handle, hal_rect rect)
 {
     int ret;
@@ -247,7 +252,7 @@ int t31_video_create(char index, hal_vidconfig *config)
 
     memset(&channel, 0, sizeof(channel));
     t31_venc.fnSetDefaults(&channel, profile, ratemode, config->width, config->height, 
-        config->framerate, 1, config->gop, 2, -1, config->bitrate);
+        config->framerate, 1, config->gop, config->gop / config->framerate, -1, config->bitrate);
 
     switch (channel.rate.mode) {
         case T31_VENC_RATEMODE_CBR:

diff --git a/src/hal/inge/t31_hal.h b/src/hal/inge/t31_hal.h
@@ -27,6 +27,8 @@ void t31_channel_destroy(char index);
 int t31_channel_grayscale(char enable);
 int t31_channel_unbind(char index);
 
+int t31_config_load(char *path);
+
 int t31_region_create(int *handle, hal_rect rect);
 void t31_region_destroy(int *handle);
 int t31_region_setbitmap(int *handle, hal_bitmap *bitmap);

diff --git a/src/video.c b/src/video.c
@@ -272,6 +272,8 @@ int start_sdk() {
                     index, ret, errstr(ret));
                 return EXIT_FAILURE;
             }
+
+            set_mp4_config(app_config.mp4_width, app_config.mp4_height, app_config.mp4_fps);
         }
 
         if (ret = bind_vpss_venc(index, app_config.mp4_fps, 0)) {
@@ -360,6 +362,7 @@ int start_sdk() {
             case HAL_PLATFORM_I6:  i6_config_load(app_config.sensor_config); break;
             case HAL_PLATFORM_I6C: i6c_config_load(app_config.sensor_config); break;
             case HAL_PLATFORM_I6F: i6f_config_load(app_config.sensor_config); break;    
+            case HAL_PLATFORM_T31: t31_config_load(app_config.sensor_config); break;
         }
 
     fprintf(stderr, "SDK has started successfully!\n");