Changeset 1286 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

port rev 4321

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• Lib/TLibCommon/Debug.cpp (modified) (1 diff)
• Lib/TLibCommon/Debug.h (modified) (1 diff)
• Lib/TLibCommon/SEI.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecEntropy.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncEntropy.cpp (modified) (4 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncSbac.cpp (modified) (1 diff)

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

@@ -36 +36 @@
 */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <cassert>

branches/SHM-dev/source/Lib/TLibCommon/Debug.cpp

@@ -192 +192 @@
 
 UInt  g_debugCounter  = 0;
-Bool  g_printDebug    = false;
-Void* g_debugAddr     = NULL;
 
 #ifdef DEBUG_ENCODER_SEARCH_BINS

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

@@ -120 +120 @@
 //Debugging
 
-extern Bool g_bFinalEncode;
 extern UInt g_debugCounter;
-extern Bool g_printDebug;
-extern Void* g_debugAddr;
 
 #ifdef DEBUG_ENCODER_SEARCH_BINS

branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp

@@ -38 +38 @@
 #include "CommonDef.h"
 #include "SEI.h"
-
-//Table D-7 Meaning of camera iso sensitivity indicator and exposure index rating indicator
-Int  Table_exp_indicator[32] = {0, 10, 12, 16, 20, 25, 32, 40, 50, 64, 80, 100, 125, 160, 200, 250, 320, 400, 500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 8000, -1};
 
 SEIMessages getSeisByType(SEIMessages &seiList, SEI::PayloadType seiType)

branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -44 +44 @@
 static const Bool bDebugRQT = DebugOptionList::DebugRQT.getInt()!=0;
 static const Bool bDebugPredEnabled = DebugOptionList::DebugPred.getInt()!=0;
-Bool g_bFinalEncode=true;
 #endif
 

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