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

Timestamp:

17 Jul 2015, 01:01:01 (10 years ago)

Author:

seregin

Message:

port rev 4321

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncEntropy.cpp (modified) (4 diffs)
• TEncGOP.cpp (modified) (3 diffs)
• TEncSbac.cpp (modified) (1 diff)

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

@@ -217 +217 @@
   const UInt uiDepth = rTu.GetTransformDepthTotal();
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-  const Bool bDebugRQT=g_bFinalEncode && DebugOptionList::DebugRQT.getInt()!=0;
+  const Bool bDebugRQT=pcCU->getSlice()->getFinalized() && DebugOptionList::DebugRQT.getInt()!=0;
   if (bDebugRQT)
   {
@@ -421 +421 @@
 
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-  if (bDebugPredEnabled && g_bFinalEncode)
+  if (bDebugPredEnabled && pcCU->getSlice()->getFinalized())
   {
     UInt cdir=pcCU->getIntraDir(CHANNEL_TYPE_CHROMA, uiAbsPartIdx);
@@ -467 +467 @@
 {
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-  const Bool bDebugPred = bDebugPredEnabled && g_bFinalEncode;
+  const Bool bDebugPred = bDebugPredEnabled && pcCU->getSlice()->getFinalized();
 #endif
 
@@ -625 +625 @@
 {
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-  const Bool bDebugRQT=g_bFinalEncode && DebugOptionList::DebugRQT.getInt()!=0;
+  const Bool bDebugRQT=pcCU->getSlice()->getFinalized() && DebugOptionList::DebugRQT.getInt()!=0;
 #endif
 

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

@@ -58 +58 @@
 using namespace std;
 
-#if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-Bool g_bFinalEncode = false;
-#endif
-
-
 //! \ingroup TLibEncoder
 //! \{
@@ -2605 +2600 @@
       pcSlice->setFinalized(true);
 
-#if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-      g_bFinalEncode = true;
-#endif
-
       pcSlice->clearSubstreamSizes(  );
       {
@@ -2615 +2606 @@
         binCountsInNalUnits+=numBinsCoded;
       }
-
-#if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-      g_bFinalEncode = false;
-#endif
 
       {

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

@@ -1538 +1538 @@
   }
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
-  printSBACCoeffData(posLastX, posLastY, uiWidth, uiHeight, compID, uiAbsPartIdx, codingParameters.scanType, pcCoef, g_bFinalEncode);
+  printSBACCoeffData(posLastX, posLastY, uiWidth, uiHeight, compID, uiAbsPartIdx, codingParameters.scanType, pcCoef, pcCU->getSlice()->getFinalized());
 #endif