Skip to content

Commit 41ed9ad

Browse files
committed
XX DEBUG
1 parent 8f6c179 commit 41ed9ad

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

amalgamation/toxcore_amalgamation.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82726,6 +82726,7 @@ 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");
8272982730

8273082731

8273182732
// x265_param_parse(param, "fps", "20");
@@ -82760,8 +82761,8 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
8276082761
// Specify the target bitrate in kbps. Default is 0 (CRF)
8276182762

8276282763
param->rc.bitrate = (int)(bit_rate / 1000);
82763-
param->rc.vbvBufferSize = (((int)(bit_rate / 1000)) * VIDEO_BUF_FACTOR_H264);
82764-
param->rc.vbvMaxBitrate = ((int)(bit_rate / 1000));
82764+
param->rc.vbvBufferSize = ((int)(bit_rate / 1000));
82765+
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
8276582766

8276682767
/*
8276782768
m_isCbr = m_param->rc.rateControlMode == X265_RC_ABR && m_isVbv && m_param->rc.vbvMaxBitrate <= m_param->rc.bitrate;
@@ -82926,8 +82927,8 @@ int vc_reconfigure_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
8292682927
x265_param *param = x265_param_alloc();
8292782928
x265_encoder_parameters(vc->h265_encoder, param);
8292882929

82929-
param->rc.vbvBufferSize = (((int)(bit_rate / 1000)) * VIDEO_BUF_FACTOR_H264);
82930-
param->rc.vbvMaxBitrate = ((int)(bit_rate / 1000));
82930+
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
82931+
param->rc.vbvBufferSize = (int)(bit_rate / 1000);
8293182932
param->rc.bitrate = (int)(bit_rate / 1000);
8293282933

8293382934
int res = x265_encoder_reconfig(vc->h265_encoder, param);

toxav/codecs/h264/codec.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,6 +1961,7 @@ 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");
19641965

19651966

19661967
// x265_param_parse(param, "fps", "20");
@@ -1995,8 +1996,8 @@ static void vc_init_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
19951996
// Specify the target bitrate in kbps. Default is 0 (CRF)
19961997

19971998
param->rc.bitrate = (int)(bit_rate / 1000);
1998-
param->rc.vbvBufferSize = (((int)(bit_rate / 1000)) * VIDEO_BUF_FACTOR_H264);
1999-
param->rc.vbvMaxBitrate = ((int)(bit_rate / 1000));
1999+
param->rc.vbvBufferSize = ((int)(bit_rate / 1000));
2000+
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
20002001

20012002
/*
20022003
m_isCbr = m_param->rc.rateControlMode == X265_RC_ABR && m_isVbv && m_param->rc.vbvMaxBitrate <= m_param->rc.bitrate;
@@ -2161,8 +2162,8 @@ int vc_reconfigure_encoder_h265(Logger *log, VCSession *vc, uint32_t bit_rate,
21612162
x265_param *param = x265_param_alloc();
21622163
x265_encoder_parameters(vc->h265_encoder, param);
21632164

2164-
param->rc.vbvBufferSize = (((int)(bit_rate / 1000)) * VIDEO_BUF_FACTOR_H264);
2165-
param->rc.vbvMaxBitrate = ((int)(bit_rate / 1000));
2165+
param->rc.vbvMaxBitrate = (int)(bit_rate / 1000);
2166+
param->rc.vbvBufferSize = (int)(bit_rate / 1000);
21662167
param->rc.bitrate = (int)(bit_rate / 1000);
21672168

21682169
int res = x265_encoder_reconfig(vc->h265_encoder, param);

0 commit comments

Comments
 (0)