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/TLibEncoder/TEncSbac.cpp

    r608 r612  
    9595#if H_3D_DIM_DMM
    9696, m_cDmm1DataSCModel          ( 1,             1,               NUM_DMM1_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    97 #if !SEC_DMM2_E0146
     97#if !SEC_DMM2_E0146_HHIFIX
    9898, m_cDmm2DataSCModel          ( 1,             1,               NUM_DMM2_DATA_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    9999#endif
     
    177177#if H_3D_DIM_DMM
    178178  m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
    179 #if !SEC_DMM2_E0146
     179#if !SEC_DMM2_E0146_HHIFIX
    180180  m_cDmm2DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA );
    181181#endif
     
    268268#if H_3D_DIM_DMM
    269269      curCost += m_cDmm1DataSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_DMM1_DATA );
    270 #if !SEC_DMM2_E0146
     270#if !SEC_DMM2_E0146_HHIFIX
    271271      curCost += m_cDmm2DataSCModel.calcCost          ( curSliceType, qp, (UChar*)INIT_DMM2_DATA );
    272272#endif
     
    340340#if H_3D_DIM_DMM
    341341  m_cDmm1DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA );
    342 #if !SEC_DMM2_E0146
     342#if !SEC_DMM2_E0146_HHIFIX
    343343  m_cDmm2DataSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA );
    344344#endif
     
    549549}
    550550
    551 #if !SEC_DMM2_E0146
     551#if !SEC_DMM2_E0146_HHIFIX
    552552Void TEncSbac::xCodeDmm2Offset( Int iOffset )
    553553{
     
    12261226      xCodeDmm1WedgeIdx( pcCU->getDmmWedgeTabIdx( dimType, absPartIdx ), g_dmm1TabIdxBits[pcCU->getIntraSizeIdx(absPartIdx)] );
    12271227    } break;
    1228 #if !SEC_DMM2_E0146
     1228#if !SEC_DMM2_E0146_HHIFIX
    12291229  case( DMM2_IDX ):
    12301230    {
     
    12851285#else
    12861286#if LGE_SDC_REMOVE_DC_E0158
    1287 #if SEC_DMM2_E0146
     1287#if SEC_DMM2_E0146_HHIFIX
    12881288  UInt codeWordTable[3][7] =    {{0, 0, 0, 2, 0,6, 7},{0, 2, 3, 4, 5, 6, 7},{0, 1, 0, 0, 0, 0, 0}};
    12891289  UInt codeWordLenTable[3][7] = {{0, 1, 0, 2, 0,3, 3},{2, 3, 3, 3, 3, 3, 3},{1, 1, 0, 0, 0, 0, 0}};
     
    12931293#endif
    12941294#else
    1295 #if SEC_DMM2_E0146
     1295#if SEC_DMM2_E0146_HHIFIX
    12961296  UInt codeWordTable[3][8] =    {{0, 0, 0, 2, 0,6, 0, 7},{0, 2, 3, 4, 5, 6, 14, 15},{0, 2, 0, 0, 0, 0, 3, 0}};
    12971297  UInt codeWordLenTable[3][8] = {{0, 1, 0, 2, 0,3, 0, 3},{2, 3, 3, 3, 3, 3,  4,  4},{1, 2, 0, 0, 0, 0, 2, 0}};
     
    13181318    case DMM3_IDX: codeIdx = 5; break;
    13191319#if LGE_SDC_REMOVE_DC_E0158
    1320 #if SEC_DMM2_E0146
     1320#if SEC_DMM2_E0146_HHIFIX
    13211321    case  RBC_IDX: codeIdx = 6; break;
    13221322#else
     
    13251325#endif
    13261326#else
    1327 #if SEC_DMM2_E0146
     1327#if SEC_DMM2_E0146_HHIFIX
    13281328    case  RBC_IDX: codeIdx = 7; break;
    13291329#else
Note: See TracChangeset for help on using the changeset viewer.