Changeset 1405 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

4 Aug 2015, 04:10:12 (9 years ago)

Author:

seregin

Message:

port rev 4558

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (3 diffs)
• TEncSearch.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -181 +181 @@
   Bool      m_bFastMEAssumingSmootherMVEnabled;
   Int       m_minSearchWindow;
+  Bool      m_bRestrictMESampling;
 
   //====== Quality control ========
@@ -568 +569 @@
   Void      setFastMEAssumingSmootherMVEnabled ( Bool b )    { m_bFastMEAssumingSmootherMVEnabled = b; }
   Void      setMinSearchWindow              ( Int   i )      { m_minSearchWindow = i; }
+  Void      setRestrictMESampling           ( Bool  b )      { m_bRestrictMESampling = b; }
 
   //====== Quality control ========
@@ -641 +643 @@
   Bool      getFastMEAssumingSmootherMVEnabled () const { return m_bFastMEAssumingSmootherMVEnabled; }
   Int       getMinSearchWindow                 () const { return m_minSearchWindow; }
+  Bool      getRestrictMESampling              () const { return m_bRestrictMESampling; }
 
   //==== Quality control ========

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -340 +340 @@
   m_cDistParam.m_maximumDistortionForEarlyExit = rcStruct.uiBestSad;
 
-  if(m_pcEncCfg->getFastSearch() == SELECTIVE)
+  if((m_pcEncCfg->getRestrictMESampling() == false) && m_pcEncCfg->getFastSearch() == SELECTIVE)
   {
     Int isubShift = 0;