Changeset 878 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibDecoder

Timestamp:

27 Mar 2014, 19:51:52 (11 years ago)

Author:

tech

Message:

Cleanups part 3.

Location:

branches/HTM-10.1-dev0/source/Lib/TLibDecoder

Files:

• TDecCu.cpp (modified) (6 diffs)
• TDecSbac.cpp (modified) (7 diffs)
• TDecSbac.h (modified) (1 diff)

branches/HTM-10.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -1119 +1119 @@
 #if QC_PKU_SDC_SPLIT_G0123
 #if HS_TSINGHUA_SDC_SPLIT_G0111
-#if QC_GENERIC_SDC_G0122
   TComWedgelet* dmm4SegmentationOrg = new TComWedgelet( uiWidth, uiHeight );
-#endif
 #else
-#if QC_GENERIC_SDC_G0122
   TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
-#endif
 #endif
 #endif
@@ -1210 +1206 @@
 #endif
 #if !QC_PKU_SDC_SPLIT_G0123
-#if QC_GENERIC_SDC_G0122
   TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
-#endif
 #endif
 #if HS_TSINGHUA_SDC_SPLIT_G0111
@@ -1222 +1216 @@
   {
     m_pcPrediction->predIntraLumaDepth( pcCU, uiAbsPartIdx, uiLumaPredMode, piPred, uiStride, uiWidth, uiHeight 
-#if QC_GENERIC_SDC_G0122
       , false, dmm4Segmentation
-#endif
       );
 #if HS_TSINGHUA_SDC_SPLIT_G0111
@@ -1292 +1284 @@
     uiMaskStride = pcWedgelet->getStride();
   }
-#if QC_GENERIC_SDC_G0122
   if( getDimType( uiLumaPredMode ) == DMM4_IDX )
   {
@@ -1304 +1295 @@
 #endif
   }
-#endif
   // get DC prediction for each segment
   Pel apDCPredValues[2];
@@ -1366 +1356 @@
     pRecCr += uiStrideC;
   }
-#if QC_GENERIC_SDC_G0122
 #if HS_TSINGHUA_SDC_SPLIT_G0111
   dmm4SegmentationOrg->destroy(); delete dmm4SegmentationOrg;
 #else
   dmm4Segmentation->destroy(); delete dmm4Segmentation;
-#endif
 #endif
 }

branches/HTM-10.1-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -86 +86 @@
 , m_cDdcFlagSCModel           ( 1,             1,               NUM_DDC_FLAG_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cDdcDataSCModel           ( 1,             1,               NUM_DDC_DATA_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#if QC_GENERIC_SDC_G0122
 , m_cAngleFlagSCModel         ( 1,             1,               NUM_ANGLE_FLAG_CTX            , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 #if H_3D_DIM_DMM
 , m_cDmm1DataSCModel          ( 1,             1,               NUM_DMM1_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
@@ -172 +170 @@
   m_cDdcFlagSCModel.initBuffer           ( sliceType, qp, (UChar*)INIT_DDC_FLAG );
   m_cDdcDataSCModel.initBuffer           ( sliceType, qp, (UChar*)INIT_DDC_DATA );
-#if QC_GENERIC_SDC_G0122
   m_cAngleFlagSCModel.initBuffer         ( sliceType, qp, (UChar*)INIT_ANGLE_FLAG );
-#endif
 #if H_3D_DIM_DMM
   m_cDmm1DataSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_DMM1_DATA );
@@ -244 +240 @@
   m_cDdcFlagSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_DDC_FLAG );
   m_cDdcDataSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_DDC_DATA );
-#if QC_GENERIC_SDC_G0122
   m_cAngleFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_ANGLE_FLAG );
-#endif
 #if H_3D_DIM_DMM
   m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
@@ -1017 +1011 @@
     }
     if( pcCU->getLumaIntraDir( absPartIdx+partOffset*j ) < NUM_INTRA_MODE )
