Changeset 332 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecSbac.cpp

Timestamp:

21 Apr 2013, 19:13:11 (12 years ago)

Author:

tech

Message:

Merged branch 6.1-Cleanup@329.

File:

• trunk/source/Lib/TLibDecoder/TDecSbac.cpp (modified) (9 diffs)

trunk/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -707 +707 @@
   UInt uiSymbol;
 
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
   Bool bParseSplitFlag    = true;
 
@@ -715 +715 @@
   Bool bIntraSliceDetect  = (pcCU->getSlice()->getSliceType() == I_SLICE);
 
-#if HHI_QTLPC_RAU_OFF_C0160
   Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
-#else
-  if(bDepthMapDetect && !bIntraSliceDetect && sps->getUseQTLPC())
-#endif
   {
     TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
@@ -733 +729 @@
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tSplitFlag\n" )
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
   }
   else
@@ -755 +751 @@
   PartSize eMode;
 
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
   Bool bParsePartSize    = true;
   TComSPS *sps           = pcCU->getPic()->getSlice(0)->getSPS();
@@ -762 +758 @@
   Bool bIntraSliceDetect = (pcCU->getSlice()->getSliceType() == I_SLICE);
 
-#if HHI_QTLPC_RAU_OFF_C0160
   Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
-#else
-  if(bDepthMapDetect && !bIntraSliceDetect && sps->getUseQTLPC())
-#endif
   {
     TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
@@ -781 +773 @@
   if ( pcCU->isIntra( uiAbsPartIdx ) )
   {
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
     if(bParsePartSize)
     {
@@ -791 +783 @@
       }
       eMode = uiSymbol ? SIZE_2Nx2N : SIZE_NxN;
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
     }
 #endif
@@ -809 +801 @@
   else
   {
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
     if(bParsePartSize)
     {
@@ -849 +841 @@
         }
       }
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
     }
 #endif