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


Ignore:
Timestamp:
27 Mar 2014, 19:51:52 (11 years ago)
Author:
tech
Message:

Cleanups part 3.

Location:
branches/HTM-10.1-dev0/source/Lib/TLibCommon
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-10.1-dev0/source/Lib/TLibCommon/ContextTables.h

    r877 r878  
    104104
    105105#if H_3D_DIM
    106 #if QC_GENERIC_SDC_G0122
    107106#define NUM_DEPTH_INTRA_MODE_CTX      1       ///< number of context models for depth intra modes
    108 #else
    109 #define NUM_DEPTH_INTRA_MODE_CTX      8       ///< number of context models for depth intra modes
    110 #endif
    111107#define NUM_DDC_FLAG_CTX              2       ///< number of context models for deltaDC flag (DMM or RBC)
    112108#define NUM_DDC_DATA_CTX              1       ///< number of context models for deltaDC data (DMM or RBC)
     
    114110#define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
    115111#endif
    116 #if QC_GENERIC_SDC_G0122
    117112#define NUM_ANGLE_FLAG_CTX            3
    118 #endif
    119113#endif
    120114
     
    366360#endif
    367361#if H_3D_DIM
    368 #if QC_GENERIC_SDC_G0122
    369362static const UChar
    370363INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
     
    374367  { 154, }
    375368};
    376 #else
    377 static const UChar
    378 INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
    379 {
    380     {0,  0,  64, 168, 168, 124, CNU, 0},
    381     {0, 64,   0, 183, CNU, 108,   0, 0},
    382     {64, 0, CNU, CNU, 168, 109,   0, 0}
    383 };
    384 #endif
    385 
    386 #if QC_GENERIC_SDC_G0122
     369
    387370static const UChar
    388371INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
     
    392375  { 155, 170, 157 },
    393376};
    394 #endif
    395377
    396378static const UChar
  • branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r877 r878  
    23752375#endif
    23762376
    2377 #if QC_GENERIC_SDC_G0122
     2377#if H_3D_DIM_SDC
    23782378UInt TComDataCU::getCtxSDCFlag( UInt uiAbsPartIdx )
    23792379{
     
    26242624  // check general CU information
    26252625  if( !getSlice()->getIsDepth() || !isIntra(uiAbsPartIdx) || getPartitionSize(uiAbsPartIdx) != SIZE_2Nx2N )
     2626  {
    26262627    return false;
    2627 #if QC_GENERIC_SDC_G0122
     2628  }
     2629
    26282630  if( isDimMode( getLumaIntraDir( uiAbsPartIdx ) ) && !isDimDeltaDC( getLumaIntraDir( uiAbsPartIdx ) ) )
    26292631  {
     
    26372639
    26382640  return false;
    2639 #endif
    26402641  // check prediction mode
    26412642  UInt uiLumaPredMode = getLumaIntraDir( uiAbsPartIdx ); 
  • branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComDataCU.h

    r877 r878  
    556556  Pel           getSDCSegmentDCOffset( UInt uiSeg, UInt uiPartIdx ) { return m_apSegmentDCOffset[uiSeg][uiPartIdx]; }
    557557  Void          setSDCSegmentDCOffset( Pel pOffset, UInt uiSeg, UInt uiPartIdx) { m_apSegmentDCOffset[uiSeg][uiPartIdx] = pOffset; }
    558 #if QC_GENERIC_SDC_G0122
    559558  UInt          getCtxSDCFlag          ( UInt   uiAbsPartIdx );
    560559  UInt          getCtxAngleFlag        ( UInt   uiAbsPartIdx );
    561 #endif
    562560#endif
    563561#endif
  • branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComPrediction.cpp

    r872 r878  
    416416
    417417#if H_3D_DIM
    418 Void TComPrediction::predIntraLumaDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc
    419 #if QC_GENERIC_SDC_G0122
    420   , TComWedgelet* dmm4Segmentation
    421 #endif
    422   )
     418Void TComPrediction::predIntraLumaDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc, TComWedgelet* dmm4Segmentation  )
    423419{
    424420  assert( iWidth == iHeight  );
     
    446442    case( DMM4_IDX ):
    447443      {
    448 #if QC_GENERIC_SDC_G0122
    449444        if( dmm4Segmentation == NULL )
    450445        {
     
    457452          dmmSegmentation = dmm4Segmentation;
    458453        }
    459 #else
    460         dmmSegmentation = new TComWedgelet( iWidth, iHeight );
    461         xPredContourFromTex( pcCU, uiAbsPartIdx, iWidth, iHeight, dmmSegmentation );
    462 #endif
    463454      } break;
    464455    default: assert(0);
     
    511502
    512503#if H_3D_DIM_DMM
    513 #if QC_GENERIC_SDC_G0122
    514504  if( dimType == DMM4_IDX && dmm4Segmentation == NULL ) { dmmSegmentation->destroy(); delete dmmSegmentation; }
    515 #else
    516   if( dimType == DMM4_IDX ) { dmmSegmentation->destroy(); delete dmmSegmentation; }
    517 #endif
    518505#endif
    519506}
     
    25932580  Int iSumPix[2];
    25942581  memset(iSumPix, 0, sizeof(Int)*2);
    2595 #if QC_GENERIC_SDC_G0122
    25962582  for( Int i = 0; i < uiNumSegments; i++ )
    25972583  {
    25982584    rpSegMeans[i] = 0;
    25992585  }
    2600 #endif
    26012586  if (orgDC == false)
    26022587  {
     
    26132598      rpSegMeans[ucSegmentRB] = pOrig[uiStride * (uiSize-1) + (uiSize-1) ];
    26142599    }
    2615 #if QC_GENERIC_SDC_G0122
    26162600    else if( getDimType( uiIntraMode ) == DMM4_IDX )
    26172601    {
     
    26472631    }
    26482632    else
    2649 #else
    2650     else if (uiIntraMode == PLANAR_IDX)
    2651 #endif
    26522633    {
    26532634      Pel* pLeftTop = pOrig;
  • branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComPrediction.h

    r872 r878  
    172172  // Depth intra
    173173  Void predIntraLumaDepth         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc = false
    174 #if QC_GENERIC_SDC_G0122
    175174    , TComWedgelet* dmm4Segmentation = NULL
    176 #endif
    177175    );
    178176#if H_3D_DIM_SDC
  • branches/HTM-10.1-dev0/source/Lib/TLibCommon/TypeDef.h

    r877 r878  
    184184                                              // QC_DIM_DELTADC_UNIFY_F0132 Unify delta DC coding in depth intra modes
    185185                                              // Unify intra SDC and inter SDC
     186                                              // QC_GENERIC_SDC_G0122 Generalize SDC to all depth intra modes
    186187
    187188
     
    317318#endif
    318319#define SCU_HS_DEPTH_DC_PRED_G0143        1
    319 #define QC_GENERIC_SDC_G0122              1  // Generalize SDC to all depth intra modes
     320
    320321#endif
    321322
Note: See TracChangeset for help on using the changeset viewer.