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

Timestamp:

4 Aug 2015, 03:26:38 (9 years ago)

Author:

seregin

Message:

port rev 4550

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (6 diffs)

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

@@ -386 +386 @@
   // distortion
   m_cDistParam.bitDepth = pcPatternKey->getBitDepthY();
+  m_cDistParam.m_maximumDistortionForEarlyExit = rcStruct.uiBestSad;
+
   if(m_pcEncCfg->getFastSearch() == SELECTIVE)
   {
@@ -439 +441 @@
           rcStruct.uiBestRound    = 0;
           rcStruct.ucPointNr      = ucPointNr;
+          m_cDistParam.m_maximumDistortionForEarlyExit = uiSad;
         }
       }
@@ -458 +461 @@
       rcStruct.uiBestRound    = 0;
       rcStruct.ucPointNr      = ucPointNr;
+      m_cDistParam.m_maximumDistortionForEarlyExit = uiSad;
     }
   }
@@ -882 +886 @@
       uiDistBest  = uiDist;
       uiDirecBest = i;
+      m_cDistParam.m_maximumDistortionForEarlyExit = uiDist;
     }
   }
@@ -3404 +3409 @@
             }
           }
-#if (ENCODER_FAST_MODE)
+#if ENCODER_FAST_MODE
           }
 #endif
         }
-#if (ENCODER_FAST_MODE)
+#if ENCODER_FAST_MODE
         } // for loop-iRefIdxTemp
 #endif
@@ -4064 +4069 @@
         iBestX    = x;
         iBestY    = y;
+        m_cDistParam.m_maximumDistortionForEarlyExit = uiSad;
       }
     }