Changeset 608 in 3DVCSoftware for trunk/source/Lib/TLibCommon/ContextModel.h


Ignore:
Timestamp:
1 Sep 2013, 22:47:26 (11 years ago)
Author:
tech
Message:

Merged DEV-2.0-dev0@604.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/ContextModel.h

    r296 r608  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2012, ITU/ISO/IEC
     6 * Copyright (c) 2010-2013, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    5757{
    5858public:
    59 #if CABAC_INIT_FLAG
    6059  ContextModel  ()                        { m_ucState = 0; m_binsCoded = 0; }
    61 #else
    62   ContextModel  ()                        { m_ucState = 0;             }
    63 #endif
    6460  ~ContextModel ()                        {}
    6561 
     
    9086  static Int getEntropyBitsTrm( Int val ) { return m_entropyBits[126 ^ val]; }
    9187#endif
    92 #if CABAC_INIT_FLAG
    9388  Void setBinsCoded(UInt val)   { m_binsCoded = val;  }
    9489  UInt getBinsCoded()           { return m_binsCoded;   }
    95 #endif
    9690 
    9791private:
     
    10397  static UChar m_nextState[128][2];
    10498#endif
    105 #if CABAC_INIT_FLAG
    10699  UInt          m_binsCoded;
    107 #endif
    108100};
    109101
Note: See TracChangeset for help on using the changeset viewer.