[x265] [PATCH] analysis: fix bug in early skip for rdLevels 5,6

[deepthi at multicorewareinc.com]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1450375078 -19800
#      Thu Dec 17 23:27:58 2015 +0530
# Node ID e92e90cf85322a3ed41ec7f2349923319df05e97
# Parent  59f686fcc5584535bd2a980cd8a42d81c39fe9c9
analysis: fix bug in early skip for rdLevels 5,6

diff -r 59f686fcc558 -r e92e90cf8532 source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp	Wed Dec 16 09:08:00 2015 +0530
+++ b/source/encoder/analysis.cpp	Thu Dec 17 23:27:58 2015 +0530
@@ -1339,7 +1339,7 @@
         md.pred[PRED_SKIP].cu.initSubCU(parentCTU, cuGeom, qp);
         md.pred[PRED_MERGE].cu.initSubCU(parentCTU, cuGeom, qp);
         checkMerge2Nx2N_rd5_6(md.pred[PRED_SKIP], md.pred[PRED_MERGE], cuGeom, false);
-        foundSkip = md.bestMode && !md.bestMode->cu.getQtRootCbf(0);
+        foundSkip = m_param->bEnableEarlySkip && md.bestMode && !md.bestMode->cu.getQtRootCbf(0);
     }
 
     // estimate split cost
@@ -1403,7 +1403,7 @@
         if (m_slice->m_pps->bUseDQP && depth <= m_slice->m_pps->maxCuDQPDepth && m_slice->m_pps->maxCuDQPDepth != 0)
             setLambdaFromQP(parentCTU, qp);
 
-        if (!(foundSkip && m_param->bEnableEarlySkip))
+        if (!foundSkip)
         {
             uint32_t refMasks[2];
             refMasks[0] = allSplitRefs;