-#if H_3D_DIM_SDC
-#if QC_GENERIC_SDC_G0122
-      if( 1 ) // This should be cleaned up. 
-#else
-      if( !pcCU->getSDCFlag( absPartIdx+partOffset*j ) )
-#endif
-#endif
     {
 #endif
@@ -1039 +1026 @@
 #if H_3D_DIM
     if( pcCU->getLumaIntraDir( absPartIdx+partOffset*j ) < NUM_INTRA_MODE )
-#if H_3D_DIM_SDC
-#if QC_GENERIC_SDC_G0122
-      if( 1 )  // This should be cleaned up. 
-#else
-      if( !pcCU->getSDCFlag( absPartIdx+partOffset*j ) )
-#endif
-#endif
     {
 #endif
@@ -1150 +1130 @@
 }
 
-#if QC_GENERIC_SDC_G0122
 Void TDecSbac::parseIntraDepthMode( TComDataCU* pcCU, UInt absPartIdx, UInt depth )
 {
@@ -1180 +1159 @@
   }
 }
-#else
-Void TDecSbac::parseIntraDepthMode( TComDataCU* pcCU, UInt absPartIdx, UInt depth )
-{
-  UInt puIdx = (pcCU->getWidth(absPartIdx) == 64) ? 2 : ( (pcCU->getPartitionSize(absPartIdx) == SIZE_NxN && pcCU->getWidth(absPartIdx) == 8) ? 0 : 1 );
-  UInt dir = 0;
-  Bool sdcFlag = 0;
-  UInt symbol = 1;
-  UInt modeCode = 0 ;
-  UInt binNum = 0;
-  UInt ctxDepthMode = 0;
-
-  if( puIdx == 2 )
-  {
-    {
-      ctxDepthMode = puIdx*3 + binNum;
-      m_pcTDecBinIf->decodeBin( symbol, m_cDepthIntraModeSCModel.get(0,0,ctxDepthMode) );
-      modeCode = (modeCode<<1) + symbol;
-      binNum++;
-    }
-         if( modeCode == 0 ) { dir = PLANAR_IDX; sdcFlag = 1;}
-    else if( modeCode == 1 ) { dir = 0;          sdcFlag = 0;}
-  }
-  else if( puIdx == 0 )
-  {
-    while( binNum < 1 && symbol )
-    {
-      ctxDepthMode = puIdx*3 + ((binNum >= 2) ? 2 : binNum);
-      m_pcTDecBinIf->decodeBin( symbol, m_cDepthIntraModeSCModel.get(0,0,ctxDepthMode) );
-      modeCode = (modeCode<<1) + symbol;
-      binNum++;
-    }
-    if( modeCode == 0 ) 
-    { 
-      dir = 0;
-      sdcFlag = 0;
-    }
-    else if ( modeCode == 1 ) 
-    { 
-      dir = (2*DMM1_IDX+DIM_OFFSET); 
-      sdcFlag = 0;
-    }
-  }
-  else
-  {
-    while( binNum < 4 && symbol )
-    {
-      ctxDepthMode = puIdx*3 + ((binNum >= 2) ? 2 : binNum);
-      m_pcTDecBinIf->decodeBin( symbol, m_cDepthIntraModeSCModel.get(0,0,ctxDepthMode) );
-      modeCode = (modeCode<<1) + symbol;
-      binNum++;
-    }
-    if ( modeCode == 0 )        { dir =  PLANAR_IDX;             sdcFlag = 1;}
-    else if ( modeCode == 2 )   { dir = 5;                       sdcFlag = 0;}
-    else if ( modeCode == 6 )   { dir = (2*DMM1_IDX+DIM_OFFSET); sdcFlag = 1;}
-    else if ( modeCode == 14 )  { dir = (2*DMM1_IDX+DIM_OFFSET); sdcFlag = 0;}
-    else if ( modeCode == 15 )  { dir = (2*DMM4_IDX+DIM_OFFSET); sdcFlag = 0;}
-
-  }
-  pcCU->setLumaIntraDirSubParts( (UChar)dir, absPartIdx, depth );
-#if H_3D_DIM_SDC
-  pcCU->setSDCFlagSubParts( sdcFlag, absPartIdx, depth ); 
-#endif
-}
-#endif
 #endif
 

branches/HTM-10.1-dev0/source/Lib/TLibDecoder/TDecSbac.h

@@ -213 +213 @@
   ContextModel3DBuffer m_cDdcFlagSCModel;
   ContextModel3DBuffer m_cDdcDataSCModel;
-#if QC_GENERIC_SDC_G0122
   ContextModel3DBuffer m_cAngleFlagSCModel;
-#endif
 #if H_3D_DIM_DMM
   ContextModel3DBuffer m_cDmm1DataSCModel;