Changeset 1246 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

14 Jul 2015, 00:26:07 (9 years ago)

Author:

seregin

Message:

port rev 4240

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp (modified) (12 diffs)

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

@@ -485 +485 @@
 #ifdef DEBUG_STRING
   const Int debugPredModeMask=DebugStringGetPredModeMask(MODE_INTER);
-  if (DebugOptionList::DebugString_Pred.getInt()&debugPredModeMask) printBlockToStream(std::cout, "###inter-pred: ", *(m_ppcYuvReco[uiDepth]));
+  if (DebugOptionList::DebugString_Pred.getInt()&debugPredModeMask)
+  {
+    printBlockToStream(std::cout, "###inter-pred: ", *(m_ppcYuvReco[uiDepth]));
+  }
 #endif
 
@@ -492 +495 @@
 
 #ifdef DEBUG_STRING
-  if (DebugOptionList::DebugString_Resi.getInt()&debugPredModeMask) printBlockToStream(std::cout, "###inter-resi: ", *(m_ppcYuvResi[uiDepth]));
+  if (DebugOptionList::DebugString_Resi.getInt()&debugPredModeMask)
+  {
+    printBlockToStream(std::cout, "###inter-resi: ", *(m_ppcYuvResi[uiDepth]));
+  }
 #endif
 
@@ -505 +511 @@
   }
 #ifdef DEBUG_STRING
-  if (DebugOptionList::DebugString_Reco.getInt()&debugPredModeMask) printBlockToStream(std::cout, "###inter-reco: ", *(m_ppcYuvReco[uiDepth]));
+  if (DebugOptionList::DebugString_Reco.getInt()&debugPredModeMask)
+  {
+    printBlockToStream(std::cout, "###inter-reco: ", *(m_ppcYuvReco[uiDepth]));
+  }
 #endif
 
@@ -518 +527 @@
                             TComTU     &rTu)
 {
-  if (!rTu.ProcessComponentSection(compID)) return;
+  if (!rTu.ProcessComponentSection(compID))
+  {
+    return;
+  }
   const Bool       bIsLuma = isLuma(compID);
 
@@ -544 +556 @@
     {
       xIntraRecBlk(pcRecoYuv, pcPredYuv, pcResiYuv, compID, subTURecurse);
-    }
-    while (subTURecurse.nextSection(rTu));
+    } while (subTURecurse.nextSection(rTu));
 
     //------------------------------------------------
@@ -598 +609 @@
   {
     for (UInt y = 0; y < uiHeight; y++)
+    {
       for (UInt x = 0; x < uiWidth; x++)
       {
         piResi[(y * uiStride) + x] = 0;
       }
+    }
   }
 
 #ifdef DEBUG_STRING
   if (psDebug)
+  {
     ss << (*psDebug);
+  }
 #endif
 
@@ -627 +642 @@
   const Bool bDebugReco=((DebugOptionList::DebugString_Reco.getInt()&debugPredModeMask) && DEBUG_STRING_CHANNEL_CONDITION(compID));
   if (bDebugPred || bDebugResi || bDebugReco)
+  {
     ss << "###: " << "CompID: " << compID << " pred mode (ch/fin): " << uiChPredMode << "/" << uiChFinalMode << " absPartIdx: " << rTu.GetAbsPartIdxTU() << std::endl;
+  }
 #endif
 
@@ -643 +660 @@
   {
 #ifdef DEBUG_STRING
-    if (bDebugPred || bDebugResi || bDebugReco) ss << "###: ";
+    if (bDebugPred || bDebugResi || bDebugReco)
+    {
+      ss << "###: ";
+    }
 
     if (bDebugPred)
@@ -653 +673 @@
       }
     }
-    if (bDebugResi) ss << " - resi: ";
+    if (bDebugResi)
+    {
+      ss << " - resi: ";
+    }
 #endif
 
@@ -660 +683 @@
 #ifdef DEBUG_STRING
       if (bDebugResi)
+      {
         ss << pResi[ uiX ] << ", ";
+      }
 #endif
 #if O0043_BEST_EFFORT_DECODING
@@ -680 +705 @@
 
     if (bDebugPred || bDebugResi || bDebugReco)
+    {
       ss << "\n";
+    }
 #endif
     pPred     += uiStride;
@@ -742 +769 @@
   {
     if (isLuma(chType))
+    {
       xIntraRecBlk( pcRecoYuv, pcPredYuv, pcResiYuv, COMPONENT_Y,  rTu );
+    }
     else
     {