Changeset 622 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecSbac.cpp


Ignore:
Timestamp:
11 Sep 2013, 14:40:25 (11 years ago)
Author:
tech
Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecSbac.cpp

    r608 r622  
    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{
     
    584584  m_pcTDecBinIf->decodeBin(uiResidual, m_cSDCResidualFlagSCModel.get( 0, 0, 0 ) );
    585585 
     586#if H_MV_ENC_DEC_TRAC
     587  DTRACE_CU("sdc_residual_flag[i]", uiResidual)
     588#endif
     589 
    586590  if (uiResidual)
    587591  {
    588592    // decode residual sign bit
    589593    m_pcTDecBinIf->decodeBinEP(uiSign);
     594#if H_MV_ENC_DEC_TRAC
     595    DTRACE_CU("sdc_residual_sign_flag[i]", uiSign)
     596#endif
    590597   
    591598    // decode residual magnitude
     
    617624    }
    618625    else
     626    {
    619627      uiAbsIdx = uiCount;
     628    }
     629 
     630#if H_MV_ENC_DEC_TRAC
     631    DTRACE_CU("sdc_residual_abs_minus1[i]", uiAbsIdx)
     632#endif
    620633   
    621634    uiAbsIdx += 1;
     
    11621175      pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dimType, absPartIdx, depth );
    11631176    } break;
    1164 #if !SEC_DMM2_E0146
     1177#if !SEC_DMM2_E0146_HHIFIX
    11651178  case( DMM2_IDX ):
    11661179    {
     
    13331346        binNum = 0;
    13341347#if LGE_SDC_REMOVE_DC_E0158
    1335 #if !SEC_DMM2_E0146
     1348#if !SEC_DMM2_E0146_HHIFIX
    13361349        while( symbol && binNum < 2 )
    13371350#endif
    13381351#else
    1339 #if SEC_DMM2_E0146
     1352#if SEC_DMM2_E0146_HHIFIX
    13401353        while( symbol && binNum < 2 )
    13411354#else
     
    13581371    else if( modeCode == 6  ) { dir = (2*DMM3_IDX+DIM_OFFSET); sdcFlag = 0;}
    13591372#if LGE_SDC_REMOVE_DC_E0158
    1360 #if SEC_DMM2_E0146
     1373#if SEC_DMM2_E0146_HHIFIX
    13611374    else if( modeCode == 7 )  { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;}
    13621375#else
     
    13661379#else
    13671380    else if( modeCode == 14 ) { dir =      DC_IDX;             sdcFlag = 1;}
    1368 #if SEC_DMM2_E0146
     1381#if SEC_DMM2_E0146_HHIFIX
    13691382    else if( modeCode == 15 ) { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;}
    13701383#else
Note: See TracChangeset for help on using the changeset viewer.