Changeset 1326 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

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

Author:

seregin

Message:

port rev 4404

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (1 diff)
• TAppEncCfg.h (modified) (3 diffs)
• TAppEncTop.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 ========