Changeset 117 in 3DVCSoftware for branches/HTM-4.0-Orange/source/Lib/TLibEncoder/TEncSbac.cpp

Timestamp:

30 Aug 2012, 16:24:21 (12 years ago)

Author:

tech

Message:

Cleanup

File:

• branches/HTM-4.0-Orange/source/Lib/TLibEncoder/TEncSbac.cpp (modified) (7 diffs)

branches/HTM-4.0-Orange/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -580 +580 @@
 {
   PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   UInt uiSymbol;
 #endif
@@ -588 +588 @@
     {
       m_pcBinIf->encodeBin( eSize == SIZE_2Nx2N? 1 : 0, m_cCUPartSizeSCModel.get( 0, 0, 0 ) );
-#if OL_DEPTHLIMIT
-                if(pcCU->getPartDumpFlag())
-                {
-                        uiSymbol = (UInt)(eSize == SIZE_2Nx2N? 1 : 0);
-                        pcCU->updatePartInfo(uiSymbol?0:1,uiDepth); //0 for 2Nx2N and 1 for NxN
-                        pcCU->incrementPartInfo();
-                }
-#endif
-    }
-#if OL_DEPTHLIMIT
-        if(pcCU->getPartDumpFlag() && uiDepth < g_uiMaxCUDepth - g_uiAddCUDepth && !pcCU->getSlice()->isIntra())
-        {
-                pcCU->updatePartInfo(0,uiDepth); //0 for 2Nx2N and 1 for NxN
-                pcCU->incrementPartInfo();
-        }
+#if OL_DEPTHLIMIT_A0044
+      if(pcCU->getPartDumpFlag())
+      {
+        uiSymbol = (UInt)(eSize == SIZE_2Nx2N? 1 : 0);
+        pcCU->updatePartInfo(uiSymbol?0:1,uiDepth); //0 for 2Nx2N and 1 for NxN
+        pcCU->incrementPartInfo();
+      }
+#endif
+    }
+#if OL_DEPTHLIMIT_A0044
+    if(pcCU->getPartDumpFlag() && uiDepth < g_uiMaxCUDepth - g_uiAddCUDepth && !pcCU->getSlice()->isIntra())
+    {
+      pcCU->updatePartInfo(0,uiDepth); //0 for 2Nx2N and 1 for NxN
+      pcCU->incrementPartInfo();
+    }
 #endif
     return;
@@ -609 +609 @@
   switch(eSize)
   {
-    case SIZE_2Nx2N:
+  case SIZE_2Nx2N:
     {
       m_pcBinIf->encodeBin( 1, m_cCUPartSizeSCModel.get( 0, 0, 0) );
-#if OL_DEPTHLIMIT
-          if(pcCU->getPartDumpFlag())
-          {
-//              if (!pcCU->isIntra( uiAbsPartIdx ))
-                {
-                        pcCU->updatePartInfo(0,uiDepth); //0 for 2Nx2N
-                        pcCU->incrementPartInfo();
-                }
-          }
+#if OL_DEPTHLIMIT_A0044
+      if(pcCU->getPartDumpFlag())
+      {
+        pcCU->updatePartInfo(0,uiDepth); //0 for 2Nx2N
+        pcCU->incrementPartInfo();
+      }
 #endif
       break;
     }
-    case SIZE_2NxN:
-    case SIZE_2NxnU:
-    case SIZE_2NxnD:
+  case SIZE_2NxN:
+  case SIZE_2NxnU:
+  case SIZE_2NxnD:
     {
       m_pcBinIf->encodeBin( 0, m_cCUPartSizeSCModel.get( 0, 0, 0) );
@@ -651 +648 @@
         }
       }
-#if OL_DEPTHLIMIT
-          if(pcCU->getPartDumpFlag())
-          {
-//              if (!pcCU->isIntra( uiAbsPartIdx ))
-                {
-                        pcCU->updatePartInfo(2,uiDepth); //2 for 2NxN
-                        pcCU->incrementPartInfo();
-                }
-          }
+#if OL_DEPTHLIMIT_A0044
+      if(pcCU->getPartDumpFlag())
+      {
+        pcCU->updatePartInfo(2,uiDepth); //2 for 2NxN
+        pcCU->incrementPartInfo();
+      }
 #endif
       break;
     }
