Skip to content

Commit 4bc5c97

Browse files
committed
XX DEBUG
1 parent 70de2d3 commit 4bc5c97

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

amalgamation/toxcore_amalgamation.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82726,7 +82726,6 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
8272682726
param->bAnnexB = 1;
8272782727
param->keyframeMax = 60; // every n-th frame is an I-frame
8272882728
param->bIntraRefresh = 1;
82729-
x265_param_parse(param, "intra-refresh", "1");
8273082729

8273182730

8273282731
// x265_param_parse(param, "fps", "20");
@@ -82762,7 +82761,7 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
8276282761
// Specify the target bitrate in kbps. Default is 0 (CRF)
8276382762

8276482763
param->rc.bitrate = (int)(bit_rate / 1000);
82765-
param->rc.vbvBufferSize = ((int)(bit_rate / 1000));
82764+
param->rc.vbvBufferSize = 50 + ((int)(bit_rate / 1000));
8276682765
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
8276782766

8276882767
/*
@@ -82929,16 +82928,15 @@ int vc_reconfigure_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
8292982928
x265_encoder_parameters(vc->h265_encoder, param);
8293082929

8293182930
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
82932-
param->rc.vbvBufferSize = (int)(bit_rate / 1000);
82931+
param->rc.vbvBufferSize = 50 + (int)(bit_rate / 1000);
8293382932
param->rc.bitrate = (int)(bit_rate / 1000);
8293482933

82934+
/*
8293582935
char bit_rate_str[100];
8293682936
memset(bit_rate_str, 0, 100);
8293782937
snprintf(bit_rate_str, 90, "%d", (int)(bit_rate / 1000));
8293882938
x265_param_parse(param, "bitrate", bit_rate_str);
82939-
82940-
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
82941-
param->rc.vbvBufferSize = 50 + (int)(bit_rate / 1000);
82939+
*/
8294282940

8294382941
int res = x265_encoder_reconfig(vc->h265_encoder, param);
8294482942
x265_param_free(param);

toxav/codecs/h264/codec.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,6 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
19611961
param->bAnnexB = 1;
19621962
param->keyframeMax = 60; // every n-th frame is an I-frame
19631963
param->bIntraRefresh = 1;
1964-
x265_param_parse(param, "intra-refresh", "1");
19651964

19661965

19671966
// x265_param_parse(param, "fps", "20");
@@ -1997,7 +1996,7 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
19971996
// Specify the target bitrate in kbps. Default is 0 (CRF)
19981997

19991998
param->rc.bitrate = (int)(bit_rate / 1000);
2000-
param->rc.vbvBufferSize = ((int)(bit_rate / 1000));
1999+
param->rc.vbvBufferSize = 50 + ((int)(bit_rate / 1000));
20012000
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
20022001

20032002
/*
@@ -2164,16 +2163,15 @@ int vc_reconfigure_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
21642163
x265_encoder_parameters(vc->h265_encoder, param);
21652164

21662165
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
2167-
param->rc.vbvBufferSize = (int)(bit_rate / 1000);
2166+
param->rc.vbvBufferSize = 50 + (int)(bit_rate / 1000);
21682167
param->rc.bitrate = (int)(bit_rate / 1000);
21692168

2169+
/*
21702170
char bit_rate_str[100];
21712171
memset(bit_rate_str, 0, 100);
21722172
snprintf(bit_rate_str, 90, "%d", (int)(bit_rate / 1000));
21732173
x265_param_parse(param, "bitrate", bit_rate_str);
2174-
2175-
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
2176-
param->rc.vbvBufferSize = 50 + (int)(bit_rate / 1000);
2174+
*/
21772175

21782176
int res = x265_encoder_reconfig(vc->h265_encoder, param);
21792177
x265_param_free(param);

0 commit comments

Comments
 (0)