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

Timestamp:

1 Sep 2013, 22:47:26 (12 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/Lib/TLibCommon/ContextModel.h (modified) (4 diffs)

trunk/source/Lib/TLibCommon/ContextModel.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -57 +57 @@
 {
 public:
-#if CABAC_INIT_FLAG
   ContextModel  ()                        { m_ucState = 0; m_binsCoded = 0; }
-#else
-  ContextModel  ()                        { m_ucState = 0;             }
-#endif
   ~ContextModel ()                        {}
   
@@ -90 +86 @@
   static Int getEntropyBitsTrm( Int val ) { return m_entropyBits[126 ^ val]; }
 #endif
-#if CABAC_INIT_FLAG
   Void setBinsCoded(UInt val)   { m_binsCoded = val;  }
   UInt getBinsCoded()           { return m_binsCoded;   }
-#endif
   
 private:
@@ -103 +97 @@
   static UChar m_nextState[128][2];
 #endif
-#if CABAC_INIT_FLAG
   UInt          m_binsCoded;
-#endif
 };