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

    r382 r397  
    122122, m_cDmmDeltaFlagModel             ( 1,             1,                 DMM_DELTA_NUM_FLAG_CTX           , m_contextModels + m_numContextModels, m_numContextModels)
    123123#endif
     124#if RWTH_SDC_CTX_SIMPL_D0032
     125, m_cSDCResidualFlagSCModel     ( 1,             1,  SDC_NUM_RESIDUAL_FLAG_CTX  , m_contextModels + m_numContextModels, m_numContextModels)
     126, m_cSDCResidualSCModel         ( 1,             1,  SDC_NUM_RESIDUAL_CTX       , m_contextModels + m_numContextModels, m_numContextModels)
     127, m_cSDCPredModeSCModel             ( 1,             3,                 SDC_NUM_PRED_MODE_CTX     , m_contextModels + m_numContextModels, m_numContextModels)
     128#else
    124129, m_cSDCResidualFlagSCModel     ( 1,             2,  SDC_NUM_RESIDUAL_FLAG_CTX  , m_contextModels + m_numContextModels, m_numContextModels)
    125130, m_cSDCResidualSignFlagSCModel ( 1,             2,  SDC_NUM_SIGN_FLAG_CTX      , m_contextModels + m_numContextModels, m_numContextModels)
    126131, m_cSDCResidualSCModel         ( 1,             2,  SDC_NUM_RESIDUAL_CTX       , m_contextModels + m_numContextModels, m_numContextModels)
    127132, m_cSDCPredModeSCModel             ( 1,             3,                 SDC_NUM_PRED_MODE_CTX     , m_contextModels + m_numContextModels, m_numContextModels)
     133#endif
    128134#endif
    129135{
     
    215221  m_cSDCResidualFlagSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    216222  m_cSDCResidualSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL );
     223#if !RWTH_SDC_CTX_SIMPL_D0032
    217224  m_cSDCResidualSignFlagSCModel.initBuffer  ( eSliceType, iQp, (UChar*)INIT_SDC_SIGN_FLAG );
     225#endif
    218226  m_cSDCPredModeSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_SDC_PRED_MODE );
    219227#endif
     
    369377  m_cSDCResidualFlagSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    370378  m_cSDCResidualSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL );
     379#if !RWTH_SDC_CTX_SIMPL_D0032
    371380  m_cSDCResidualSignFlagSCModel.initBuffer  ( eSliceType, iQp, (UChar*)INIT_SDC_SIGN_FLAG );
     381#endif
    372382  m_cSDCPredModeSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_SDC_PRED_MODE );
    373383#endif
     
    26452655 
    26462656  // residual flag
     2657#if RWTH_SDC_CTX_SIMPL_D0032
     2658  m_pcBinIf->encodeBin( uiResidual, m_cSDCResidualFlagSCModel.get( 0, 0, 0 ) );
     2659#else
    26472660  m_pcBinIf->encodeBin( uiResidual, m_cSDCResidualFlagSCModel.get( 0, uiSegment, 0 ) ); //TODO depthmap: more sophisticated context selection
     2661#endif
    26482662 
    26492663  if (uiResidual)
    26502664  {
    26512665    // encode sign bit of residual
     2666#if RWTH_SDC_CTX_SIMPL_D0032
     2667    m_pcBinIf->encodeBinEP( uiSign );
     2668#else
    26522669    m_pcBinIf->encodeBin( uiSign, m_cSDCResidualSignFlagSCModel.get( 0, uiSegment, 0 ) ); //TODO depthmap: more sophisticated context selection
     2670#endif
    26532671       
    26542672    assert(uiAbsIdx < GetNumDepthValues());
     
    26602678      uiBit = (uiAbsIdx & (1<<i))>>i;
    26612679     
     2680#if RWTH_SDC_CTX_SIMPL_D0032
     2681      m_pcBinIf->encodeBin( uiBit, m_cSDCResidualSCModel.get( 0, 0, i ) );
     2682#else
    26622683      m_pcBinIf->encodeBin( uiBit, m_cSDCResidualSCModel.get( 0, uiSegment, i ) ); //TODO depthmap: more sophisticated context selection
     2684#endif
    26632685    }
    26642686   
Note: See TracChangeset for help on using the changeset viewer.