Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

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

    r56 r296  
    6565TDecBinCABAC::start()
    6666{
    67 #if !OL_FLUSH || OL_FLUSH_ALIGN
     67#if OL_FLUSH_ALIGN
    6868  assert( m_pcTComBitstream->getNumBitsUntilByteAligned() == 0 );
    6969#endif
     
    7272  m_bitsNeeded = -8;
    7373  m_uiValue    = m_pcTComBitstream->readByte() << 8;
    74 #if OL_FLUSH && !OL_FLUSH_ALIGN
     74#if !OL_FLUSH_ALIGN
    7575  m_uiLastByte = m_pcTComBitstream->readByte();
    7676  m_uiValue   |= m_uiLastByte;
     
    8585}
    8686
    87 #if OL_FLUSH
    8887Void
    8988TDecBinCABAC::flush()
     
    108107#endif // OL_FLUSH_ALIGN
    109108}
    110 #endif // OL_FLUSH
    111109
    112110/**
     
    122120  m_uiValue   = pcTDecBinCABAC->m_uiValue;
    123121  m_bitsNeeded= pcTDecBinCABAC->m_bitsNeeded;
    124 #if OL_FLUSH && !OL_FLUSH_ALIGN
     122#if !OL_FLUSH_ALIGN
    125123  m_uiLastByte= pcTDecBinCABAC->m_uiLastByte;
    126124#endif
     
    152150    {
    153151      m_bitsNeeded = -8;
    154 #if OL_FLUSH && !OL_FLUSH_ALIGN
     152#if !OL_FLUSH_ALIGN
    155153      m_uiLastByte = m_pcTComBitstream->readByte();
    156154      m_uiValue += m_uiLastByte;   
     
    173171    if ( m_bitsNeeded >= 0 )
    174172    {
    175 #if OL_FLUSH && !OL_FLUSH_ALIGN
     173#if !OL_FLUSH_ALIGN
    176174      m_uiLastByte = m_pcTComBitstream->readByte();
    177175      m_uiValue += m_uiLastByte << m_bitsNeeded;
     
    192190  {
    193191    m_bitsNeeded = -8;
    194 #if OL_FLUSH && !OL_FLUSH_ALIGN
     192#if !OL_FLUSH_ALIGN
    195193    m_uiLastByte = m_pcTComBitstream->readByte();
    196194    m_uiValue += m_uiLastByte;
     
    215213  while ( numBins > 8 )
    216214  {
    217 #if OL_FLUSH && !OL_FLUSH_ALIGN
     215#if !OL_FLUSH_ALIGN
    218216    m_uiLastByte = m_pcTComBitstream->readByte();
    219217    m_uiValue = ( m_uiValue << 8 ) + ( m_uiLastByte << ( 8 + m_bitsNeeded ) );
     
    241239  if ( m_bitsNeeded >= 0 )
    242240  {
    243 #if OL_FLUSH && !OL_FLUSH_ALIGN
     241#if !OL_FLUSH_ALIGN
    244242    m_uiLastByte = m_pcTComBitstream->readByte();
    245243    m_uiValue += m_uiLastByte << m_bitsNeeded;
     
    285283      {
    286284        m_bitsNeeded = -8;
    287 #if OL_FLUSH && !OL_FLUSH_ALIGN
     285#if !OL_FLUSH_ALIGN
    288286        m_uiLastByte = m_pcTComBitstream->readByte();
    289287        m_uiValue += m_uiLastByte;   
     
    306304}
    307305
    308 #if BURST_IPCM
    309306/** Decode subsequent_pcm_num.
    310307 * \param numSubseqIPCM
     
    323320    {
    324321      m_bitsNeeded = -8;
    325 #if OL_FLUSH && !OL_FLUSH_ALIGN
     322#if !OL_FLUSH_ALIGN
    326323      m_uiLastByte = m_pcTComBitstream->readByte();
    327324      m_uiValue += m_uiLastByte;
     
    342339  numSubseqIPCM --;
    343340}
    344 #endif
    345341
    346342/** Decode PCM alignment zero bits.
Note: See TracChangeset for help on using the changeset viewer.