Ignore:
Timestamp:
6 Aug 2013, 02:51:16 (11 years ago)
Author:
samsung-htm
Message:

Integration of E0146

Location:
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder/TDecSbac.cpp

    r541 r554  
    8989#if H_3D_DIM_DMM
    9090, m_cDmm1DataSCModel          ( 1,             1,               NUM_DMM1_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
     91#if !SEC_DMM2_E0146
    9192, m_cDmm2DataSCModel          ( 1,             1,               NUM_DMM2_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
     93#endif
    9294, m_cDmm3DataSCModel          ( 1,             1,               NUM_DMM3_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    9395#endif
     
    172174#if H_3D_DIM_DMM
    173175  m_cDmm1DataSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_DMM1_DATA );
     176#if !SEC_DMM2_E0146
    174177  m_cDmm2DataSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_DMM2_DATA );
     178#endif
    175179  m_cDmm3DataSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_DMM3_DATA );
    176180#endif
     
    241245#if H_3D_DIM_DMM
    242246  m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
     247#if !SEC_DMM2_E0146
    243248  m_cDmm2DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA );
     249#endif
    244250  m_cDmm3DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM3_DATA );
    245251#endif
     
    423429  ruiTabIdx = uiIdx;
    424430}
     431#if !SEC_DMM2_E0146
    425432Void TDecSbac::xParseDmm2Offset( Int& riOffset )
    426433{
     
    448455  riOffset = iDeltaEnd;
    449456}
     457#endif
    450458Void TDecSbac::xParseDmm3WedgeIdx( UInt& ruiIntraIdx, Int iNumBit )
    451459{
     
    11391147      pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dimType, absPartIdx, depth );
    11401148    } break;
     1149#if !SEC_DMM2_E0146
    11411150  case( DMM2_IDX ):
    11421151    {
     
    11451154      pcCU->setDmm2DeltaEndSubParts( iOffset, absPartIdx, depth );
    11461155    } break;
     1156#endif
    11471157  case( DMM3_IDX ):
    11481158    {
     
    12681278      {
    12691279        binNum = 0;
     1280#if SEC_DMM2_E0146
     1281        while( symbol && binNum < 2 )
     1282#else
    12701283        while( symbol && binNum < 3 )
     1284#endif
    12711285        {
    12721286          ctxDepthMode = puIdx*3 + 2;
     
    12841298    else if( modeCode == 6  ) { dir = (2*DMM3_IDX+DIM_OFFSET); sdcFlag = 0;}
    12851299    else if( modeCode == 14 ) { dir =      DC_IDX;             sdcFlag = 1;}
     1300#if SEC_DMM2_E0146
     1301    else if( modeCode == 15 ) { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;}
     1302#else
    12861303    else if( modeCode == 30 ) { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;}
    12871304    else if( modeCode == 31 ) { dir = (2*DMM2_IDX+DIM_OFFSET); sdcFlag = 0;}
     1305#endif
    12881306  }
    12891307  pcCU->setLumaIntraDirSubParts( (UChar)dir, absPartIdx, depth );
  • branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder/TDecSbac.h

    r531 r554  
    102102#if H_3D_DIM_DMM
    103103  Void  xParseDmm1WedgeIdx   ( UInt& ruiTabIdx, Int iNumBit );
     104#if !SEC_DMM2_E0146
    104105  Void  xParseDmm2Offset     ( Int& riOffset );
     106#endif
    105107  Void  xParseDmm3WedgeIdx   ( UInt& ruiIntraIdx, Int iNumBit );
    106108#endif
     
    210212#if H_3D_DIM_DMM
    211213  ContextModel3DBuffer m_cDmm1DataSCModel;
     214#if !SEC_DMM2_E0146
    212215  ContextModel3DBuffer m_cDmm2DataSCModel;
     216#endif
    213217  ContextModel3DBuffer m_cDmm3DataSCModel;
    214218#endif
Note: See TracChangeset for help on using the changeset viewer.