Ignore:
Timestamp:
3 Sep 2013, 17:46:48 (11 years ago)
Author:
hhi
Message:

SEC_DMM2_E0146_HHIFIX: Fix for SEC_DMM2_E0146, now including all DMM2 related code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.0-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

    r608 r612  
    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
     91#if !SEC_DMM2_E0146_HHIFIX
    9292, m_cDmm2DataSCModel          ( 1,             1,               NUM_DMM2_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    9393#endif
     
    179179#if H_3D_DIM_DMM
    180180  m_cDmm1DataSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_DMM1_DATA );
    181 #if !SEC_DMM2_E0146
     181#if !SEC_DMM2_E0146_HHIFIX
    182182  m_cDmm2DataSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_DMM2_DATA );
    183183#endif
     
    255255#if H_3D_DIM_DMM
    256256  m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
    257 #if !SEC_DMM2_E0146
     257#if !SEC_DMM2_E0146_HHIFIX
    258258  m_cDmm2DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA );
    259259#endif
     
    444444  ruiTabIdx = uiIdx;
    445445}
    446 #if !SEC_DMM2_E0146
     446#if !SEC_DMM2_E0146_HHIFIX
    447447Void TDecSbac::xParseDmm2Offset( Int& riOffset )
    448448{
     
    11621162      pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dimType, absPartIdx, depth );
    11631163    } break;
    1164 #if !SEC_DMM2_E0146
     1164#if !SEC_DMM2_E0146_HHIFIX
    11651165  case( DMM2_IDX ):
    11661166    {
     
    13331333        binNum = 0;
    13341334#if LGE_SDC_REMOVE_DC_E0158
    1335 #if !SEC_DMM2_E0146
     1335#if !SEC_DMM2_E0146_HHIFIX
    13361336        while( symbol && binNum < 2 )
    13371337#endif
    13381338#else
    1339 #if SEC_DMM2_E0146
     1339#if SEC_DMM2_E0146_HHIFIX
    13401340        while( symbol && binNum < 2 )
    13411341#else
     
    13581358    else if( modeCode == 6  ) { dir = (2*DMM3_IDX+DIM_OFFSET); sdcFlag = 0;}
    13591359#if LGE_SDC_REMOVE_DC_E0158
    1360 #if SEC_DMM2_E0146
     1360#if SEC_DMM2_E0146_HHIFIX
    13611361    else if( modeCode == 7 )  { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;}
    13621362#else
     
    13661366#else
    13671367    else if( modeCode == 14 ) { dir =      DC_IDX;             sdcFlag = 1;}
    1368 #if SEC_DMM2_E0146
     1368#if SEC_DMM2_E0146_HHIFIX
    13691369    else if( modeCode == 15 ) { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;}
    13701370#else
Note: See TracChangeset for help on using the changeset viewer.