<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 30, 2017 at 4:24 PM, <span dir="ltr"><<a href="mailto:aruna@multicorewareinc.com" target="_blank">aruna@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Aruna Matheswaran <<a href="mailto:aruna@multicorewareinc.com">aruna@multicorewareinc.com</a>><br>
# Date 1498739495 -19800<br>
# Thu Jun 29 18:01:35 2017 +0530<br>
# Branch stable<br>
# Node ID c1352817af1f30025bc003b4c7da9c<wbr>ffbd3a2fd5<br>
# Parent bce945545c241ce4bb87d56d283ac8<wbr>226d862ed5<br>
const-vbv: fix inconsistency and nit<br></blockquote><div><br></div><div>Pushed to stable branch</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r bce945545c24 -r c1352817af1f doc/reST/cli.rst<br>
--- a/doc/reST/cli.rst Wed Jun 07 16:29:15 2017 +0530<br>
+++ b/doc/reST/cli.rst Thu Jun 29 18:01:35 2017 +0530<br>
@@ -1573,7 +1573,7 @@<br>
that this option is used through the tune grain feature where a combination<br>
of param options are used to improve visual quality.<br>
<br>
- .. option:: --const-vbv, --no-const-vbv<br>
+.. option:: --const-vbv, --no-const-vbv<br>
<br>
Enables VBV algorithm to be consistent across runs. Default disabled.<br>
Enabled when :option:'--tune' grain is applied.<br>
diff -r bce945545c24 -r c1352817af1f source/encoder/ratecontrol.cpp<br>
--- a/source/encoder/ratecontrol.<wbr>cpp Wed Jun 07 16:29:15 2017 +0530<br>
+++ b/source/encoder/ratecontrol.<wbr>cpp Thu Jun 29 18:01:35 2017 +0530<br>
@@ -2272,7 +2272,7 @@<br>
uint32_t refRowSatdCost = 0, refRowBits = 0, intraCostForPendingCus = 0;<br>
double refQScale = 0;<br>
<br>
- if (picType != I_SLICE)<br>
+ if (picType != I_SLICE && !m_param->rc.bEnableConstVbv)<br>
{<br>
FrameData& refEncData = *refFrame->m_encData;<br>
uint32_t endCuAddr = maxCols * (row + 1);<br>
@@ -2344,7 +2344,7 @@<br>
}<br>
rowSatdCost >>= X265_DEPTH - 8;<br>
updatePredictor(rce->rowPred[<wbr>0], qScaleVbv, (double)rowSatdCost, encodedBits);<br>
- if (curEncData.m_slice->m_<wbr>sliceType != I_SLICE)<br>
+ if (curEncData.m_slice->m_<wbr>sliceType != I_SLICE && !m_param->rc.bEnableConstVbv)<br>
{<br>
Frame* refFrame = curEncData.m_slice->m_<wbr>refFrameList[0][0];<br>
if (qpVbv < refFrame->m_encData->m_<wbr>rowStat[row].rowQp)<br>
<br>______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/x265-devel</a><br>
<br></blockquote></div><br></div></div>