<div dir="ltr">Pushed to default.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jan 20, 2020 at 6:16 PM Aruna Matheswaran <<a href="mailto:aruna@multicorewareinc.com">aruna@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"># HG changeset patch<br>
# User Aruna Matheswaran <<a href="mailto:aruna@multicorewareinc.com" target="_blank">aruna@multicorewareinc.com</a>><br>
# Date 1579523879 -19800<br>
#      Mon Jan 20 18:07:59 2020 +0530<br>
# Node ID acc5d16999e2faf6e75ecc1df9a01c1953ebaf8c<br>
# Parent  8e6db24c1517f6f160f0e7e62deba44fc2b69d88<br>
analysis-save/load: fix crash during analysis sharing between non-dyadic<br>
resolutions.<br>
<br>
diff -r 8e6db24c1517 -r acc5d16999e2 source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp        Mon Jan 06 23:08:36 2020 +0530<br>
+++ b/source/encoder/encoder.cpp        Mon Jan 20 18:07:59 2020 +0530<br>
@@ -3780,9 +3780,10 @@<br>
                 x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data. Conformance window right offset missing\n");<br>
                 m_aborted = true;<br>
             }<br>
-            else if (m_conformanceWindow.rightOffset)<br>
+            else if (m_conformanceWindow.rightOffset && p->analysisLoadReuseLevel > 1)<br>
             {<br>
-                padsize = m_conformanceWindow.rightOffset * 2;<br>
+                int scaleFactor = p->scaleFactor < 2 ? 1 : p->scaleFactor;<br>
+                padsize = m_conformanceWindow.rightOffset * scaleFactor;<br>
                 p->sourceWidth += padsize;<br>
                 m_conformanceWindow.bEnabled = true;<br>
                 m_conformanceWindow.rightOffset = padsize;<br>
@@ -3793,9 +3794,10 @@<br>
                 x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data. Conformance window bottom offset missing\n");<br>
                 m_aborted = true;<br>
             }<br>
-            else if (m_conformanceWindow.bottomOffset)<br>
+            else if (m_conformanceWindow.bottomOffset && p->analysisLoadReuseLevel > 1)<br>
             {<br>
-                padsize = m_conformanceWindow.bottomOffset * 2;<br>
+                int scaleFactor = p->scaleFactor < 2 ? 1 : p->scaleFactor;<br>
+                padsize = m_conformanceWindow.bottomOffset * scaleFactor;<br>
                 p->sourceHeight += padsize;<br>
                 m_conformanceWindow.bEnabled = true;<br>
                 m_conformanceWindow.bottomOffset = padsize;<br>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><font face="georgia, serif">Regards,</font><div><b><font face="georgia, serif">Aruna Matheswaran,</font></b></div><div><font face="georgia, serif">Video Codec Engineer,</font></div><div><font face="georgia, serif">Media & AI analytics BU,</font></div><div><span><span style="font-size:11pt;font-family:Arial;color:rgb(0,0,0);background-color:transparent;vertical-align:baseline;white-space:pre-wrap"><span style="border:none;display:inline-block;overflow:hidden;width:153px;height:58px"><img src="https://lh5.googleusercontent.com/gjX5cPNIZgwUrhfqkTwQUZWztIKmmo0qs3kbwvkS5H-bDVE2ftte9pMTVnFLSjOcjYWLtfc6_OGpxW4vraLg2r5QAIf1Q3MpldFDgWtzK_gXi8ptw5B3joIbsGL6mxj-JRdjHzT5" width="96" height="36" style="margin-left: 0px; margin-top: 0px;"></span></span></span><font face="georgia, serif"><br></font></div><div><span><span style="font-size:11pt;font-family:Arial;color:rgb(0,0,0);background-color:transparent;vertical-align:baseline;white-space:pre-wrap"><span style="border:none;display:inline-block;overflow:hidden;width:153px;height:58px"><img src="https://lh5.googleusercontent.com/gjX5cPNIZgwUrhfqkTwQUZWztIKmmo0qs3kbwvkS5H-bDVE2ftte9pMTVnFLSjOcjYWLtfc6_OGpxW4vraLg2r5QAIf1Q3MpldFDgWtzK_gXi8ptw5B3joIbsGL6mxj-JRdjHzT5" style="margin-left: 0px; margin-top: 0px;"></span></span></span><font face="georgia, serif"><br></font></div><div><font face="georgia, serif"><br></font></div></div></div></div></div></div></div></div></div>