[x265-commits] [x265] Merge with stable

[Ashok Kumar Mishra]

details:   http://hg.videolan.org/x265/rev/1fb5ee43be2f
branches:  
changeset: 12010:1fb5ee43be2f
user:      Ashok Kumar Mishra <ashok at multicorewareinc.com>
date:      Fri Mar 23 16:14:47 2018 +0530
description:
Merge with stable

diffstat:

 source/common/cudata.cpp   |  14 +-------------
 source/encoder/encoder.cpp |   6 ++++++
 2 files changed, 7 insertions(+), 13 deletions(-)

diffs (47 lines):

diff -r 2e370d98c806 -r 1fb5ee43be2f source/common/cudata.cpp
--- a/source/common/cudata.cpp	Fri Mar 23 15:51:41 2018 +0530
+++ b/source/common/cudata.cpp	Fri Mar 23 16:14:47 2018 +0530
@@ -1636,11 +1636,6 @@ uint32_t CUData::getInterMergeCandidates
                 dir |= (1 << list);
                 candMvField[count][list].mv = colmv;
                 candMvField[count][list].refIdx = refIdx;
-                if (m_encData->m_param->scaleFactor && m_encData->m_param->analysisSave && m_log2CUSize[0] < 4)
-                {
-                    MV dist(MAX_MV, MAX_MV);
-                    candMvField[count][list].mv = dist;
-                }
             }
         }
 
@@ -1800,14 +1795,7 @@ int CUData::getPMV(InterNeighbourMV *nei
 
             int curRefPOC = m_slice->m_refPOCList[picList][refIdx];
             int curPOC = m_slice->m_poc;
-
-            if (m_encData->m_param->scaleFactor && m_encData->m_param->analysisSave && (m_log2CUSize[0] < 4))
-            {
-                MV dist(MAX_MV, MAX_MV);
-                pmv[numMvc++] = amvpCand[num++] = dist;
-            }
-            else
-                pmv[numMvc++] = amvpCand[num++] = scaleMvByPOCDist(neighbours[MD_COLLOCATED].mv[picList], curPOC, curRefPOC, colPOC, colRefPOC);
+            pmv[numMvc++] = amvpCand[num++] = scaleMvByPOCDist(neighbours[MD_COLLOCATED].mv[picList], curPOC, curRefPOC, colPOC, colRefPOC);
         }
     }
 
diff -r 2e370d98c806 -r 1fb5ee43be2f source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Fri Mar 23 15:51:41 2018 +0530
+++ b/source/encoder/encoder.cpp	Fri Mar 23 16:14:47 2018 +0530
@@ -2721,6 +2721,12 @@ void Encoder::configure(x265_param *p)
         }
     }
 
+    if (p->scaleFactor && p->analysisLoad && !p->interRefine)
+    {
+        x265_log(p, X265_LOG_WARNING, "Inter refinement 0 is not supported with scaling. Enabling refine-inter 1.\n");
+        p->interRefine = 1;
+    }
+
     if (p->limitTU && (p->interRefine || p->bDynamicRefine))
     {
         x265_log(p, X265_LOG_WARNING, "Inter refinement does not support limitTU. Disabling limitTU.\n");