Ignore:
Timestamp:
17 May 2013, 14:26:01 (11 years ago)
Author:
rwth
Message:
  • removed unnecessary macros
File:
1 edited

Legend:

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

    r414 r415  
    3737
    3838#include "TDecSbac.h"
    39 
    40 #if RWTH_SDC_DLT_B0036
    41 #define GetNumDepthValues()     (pcCU->getSlice()->getSPS()->getNumDepthValues())
    42 #define GetBitsPerDepthValue()  (pcCU->getSlice()->getSPS()->getBitsPerDepthValue())
    43 #if LGE_CONCATENATE_D0141
    44 #define PrefixThreshold ( ((GetNumDepthValues() * 3) >> 2) )
    45 #define BitsPerSuffix ( (UInt)ceil( Log2(GetNumDepthValues() - PrefixThreshold) ) )
    46 #endif
    47 #endif
    4839
    4940//! \ingroup TLibDecoder
     
    26582649  Int  iIdx       = 0;
    26592650 
    2660   UInt uiMaxResidualBits  = GetBitsPerDepthValue();
     2651  UInt uiMaxResidualBits  = pcCU->getSlice()->getSPS()->getBitsPerDepthValue();
    26612652  assert( uiMaxResidualBits <= g_uiBitDepth );
    26622653 
     
    26802671    //prefix part
    26812672    UInt uiCount = 0;
    2682     for ( UInt ui = 0; ui < PrefixThreshold; ui++)
     2673    UInt uiNumDepthValues = pcCU->getSlice()->getSPS()->getNumDepthValues();
     2674    UInt uiPrefixThreshold = ((uiNumDepthValues * 3) >> 2);
     2675    for ( UInt ui = 0; ui < uiPrefixThreshold; ui++)
    26832676    {
    26842677        m_pcTDecBinIf->decodeBin( uiBit, m_cSDCResidualSCModel.get(0, 0, 0) );
     
    26892682    }
    26902683    //suffix part
    2691     if ( uiCount == PrefixThreshold )
    2692     {
    2693         for ( UInt ui = 0; ui < BitsPerSuffix; ui++ )
     2684    if ( uiCount == uiPrefixThreshold )
     2685    {
     2686        for ( UInt ui = 0; ui < ( (UInt)ceil( Log2(uiNumDepthValues - uiPrefixThreshold) ) ); ui++ )
    26942687        {
    26952688            m_pcTDecBinIf->decodeBinEP( uiBit );
Note: See TracChangeset for help on using the changeset viewer.