<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 30, 2018 at 4:10 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 1517058921 -19800<br>
# Sat Jan 27 18:45:21 2018 +0530<br>
# Branch stable<br>
# Node ID 1b214cda9acf85e8c617195f1a1613<wbr>601d7d673a<br>
# Parent c373f947f086fe8764a44a4fdb5826<wbr>41cef3ad49<br>
rc: fix inconsistency in pass 2 when weightp and cutree are enabled.<br>
<br>
diff -r c373f947f086 -r 1b214cda9acf source/encoder/slicetype.cpp<br>
--- a/source/encoder/slicetype.cpp Wed Dec 27 19:05:56 2017 +0530<br>
+++ b/source/encoder/slicetype.cpp Sat Jan 27 18:45:21 2018 +0530<br>
@@ -154,7 +154,7 @@<br>
int blockXY = 0;<br>
int blockX = 0, blockY = 0;<br>
double strength = 0.f;<br>
- if (param->rc.aqMode == X265_AQ_NONE || param->rc.aqStrength == 0)<br>
+ if ((param->rc.aqMode == X265_AQ_NONE || param->rc.aqStrength == 0) || (param->rc.bStatRead && param->rc.cuTree && IS_REFERENCED(curFrame)))<br>
{<br>
/* Need to init it anyways for CU tree */<br>
int cuCount = blockCount;<br>
@@ -984,9 +984,7 @@<br>
m_lock.release();<br>
<br>
preFrame->m_lowres.init(<wbr>preFrame->m_fencPic, preFrame->m_poc);<br>
- if (m_lookahead.m_param->rc.<wbr>bStatRead && m_lookahead.m_param->rc.cuTree && IS_REFERENCED(preFrame))<br>
- /* cu-tree offsets were read from stats file */;<br>
- else if (m_lookahead.m_bAdaptiveQuant)<br>
+ if (m_lookahead.m_bAdaptiveQuant)<br>
tld.calcAdaptiveQuantFrame(<wbr>preFrame, m_lookahead.m_param);<br>
tld.lowresIntraEstimate(<wbr>preFrame->m_lowres, m_lookahead.m_param->rc.<wbr>qgSize);<br>
preFrame->m_lowresInit = true;<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 class="gmail_extra">Pushed to stable.</div></div>