<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 23, 2018 at 3:09 PM, Bhavna Hariharan <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"><div dir="ltr">This patch is for the stable branch. Could you please try applying it on changeset <span style="white-space:pre-wrap;font-family:monospace;font-size:9pt">11993 (22c127ff05d5)</span><span style="white-space:pre-wrap"> Fix 32 bit build error ( using </span>CMAKE<span style="white-space:pre-wrap"> GUI) in Linux?</span><div class="gmail_extra"><br clear="all"><div><div class="m_4195943867051762823m_7665181373929253982gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><br>Thanks,<br><br>Bhavna Hariharan<br></div></div></div></div></div></div></div><div><div class="h5">
<br><div class="gmail_quote">On Fri, Mar 23, 2018 at 3:05 PM, Ashok Kumar Mishra <span dir="ltr"><<a href="mailto:ashok@multicorewareinc.com" target="_blank">ashok@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="m_4195943867051762823m_7665181373929253982h5">On Fri, Mar 23, 2018 at 2:14 PM, <span dir="ltr"><<a href="mailto:bhavna@multicorewareinc.com" target="_blank">bhavna@multicorewareinc.com</a>></span> wrote:<br></div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="m_4195943867051762823m_7665181373929253982h5"># HG changeset patch<br>
# User Bhavna Hariharan <<a href="mailto:bhavna@multicorewareinc.com" target="_blank">bhavna@multicorewareinc.com</a>><br>
# Date 1521693438 -19800<br>
# Thu Mar 22 10:07:18 2018 +0530<br>
# Branch stable<br>
# Node ID e1280b17edf7b3ff22a8a45fed9358<wbr>96802909b4<br>
# Parent 22c127ff05d593cbe420f1cb4a57c3<wbr>9d5a885957<br>
Deprecate support for refine inter 0 for scaled encodes.<br>
<br>
diff -r 22c127ff05d5 -r e1280b17edf7 source/common/cudata.cpp<br>
--- a/source/common/cudata.cpp Thu Mar 01 15:35:06 2018 +0530<br>
+++ b/source/common/cudata.cpp Thu Mar 22 10:07:18 2018 +0530<br>
@@ -1626,11 +1626,6 @@<br>
dir |= (1 << list);<br>
candMvField[count][list].mv = colmv;<br>
candMvField[count][list].refI<wbr>dx = refIdx;<br>
- if (m_encData->m_param->scaleFact<wbr>or && m_encData->m_param->analysisSa<wbr>ve && m_log2CUSize[0] < 4)<br>
- {<br>
- MV dist(MAX_MV, MAX_MV);<br>
- candMvField[count][list].mv = dist;<br>
- }<br>
}<br>
}<br>
<br>
@@ -1790,14 +1785,7 @@<br>
<br>
int curRefPOC = m_slice->m_refPOCList[picList]<wbr>[refIdx];<br>
int curPOC = m_slice->m_poc;<br>
-<br>
- if (m_encData->m_param->scaleFact<wbr>or && m_encData->m_param->analysisSa<wbr>ve && (m_log2CUSize[0] < 4))<br>
- {<br>
- MV dist(MAX_MV, MAX_MV);<br>
- pmv[numMvc++] = amvpCand[num++] = dist;<br>
- }<br>
- else<br>
- pmv[numMvc++] = amvpCand[num++] = scaleMvByPOCDist(neighbours[MD<wbr>_COLLOCATED].mv[picList], curPOC, curRefPOC, colPOC, colRefPOC);<br>
+ pmv[numMvc++] = amvpCand[num++] = scaleMvByPOCDist(neighbours[MD<wbr>_COLLOCATED].mv[picList], curPOC, curRefPOC, colPOC, colRefPOC);<br>
}<br>
}<br>
<br>
diff -r 22c127ff05d5 -r e1280b17edf7 source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Thu Mar 01 15:35:06 2018 +0530<br>
+++ b/source/encoder/encoder.cpp Thu Mar 22 10:07:18 2018 +0530<br>
@@ -2685,6 +2685,12 @@<br>
}<br>
}<br>
<br>
+ if (p->scaleFactor && p->analysisLoad && !p->interRefine)<br>
+ {<br>
+ x265_log(p, X265_LOG_WARNING, "Inter refinement 0 is not supported with scaling. Enabling refine-inter 1.\n");<br>
+ p->interRefine = 1;<br>
+ }<br>
+<br>
if (p->limitTU && p->interRefine)<br>
{<br>
x265_log(p, X265_LOG_WARNING, "Inter refinement does not support limitTU. Disabling limitTU.\n");<br>
<br></div></div>______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/l<wbr>istinfo/x265-devel</a><br>
<br></blockquote></div><br></div><div class="gmail_extra">Unable to apply on latest tip. Please send it again.</div></div>
<br>______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/l<wbr>istinfo/x265-devel</a><br>
<br></blockquote></div><br></div></div></div></div>
<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>