changeset 5510:e44315ab36b9

Enable topskip and earlyexit for all rd levels <= 4 (output changes for presets faster than "slow") Also use the encodeResandCalcRDInter instead of the refactored estimate function.
author Deepthi Devaki <deepthidevaki@multicorewareinc.com>
date Wed, 04 Dec 2013 13:04:39 +0530
parents c8ca8c93083b
children 6694ef611b41
files source/encoder/compress.cpp
diffstat 1 files changed, 4 insertions(+-), 4 deletions(-) [+]
line wrap: on
line diff
--- a/source/encoder/compress.cpp	Thu Dec 05 01:32:44 2013 -0600
+++ b/source/encoder/compress.cpp	Wed Dec 04 13:04:39 2013 +0530
@@ -26,8 +26,8 @@
 
 /* Lambda Partition Select adjusts the threshold value for Early Exit in No-RDO flow */
 #define LAMBDA_PARTITION_SELECT     0.9
-#define EARLY_EXIT                  0
-#define TOPSKIP                     0
+#define EARLY_EXIT                  1
+#define TOPSKIP                     1
 
 using namespace x265;
 
@@ -314,7 +314,7 @@ void TEncCu::xComputeCostMerge2Nx2N(TCom
     m_tmpRecoYuv[depth] = yuv;
 
     //Encode with residue
-    m_search->estimateRDInterCU(outTempCU, m_origYuv[depth], bestPredYuv, m_tmpResiYuv[depth], m_bestResiYuv[depth], m_tmpRecoYuv[depth], false);
+    m_search->encodeResAndCalcRdInterCU(outTempCU, m_origYuv[depth], bestPredYuv, m_tmpResiYuv[depth], m_bestResiYuv[depth], m_tmpRecoYuv[depth], false);
     xCheckDQP(outTempCU);
 
     if (outTempCU->m_totalCost < outBestCU->m_totalCost)    //Choose best from no-residue mode and residue mode
@@ -485,7 +485,7 @@ void TEncCu::xCompressInterCU(TComDataCU
                     m_search->motionCompensation(outBestCU, m_bestPredYuv[depth], REF_PIC_LIST_X, partIdx, false, true);
                 }
 
-                m_search->estimateRDInterCU(outBestCU, m_origYuv[depth], m_bestPredYuv[depth], m_tmpResiYuv[depth],
+                m_search->encodeResAndCalcRdInterCU(outBestCU, m_origYuv[depth], m_bestPredYuv[depth], m_tmpResiYuv[depth],
                                             m_bestResiYuv[depth], m_bestRecoYuv[depth], false);
                 xCheckDQP(outBestCU);