<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 15, 2018 at 5:24 PM, <span dir="ltr"><<a href="mailto:bhavna@multicorewareinc.com" target="_blank">bhavna@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 Bhavna Hariharan <<a href="mailto:bhavna@multicorewareinc.com">bhavna@multicorewareinc.com</a>><br>
# Date 1529048000 -19800<br>
# Fri Jun 15 13:03:20 2018 +0530<br>
# Node ID 34c3cf4263bddb1caab8c5c8088ae4<wbr>614d432e35<br>
# Parent dac90ba6690a118b6e5aa4e7999e0a<wbr>bbbf06ee24<br>
analysis: fix validation conditon for save/load encodes<br>
<br>
diff -r dac90ba6690a -r 34c3cf4263bd source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Mon Jun 11 14:51:02 2018 +0530<br>
+++ b/source/encoder/encoder.cpp Fri Jun 15 13:03:20 2018 +0530<br>
@@ -4113,10 +4113,12 @@<br>
if (!isScaledRes && (sourceHeight != curSourceHeight || sourceWidth != curSourceWidth <br>
|| readValue != (int)m_param->maxCUSize || m_param->scaleFactor))<br>
error = true;<br>
- else if (isScaledRes && (!m_param->scaleFactor || (g_log2Size[m_param-><wbr>maxCUSize] - g_log2Size[readValue]) != 1))<br>
+ else if (isScaledRes && !m_param->scaleFactor)<br>
error = true;<br>
else if (isScaledRes && (int)m_param->maxCUSize == readValue)<br>
m_saveCTUSize = 1;<br>
+ else if (isScaledRes && (g_log2Size[m_param-><wbr>maxCUSize] - g_log2Size[readValue]) != 1)<br>
+ error = true;<br>
<br>
if (error)<br>
{<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.</div></div>