tweak x265 encoder settings

Author: zoff99

amalgamation/toxcore_amalgamation.c

@@ -82707,7 +82707,7 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
     // LOGGER_API_WARNING(vc->av->tox, "H265 encoder init");
 
     x265_param *param = x265_param_alloc();
-    if (x265_param_default_preset(param, "superfast", "fastdecode") != 0) {
+    if (x265_param_default_preset(param, "ultrafast", "zerolatency") != 0) {
         // LOGGER_API_WARNING(vc->av->tox, "H265 encoder:x265_param_default_preset error");
         printf("vc_init_encoder_h265: H265 encoder:x265_param_default_preset error\n");
         // goto fail;
@@ -82737,8 +82737,8 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
     // x265_param_parse(param, "rd", "1");
     x265_param_parse(param, "intra-refresh", "1");
 
-    x265_param_parse(param, "frame-threads", "2");
-    x265_param_parse(param, "pools", "2");
+    // x265_param_parse(param, "frame-threads", "2");
+    // x265_param_parse(param, "pools", "2");
 
 
     x265_param_parse(param, "log-level", "debug");
@@ -82916,6 +82916,10 @@ int vc_reconfigure_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
         // x265_param_parse(param, "bitrate", bitrate_str);
         x265_param_parse(param, "bitrate", "800");
         param->rc.bitrate = 800;
+        printf("vc_init_encoder_h265:bit_rate = %d\n", (int)(bit_rate / 1000));
+
+        param->rc.vbvBufferSize = 800 * VIDEO_BUF_FACTOR_H264;
+        param->rc.vbvMaxBitrate = 800 * 1;
 
         int res = x265_encoder_reconfig(vc->h265_encoder, param);
         printf("x265_encoder_reconfig:res=%d bitrate=%d\n", (int)res, (int)(bit_rate / 1000));

toxav/codecs/h264/codec.c

@@ -1942,7 +1942,7 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
     // LOGGER_API_WARNING(vc->av->tox, "H265 encoder init");
 
     x265_param *param = x265_param_alloc();
-    if (x265_param_default_preset(param, "superfast", "fastdecode") != 0) {
+    if (x265_param_default_preset(param, "ultrafast", "zerolatency") != 0) {
         // LOGGER_API_WARNING(vc->av->tox, "H265 encoder:x265_param_default_preset error");
         printf("vc_init_encoder_h265: H265 encoder:x265_param_default_preset error\n");
         // goto fail;
@@ -1972,8 +1972,8 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
     // x265_param_parse(param, "rd", "1");
     x265_param_parse(param, "intra-refresh", "1");
 
-    x265_param_parse(param, "frame-threads", "2");
-    x265_param_parse(param, "pools", "2");
+    // x265_param_parse(param, "frame-threads", "2");
+    // x265_param_parse(param, "pools", "2");
 
 
     x265_param_parse(param, "log-level", "debug");
@@ -2151,6 +2151,10 @@ int vc_reconfigure_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
         // x265_param_parse(param, "bitrate", bitrate_str);
         x265_param_parse(param, "bitrate", "800");
         param->rc.bitrate = 800;
+        printf("vc_init_encoder_h265:bit_rate = %d\n", (int)(bit_rate / 1000));
+
+        param->rc.vbvBufferSize = 800 * VIDEO_BUF_FACTOR_H264;
+        param->rc.vbvMaxBitrate = 800 * 1;
 
         int res = x265_encoder_reconfig(vc->h265_encoder, param);
         printf("x265_encoder_reconfig:res=%d bitrate=%d\n", (int)res, (int)(bit_rate / 1000));