Changeset 1335 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

22 Jul 2015, 02:37:09 (10 years ago)

Author:

seregin

Message:

port rev 4413

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• AnnexBread.h (modified) (1 diff)
• NALread.h (modified) (1 diff)
• TDecBinCoderCABAC.cpp (modified) (2 diffs)
• TDecCu.cpp (modified) (12 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/AnnexBread.h

@@ -46 +46 @@
 #include <vector>
 
-#include "TLibCommon/TypeDef.h"
+#include "TLibCommon/CommonDef.h"
 
 //! \ingroup TLibDecoder

branches/SHM-dev/source/Lib/TLibDecoder/NALread.h

@@ -42 +42 @@
 #define __NALREAD__
 
-#include "TLibCommon/TypeDef.h"
+#include "TLibCommon/CommonDef.h"
 #include "TLibCommon/TComBitStream.h"
 #include "TLibCommon/NAL.h"

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

@@ -111 +111 @@
 #endif
 {
-#ifdef DEBUG_CABAC_BINS
+#if DEBUG_CABAC_BINS
   const UInt startingRange = m_uiRange;
 #endif
@@ -161 +161 @@
   }
 
-#ifdef DEBUG_CABAC_BINS
+#if DEBUG_CABAC_BINS
   if ((g_debugCounter + debugCabacBinWindow) >= debugCabacBinTargetLine)
   {

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

@@ -457 +457 @@
   }
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   const PredMode predMode=m_ppcCU[uiDepth]->getPredictionMode(0);
   if (DebugOptionList::DebugString_Structure.getInt()&DebugStringGetPredModeMask(predMode))
@@ -482 +482 @@
   m_pcPrediction->motionCompensation( pcCU, m_ppcYuvReco[uiDepth] );
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   const Int debugPredModeMask=DebugStringGetPredModeMask(MODE_INTER);
   if (DebugOptionList::DebugString_Pred.getInt()&debugPredModeMask)
@@ -493 +493 @@
   xDecodeInterTexture( pcCU, uiDepth );
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   if (DebugOptionList::DebugString_Resi.getInt()&debugPredModeMask)
   {
@@ -513 +513 @@
     m_ppcYuvReco[uiDepth]->copyPartToPartYuv( m_ppcYuvReco[uiDepth],0, pcCU->getWidth( 0 ),pcCU->getHeight( 0 ));
   }
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   if (DebugOptionList::DebugString_Reco.getInt()&debugPredModeMask)
   {
@@ -578 +578 @@
   const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, pcCU->getSlice()->getSPS()->getSpsRangeExtension().getIntraSmoothingDisabledFlag());
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   std::ostream &ss(std::cout);
 #endif
@@ -590 +590 @@
   m_pcPrediction->predIntraAng( compID,   uiChFinalMode, 0 /* Decoder does not have an original image */, 0, piPred, uiStride, rTu, bAboveAvail, bLeftAvail, bUseFilteredPredictions );
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   ss << sTemp;
 #endif
@@ -602 +602 @@
 
   DEBUG_STRING_NEW(sDebug);
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   const Int debugPredModeMask=DebugStringGetPredModeMask(MODE_INTRA);
   std::string *psDebug=(DebugOptionList::DebugString_InvTran.getInt()&debugPredModeMask) ? &sDebug : 0;
@@ -622 +622 @@
   }
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   if (psDebug)
   {
@@ -642 +642 @@
 
 
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
   const Bool bDebugPred=((DebugOptionList::DebugString_Pred.getInt()&debugPredModeMask) && DEBUG_STRING_CHANNEL_CONDITION(compID));
   const Bool bDebugResi=((DebugOptionList::DebugString_Resi.getInt()&debugPredModeMask) && DEBUG_STRING_CHANNEL_CONDITION(compID));
@@ -668 +668 @@
   for( UInt uiY = 0; uiY < uiHeight; uiY++ )
   {
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
     if (bDebugPred || bDebugResi || bDebugReco)
     {
@@ -690 +690 @@
     for( UInt uiX = 0; uiX < uiWidth; uiX++ )
     {
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
       if (bDebugResi)
       {
@@ -703 +703 @@
       pRecIPred[ uiX ] = pReco[ uiX ];
     }
-#ifdef DEBUG_STRING
+#if DEBUG_STRING
     if (bDebugReco)
     {