Changeset 622 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSbac.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/TLibEncoder/TEncSbac.cpp

    r608 r622  
    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{
     
    649649  // residual flag
    650650  m_pcBinIf->encodeBin( uiResidual, m_cSDCResidualFlagSCModel.get( 0, 0, 0 ) );
     651#if H_MV_ENC_DEC_TRAC
     652  DTRACE_CU("sdc_residual_flag[i]", uiResidual)
     653#endif 
    651654 
    652655  if (uiResidual)
     
    654657    // encode sign bit of residual
    655658    m_pcBinIf->encodeBinEP( uiSign );
     659#if H_MV_ENC_DEC_TRAC
     660    DTRACE_CU("sdc_residual_sign_flag[i]", uiSign)
     661#endif
    656662   
    657663#if H_3D_DIM_DLT
     
    664670    // encode residual magnitude
    665671    uiAbsIdx -= 1;
     672
     673#if H_MV_ENC_DEC_TRAC
     674    DTRACE_CU("sdc_residual_abs_minus1[i]", uiAbsIdx)
     675#endif
     676
    666677    // prefix part
    667678    if ( uiAbsIdx == 0 )
     679    {
    668680      m_pcBinIf->encodeBin( 0, m_cSDCResidualSCModel.get(0, 0, 0) );
     681    }
    669682    else
    670683    {
     
    679692      }
    680693      if ( uiAbsIdx < uiPrefixThreshold )
     694      {
    681695        m_pcBinIf->encodeBin( 0, m_cSDCResidualSCModel.get(0, 0, 0) );
    682       // suffix part
     696      }     
    683697      else
    684       {
     698      { // suffix part
    685699        uiAbsIdx -= uiPrefixThreshold;
    686700        UInt uiSuffixLength = numBitsForValue(uiNumDepthValues - uiPrefixThreshold);
     
    12261240      xCodeDmm1WedgeIdx( pcCU->getDmmWedgeTabIdx( dimType, absPartIdx ), g_dmm1TabIdxBits[pcCU->getIntraSizeIdx(absPartIdx)] );
    12271241    } break;
    1228 #if !SEC_DMM2_E0146
     1242#if !SEC_DMM2_E0146_HHIFIX
    12291243  case( DMM2_IDX ):
    12301244    {
     
    12851299#else
    12861300#if LGE_SDC_REMOVE_DC_E0158
    1287 #if SEC_DMM2_E0146
     1301#if SEC_DMM2_E0146_HHIFIX
    12881302  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}};
    12891303  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}};
     
    12931307#endif
    12941308#else
    1295 #if SEC_DMM2_E0146
     1309#if SEC_DMM2_E0146_HHIFIX
    12961310  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}};
    12971311  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}};
     
    13181332    case DMM3_IDX: codeIdx = 5; break;
    13191333#if LGE_SDC_REMOVE_DC_E0158
    1320 #if SEC_DMM2_E0146
     1334#if SEC_DMM2_E0146_HHIFIX
    13211335    case  RBC_IDX: codeIdx = 6; break;
    13221336#else
     
    13251339#endif
    13261340#else
    1327 #if SEC_DMM2_E0146
     1341#if SEC_DMM2_E0146_HHIFIX
    13281342    case  RBC_IDX: codeIdx = 7; break;
    13291343#else
Note: See TracChangeset for help on using the changeset viewer.