<div dir="ltr"><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Apr 8, 2014 at 4:26 PM, <span dir="ltr"><<a href="mailto:deepthi@multicorewareinc.com" target="_blank">deepthi@multicorewareinc.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"># HG changeset patch<br>
# User Deepthi Nandakumar <<a href="mailto:deepthi@multicorewareinc.com">deepthi@multicorewareinc.com</a>><br>
# Date 1396954311 -19800<br>
# Node ID c450e358329bca26d084daa86d9e4833b837fcdc<br>
# Parent b5caca9954f36fc8e1cfb9e25f96288bf3aa18e2<br>
vbv: log frame-average QPs for VBV; even when AQ is disabled.<br>
<br>
diff -r b5caca9954f3 -r c450e358329b source/Lib/TLibCommon/TComPic.cpp<br>
--- a/source/Lib/TLibCommon/TComPic.cpp Tue Apr 08 16:13:11 2014 +0530<br>
+++ b/source/Lib/TLibCommon/TComPic.cpp Tue Apr 08 16:21:51 2014 +0530<br>
@@ -114,7 +114,7 @@<br>
int numRows = m_picSym->getFrameHeightInCU();<br>
int numCols = m_picSym->getFrameWidthInCU();<br>
<br>
- if (cfg->param->rc.aqMode)<br>
+ if (cfg->param->rc.aqMode || isVbv)<br>
CHECKED_MALLOC(m_qpaAq, double, numRows);<br>
if (isVbv)<br>
{<br>
@@ -156,7 +156,7 @@<br>
memset(m_intraCuCostsForVbv, 0, numRows * numCols * sizeof(uint32_t));<br>
memset(m_qpaRc, 0, numRows * sizeof(double));<br>
}<br>
- if (cfg->param->rc.aqMode)<br>
+ if (cfg->param->rc.aqMode || (cfg->param->rc.vbvBufferSize > 0 && cfg->param->rc.vbvMaxBitrate > 0))<br>
memset(m_qpaAq, 0, m_picSym->getFrameHeightInCU() * sizeof(double));<br>
}<br>
<br>
diff -r b5caca9954f3 -r c450e358329b source/encoder/frameencoder.cpp<br>
--- a/source/encoder/frameencoder.cpp Tue Apr 08 16:13:11 2014 +0530<br>
+++ b/source/encoder/frameencoder.cpp Tue Apr 08 16:21:51 2014 +0530<br>
@@ -1115,7 +1115,7 @@<br>
setLambda(qp, row);<br>
qp = Clip3(-QP_BD_OFFSET, MAX_QP, qp);<br>
cu->setQPSubParts(char(qp), 0, 0);<br>
- if (m_cfg->param->rc.aqMode)<br>
+ if (m_cfg->param->rc.aqMode || bIsVbv)<br>
m_pic->m_qpaAq[row] += qp;<br></blockquote><div>aq/cutree offsets are computed only when aq/cutree is turned on. vbv can still function without them. the above change has no effect when aq/cutree is off (presets ultrafast/superfast). need to log m_avgQpaRc (where avg qp for vbv is calculated) instead. </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
}<br>
<br>
_______________________________________________<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" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br></div></div>