# HG changeset patch
# User Aruna Matheswaran <[email protected]>
# Date 1498739495 -19800
# Thu Jun 29 18:01:35 2017 +0530
# Branch stable
# Node ID c1352817af1f30025bc003b4c7da9cffbd3a2fd5
# Parent bce945545c241ce4bb87d56d283ac8226d862ed5
const-vbv: fix inconsistency and nit
diff -r bce945545c24 -r c1352817af1f doc/reST/cli.rst
--- a/doc/reST/cli.rst Wed Jun 07 16:29:15 2017 +0530
+++ b/doc/reST/cli.rst Thu Jun 29 18:01:35 2017 +0530
@@ -1573,7 +1573,7 @@
that this option is used through the tune grain feature where a combination
of param options are used to improve visual quality.
- .. option:: --const-vbv, --no-const-vbv
+.. option:: --const-vbv, --no-const-vbv
Enables VBV algorithm to be consistent across runs. Default disabled.
Enabled when :option:'--tune' grain is applied.
diff -r bce945545c24 -r c1352817af1f source/encoder/ratecontrol.cpp
--- a/source/encoder/ratecontrol.cpp Wed Jun 07 16:29:15 2017 +0530
+++ b/source/encoder/ratecontrol.cpp Thu Jun 29 18:01:35 2017 +0530
@@ -2272,7 +2272,7 @@
uint32_t refRowSatdCost = 0, refRowBits = 0,
intraCostForPendingCus = 0;
double refQScale = 0;
- if (picType != I_SLICE)
+ if (picType != I_SLICE && !m_param->rc.bEnableConstVbv)
{
FrameData& refEncData = *refFrame->m_encData;
uint32_t endCuAddr = maxCols * (row + 1);
@@ -2344,7 +2344,7 @@
}
rowSatdCost >>= X265_DEPTH - 8;
updatePredictor(rce->rowPred[0], qScaleVbv, (double)rowSatdCost,
encodedBits);
- if (curEncData.m_slice->m_sliceType != I_SLICE)
+ if (curEncData.m_slice->m_sliceType != I_SLICE &&
!m_param->rc.bEnableConstVbv)
{
Frame* refFrame = curEncData.m_slice->m_refFrameList[0][0];
if (qpVbv < refFrame->m_encData->m_rowStat[row].rowQp)
# HG changeset patch
# User Aruna Matheswaran <[email protected]>
# Date 1498739495 -19800
# Thu Jun 29 18:01:35 2017 +0530
# Branch stable
# Node ID c1352817af1f30025bc003b4c7da9cffbd3a2fd5
# Parent bce945545c241ce4bb87d56d283ac8226d862ed5
const-vbv: fix inconsistency and nit
diff -r bce945545c24 -r c1352817af1f doc/reST/cli.rst
--- a/doc/reST/cli.rst Wed Jun 07 16:29:15 2017 +0530
+++ b/doc/reST/cli.rst Thu Jun 29 18:01:35 2017 +0530
@@ -1573,7 +1573,7 @@
that this option is used through the tune grain feature where a combination
of param options are used to improve visual quality.
- .. option:: --const-vbv, --no-const-vbv
+.. option:: --const-vbv, --no-const-vbv
Enables VBV algorithm to be consistent across runs. Default disabled.
Enabled when :option:'--tune' grain is applied.
diff -r bce945545c24 -r c1352817af1f source/encoder/ratecontrol.cpp
--- a/source/encoder/ratecontrol.cpp Wed Jun 07 16:29:15 2017 +0530
+++ b/source/encoder/ratecontrol.cpp Thu Jun 29 18:01:35 2017 +0530
@@ -2272,7 +2272,7 @@
uint32_t refRowSatdCost = 0, refRowBits = 0, intraCostForPendingCus = 0;
double refQScale = 0;
- if (picType != I_SLICE)
+ if (picType != I_SLICE && !m_param->rc.bEnableConstVbv)
{
FrameData& refEncData = *refFrame->m_encData;
uint32_t endCuAddr = maxCols * (row + 1);
@@ -2344,7 +2344,7 @@
}
rowSatdCost >>= X265_DEPTH - 8;
updatePredictor(rce->rowPred[0], qScaleVbv, (double)rowSatdCost, encodedBits);
- if (curEncData.m_slice->m_sliceType != I_SLICE)
+ if (curEncData.m_slice->m_sliceType != I_SLICE && !m_param->rc.bEnableConstVbv)
{
Frame* refFrame = curEncData.m_slice->m_refFrameList[0][0];
if (qpVbv < refFrame->m_encData->m_rowStat[row].rowQp)
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
