[x265] [PATCH] rc: rename m_bframes to m_leadingBframes
aarthi at multicorewareinc.com
aarthi at multicorewareinc.com
Wed Aug 27 08:01:20 CEST 2014
# HG changeset patch
# User Aarthi Thirumalai
# Date 1409118834 -19800
# Wed Aug 27 11:23:54 2014 +0530
# Node ID 9eed52d658080bcdcc256d0724fa8ff57c16f1b8
# Parent 32891b95f6693a39afbdf7929e12e3e0c6e990d1
rc: rename m_bframes to m_leadingBframes
diff -r 32891b95f669 -r 9eed52d65808 source/encoder/ratecontrol.cpp
--- a/source/encoder/ratecontrol.cpp Tue Aug 26 15:03:38 2014 -0500
+++ b/source/encoder/ratecontrol.cpp Wed Aug 27 11:23:54 2014 +0530
@@ -403,7 +403,7 @@
}
m_isCbr = m_param->rc.rateControlMode == X265_RC_ABR && m_isVbv && !m_2pass && m_param->rc.vbvMaxBitrate <= m_param->rc.bitrate;
- m_bframes = m_param->bframes;
+ m_leadingBframes = m_param->bframes;
m_bframeBits = 0;
m_leadingNoBSatd = 0;
m_ipOffset = 6.0 * X265_LOG2(m_param->rc.ipFactor);
@@ -1069,9 +1069,9 @@
}
rce->isActive = true;
if (m_sliceType == B_SLICE)
- rce->bframes = m_bframes;
+ rce->bframes = m_leadingBframes;
else
- m_bframes = pic->m_lowres.leadingBframes;
+ m_leadingBframes = pic->m_lowres.leadingBframes;
rce->bLastMiniGopBFrame = pic->m_lowres.bLastMiniGopBFrame;
rce->bufferRate = m_bufferRate;
@@ -1369,7 +1369,7 @@
q += m_pbOffset;
rce->qpNoVbv = q;
double qScale = x265_qp2qScale(q);
- if (m_bframes > 5 && m_isVbv)
+ if (m_leadingBframes > 5 && m_isVbv)
{
qScale = clipQscale(pic, qScale);
m_lastQScaleFor[m_sliceType] = qScale;
diff -r 32891b95f669 -r 9eed52d65808 source/encoder/ratecontrol.h
--- a/source/encoder/ratecontrol.h Tue Aug 26 15:03:38 2014 -0500
+++ b/source/encoder/ratecontrol.h Wed Aug 27 11:23:54 2014 +0530
@@ -133,7 +133,7 @@
Predictor m_pred[5];
Predictor m_predBfromP;
- int m_bframes;
+ int m_leadingBframes;
int64_t m_bframeBits;
int64_t m_currentSatd;
int m_qpConstant[3];
More information about the x265-devel
mailing list