Changeset 1326 in SHVCSoftware

Timestamp:

22 Jul 2015, 00:42:03 (9 years ago)

Author:

seregin

Message:

port rev 4404

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.h (modified) (3 diffs)
• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/CommonDef.h (modified) (1 diff)
• Lib/TLibEncoder/TEncCfg.h (modified) (3 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1286 +1286 @@
   ("BipredSearchRange",                               m_bipredSearchRange,                                  4, "Motion search range for bipred refinement")
   ("ClipForBiPredMEEnabled",                          m_bClipForBiPredMeEnabled,                        false, "Enables clipping in the Bi-Pred ME. It is disabled to reduce encoder run-time")
+  ("FastMEAssumingSmootherMVEnabled",                 m_bFastMEAssumingSmootherMVEnabled,                true, "Enables fast ME assuming a smoother MV.")
+
   ("HadamardME",                                      m_bUseHADME,                                       true, "Hadamard ME for fractional-pel")
   ("ASR",                                             m_bUseASR,                                        false, "Adaptive motion search range")

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -86 +86 @@
   std::vector<Int>                m_numOutputLayersInOutputLayerSet;
   std::vector< std::vector<Int> > m_listOfOutputLayers;
-  Bool      m_isField;                                        ///< enable field coding
-  Bool      m_isTopFieldFirst;
-  Bool      m_bEfficientFieldIRAPEnabled;                     ///< enable an efficient field IRAP structure.
 #else
   Char*     m_pchInputFile;                                   ///< source file name
@@ -101 +98 @@
 
   Int       m_iSourceHeightOrg;                               ///< original source height in pixel (when interlaced = frame height)
-
+#endif
   Bool      m_isField;                                        ///< enable field coding
   Bool      m_isTopFieldFirst;
   Bool      m_bEfficientFieldIRAPEnabled;                     ///< enable an efficient field IRAP structure.
 
+#if !SVC_EXTENSION
   Int       m_conformanceWindowMode;
   Int       m_confWinLeft;
@@ -279 +277 @@
   Int       m_bipredSearchRange;                              ///< ME search range for bipred refinement
   Bool      m_bClipForBiPredMeEnabled;                        ///< Enables clipping for Bi-Pred ME.
+  Bool      m_bFastMEAssumingSmootherMVEnabled;               ///< Enables fast ME assuming a smoother MV.
   Bool      m_bUseFastEnc;                                    ///< flag for using fast encoder setting
   Bool      m_bUseEarlyCU;                                    ///< flag for using Early CU setting

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -410 +410 @@
     m_acTEncTop[layer].setBipredSearchRange                                ( m_bipredSearchRange );
     m_acTEncTop[layer].setClipForBiPredMeEnabled                           ( m_bClipForBiPredMeEnabled );
+    m_acTEncTop[layer].setFastMEAssumingSmootherMVEnabled                  ( m_bFastMEAssumingSmootherMVEnabled );
 
     //====== Quality control ========
@@ -848 +849 @@
   m_cTEncTop.setBipredSearchRange                                 ( m_bipredSearchRange );
   m_cTEncTop.setClipForBiPredMeEnabled                            ( m_bClipForBiPredMeEnabled );
+  m_cTEncTop.setFastMEAssumingSmootherMVEnabled                   ( m_bFastMEAssumingSmootherMVEnabled );
 
   //====== Quality control ========

branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

@@ -207 +207 @@
 #endif
 
-// Fast ME using smoother MV assumption
-#define FASTME_SMOOTHER_MV          1           ///< reduce ME time using faster option
-
 // Adaptive search range depending on POC difference
 #define ADAPT_SR_SCALE              1           ///< division factor for adaptive search range

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

@@ -173 +173 @@
   Int       m_bipredSearchRange;
   Bool      m_bClipForBiPredMeEnabled;
+  Bool      m_bFastMEAssumingSmootherMVEnabled;
 
   //====== Quality control ========
@@ -548 +549 @@
   Void      setBipredSearchRange            ( Int   i )      { m_bipredSearchRange = i; }
   Void      setClipForBiPredMeEnabled       ( Bool  b )      { m_bClipForBiPredMeEnabled = b; }
+  Void      setFastMEAssumingSmootherMVEnabled ( Bool b )    { m_bFastMEAssumingSmootherMVEnabled = b; }
 
   //====== Quality control ========
@@ -613 +615 @@
   Int       getSearchRange                  () const { return m_iSearchRange; }
   Bool      getClipForBiPredMeEnabled       () const { return m_bClipForBiPredMeEnabled; }
+  Bool      getFastMEAssumingSmootherMVEnabled ( ) const { return m_bFastMEAssumingSmootherMVEnabled; }
 
   //==== Quality control ========

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

@@ -295 +295 @@
 }
 
-#if FASTME_SMOOTHER_MV
-#define FIRSTSEARCHSTOP     1
-#else
-#define FIRSTSEARCHSTOP     0
-#endif
-
 #define TZ_SEARCH_CONFIGURATION                                                                                 \
 const Int  iRaster                  = 5;  /* TZ soll von aussen ?ergeben werden */                            \
@@ -308 +302 @@
 const Bool bTestZeroVectorStop      = 0;                                                                      \
 const Bool bFirstSearchDiamond      = 1;  /* 1 = xTZ8PointDiamondSearch   0 = xTZ8PointSquareSearch */        \
-const Bool bFirstSearchStop         = FIRSTSEARCHSTOP;                                                        \
+const Bool bFirstSearchStop         = m_pcEncCfg->getFastMEAssumingSmootherMVEnabled();                       \
 const UInt uiFirstSearchRounds      = 3;  /* first search stop X rounds after best match (must be >=1) */     \
 const Bool bEnableRasterSearch      = 1;                                                                      \