Ignore:
Timestamp:
12 May 2013, 16:24:39 (11 years ago)
Author:
rwth
Message:
  • added D0032
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev3-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp

    r382 r397  
    114114, m_cDmmDeltaFlagModel             ( 1,             1,                 DMM_DELTA_NUM_FLAG_CTX           , m_contextModels + m_numContextModels, m_numContextModels)
    115115#endif
     116#if RWTH_SDC_CTX_SIMPL_D0032
     117, m_cSDCResidualFlagSCModel     ( 1,             1,  SDC_NUM_RESIDUAL_FLAG_CTX  , m_contextModels + m_numContextModels, m_numContextModels)
     118, m_cSDCResidualSCModel         ( 1,             1,  SDC_NUM_RESIDUAL_CTX       , m_contextModels + m_numContextModels, m_numContextModels)
     119, m_cSDCPredModeSCModel             ( 1,             3,                 SDC_NUM_PRED_MODE_CTX     , m_contextModels + m_numContextModels, m_numContextModels)
     120#else
    116121, m_cSDCResidualFlagSCModel     ( 1,             2,  SDC_NUM_RESIDUAL_FLAG_CTX  , m_contextModels + m_numContextModels, m_numContextModels)
    117122, m_cSDCResidualSignFlagSCModel ( 1,             2,  SDC_NUM_SIGN_FLAG_CTX      , m_contextModels + m_numContextModels, m_numContextModels)
    118123, m_cSDCResidualSCModel         ( 1,             2,  SDC_NUM_RESIDUAL_CTX       , m_contextModels + m_numContextModels, m_numContextModels)
    119124, m_cSDCPredModeSCModel             ( 1,             3,                 SDC_NUM_PRED_MODE_CTX     , m_contextModels + m_numContextModels, m_numContextModels)
     125#endif
    120126#endif
    121127{
     
    222228  m_cSDCResidualFlagSCModel.initBuffer      ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    223229  m_cSDCResidualSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL );
     230#if !RWTH_SDC_CTX_SIMPL_D0032
    224231  m_cSDCResidualSignFlagSCModel.initBuffer  ( sliceType, qp, (UChar*)INIT_SDC_SIGN_FLAG );
     232#endif
    225233  m_cSDCPredModeSCModel.initBuffer              ( sliceType, qp, (UChar*)INIT_SDC_PRED_MODE );
    226234#endif
     
    308316  m_cSDCResidualFlagSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    309317  m_cSDCResidualSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL );
     318#if !RWTH_SDC_CTX_SIMPL_D0032
    310319  m_cSDCResidualSignFlagSCModel.initBuffer  ( eSliceType, iQp, (UChar*)INIT_SDC_SIGN_FLAG );
     320#endif
    311321  m_cSDCPredModeSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_SDC_PRED_MODE );
    312322#endif
     
    26472657  assert( uiMaxResidualBits <= g_uiBitDepth );
    26482658 
     2659#if RWTH_SDC_CTX_SIMPL_D0032
     2660  m_pcTDecBinIf->decodeBin(uiResidual, m_cSDCResidualFlagSCModel.get( 0, 0, 0 ) );
     2661#else
    26492662  m_pcTDecBinIf->decodeBin(uiResidual, m_cSDCResidualFlagSCModel.get( 0, uiSegment, 0 ) );
     2663#endif
    26502664 
    26512665  if (uiResidual)
    26522666  {
    26532667    // decode residual sign bit
     2668#if RWTH_SDC_CTX_SIMPL_D0032
     2669    m_pcTDecBinIf->decodeBinEP(uiSign);
     2670#else
    26542671    m_pcTDecBinIf->decodeBin(uiSign, m_cSDCResidualSignFlagSCModel.get( 0, uiSegment, 0 ) );
     2672#endif
    26552673   
    26562674    // decode residual magnitude
    26572675    for (Int i=0; i<uiMaxResidualBits; i++)
    26582676    {
     2677#if RWTH_SDC_CTX_SIMPL_D0032
     2678      m_pcTDecBinIf->decodeBin(uiBit, m_cSDCResidualSCModel.get( 0, 0, i ) );
     2679#else
    26592680      m_pcTDecBinIf->decodeBin(uiBit, m_cSDCResidualSCModel.get( 0, uiSegment, i ) );
     2681#endif
    26602682      uiAbsIdx |= uiBit << i;
    26612683    }
Note: See TracChangeset for help on using the changeset viewer.