-    case SIZE_Nx2N:
-    case SIZE_nLx2N:
-    case SIZE_nRx2N:
+  case SIZE_Nx2N:
+  case SIZE_nLx2N:
+  case SIZE_nRx2N:
     {
       m_pcBinIf->encodeBin( 0, m_cCUPartSizeSCModel.get( 0, 0, 0) );
@@ -694 +688 @@
         }
       }
-#if OL_DEPTHLIMIT
-          if(pcCU->getPartDumpFlag())
-          {
-//              if (!pcCU->isIntra( uiAbsPartIdx ))
-                {
-                        pcCU->updatePartInfo(3,uiDepth); //3 for Nx2N
-                        pcCU->incrementPartInfo();
-                }
-          }
+#if OL_DEPTHLIMIT_A0044
+      if(pcCU->getPartDumpFlag())
+      {
+        pcCU->updatePartInfo(3,uiDepth); //3 for Nx2N
+        pcCU->incrementPartInfo();
+      }
 #endif
       break;
     }
-    case SIZE_NxN:
+  case SIZE_NxN:
     {
       if( uiDepth == g_uiMaxCUDepth - g_uiAddCUDepth && !( pcCU->getSlice()->getSPS()->getDisInter4x4() && pcCU->getWidth(uiAbsPartIdx) == 8 && pcCU->getHeight(uiAbsPartIdx) == 8 ) )
@@ -713 +704 @@
         m_pcBinIf->encodeBin( 0, m_cCUPartSizeSCModel.get( 0, 0, 1) );
         m_pcBinIf->encodeBin( 0, m_cCUPartSizeSCModel.get( 0, 0, 2) );
-#if OL_DEPTHLIMIT
-          if(pcCU->getPartDumpFlag())
-          {
-                //if (!pcCU->getSlice()->isIntra())
-                {
-                        pcCU->updatePartInfo(1,uiDepth); //2Nx2N here since we disable NxN in Inter
-                        pcCU->incrementPartInfo();
-                }
-          }
-#endif
-      }
-          else
-          {
-#if OL_DEPTHLIMIT
-          if(pcCU->getPartDumpFlag())
-          {
-                //if (!pcCU->getSlice()->isIntra())
-                {
-                        pcCU->updatePartInfo(0,uiDepth); //2Nx2N here since we disable NxN in Inter
-                        pcCU->incrementPartInfo();
-                }
-          }
+#if OL_DEPTHLIMIT_A0044
+        if(pcCU->getPartDumpFlag())
+        {
+          pcCU->updatePartInfo(1,uiDepth); //2Nx2N here since we disable NxN in Inter
+          pcCU->incrementPartInfo();         
+        }
+#endif
+      }
+      else
+      {
+#if OL_DEPTHLIMIT_A0044
+        if(pcCU->getPartDumpFlag())
+        {
+          pcCU->updatePartInfo(0,uiDepth); //2Nx2N here since we disable NxN in Inter
+          pcCU->incrementPartInfo();
+        }
 #endif
       }
       break;
     }
-    default:
+  default:
     {
       assert(0);
@@ -899 +884 @@
   assert( uiCtx < 3 );
   m_pcBinIf->encodeBin( uiCurrSplitFlag, m_cCUSplitFlagSCModel.get( 0, 0, uiCtx ) );
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   if(pcCU->getPartDumpFlag())
   {
-        if(pcCU->getSlice()->isIntra() || (!pcCU->getSlice()->isIntra() && uiCurrSplitFlag!=0))
-        {
-        pcCU->updatePartInfo(uiCurrSplitFlag,uiDepth);
-        pcCU->incrementPartInfo();
-        }
+    if(pcCU->getSlice()->isIntra() || (!pcCU->getSlice()->isIntra() && uiCurrSplitFlag!=0))
+    {
+      pcCU->updatePartInfo(uiCurrSplitFlag,uiDepth);
+      pcCU->incrementPartInfo();
+    }
   }
 #endif