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

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

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

trunk/source/Lib/TLibCommon/ContextModel.h

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -37 +37 @@
 */
 
-#ifndef __CONTEXT_MODEL__
-#define __CONTEXT_MODEL__
+#ifndef __CONTEXTMODEL__
+#define __CONTEXTMODEL__
 
 #if _MSC_VER > 1000
@@ -45 +45 @@
 
 #include "CommonDef.h"
+#include "TComRom.h"
 
 //! \ingroup TLibCommon
@@ -59 +60 @@
   ContextModel  ()                        { m_ucState = 0; m_binsCoded = 0; }
   ~ContextModel ()                        {}
-  
+
   UChar getState  ()                { return ( m_ucState >> 1 ); }                    ///< get current state
   UChar getMps    ()                { return ( m_ucState  & 1 ); }                    ///< get curret MPS
   Void  setStateAndMps( UChar ucState, UChar ucMPS) { m_ucState = (ucState << 1) + ucMPS; } ///< set state and MPS
-  
+
   Void init ( Int qp, Int initValue );   ///< initialize state with initial probability
-  
+
   Void updateLPS ()
   {
     m_ucState = m_aucNextStateLPS[ m_ucState ];
   }
-  
+
   Void updateMPS ()
   {
     m_ucState = m_aucNextStateMPS[ m_ucState ];
   }
-  
+
   Int getEntropyBits(Short val) { return m_entropyBits[m_ucState ^ val]; }
-    
+
 #if FAST_BIT_EST
   Void update( Int binVal )
@@ -88 +89 @@
   Void setBinsCoded(UInt val)   { m_binsCoded = val;  }
   UInt getBinsCoded()           { return m_binsCoded;   }
-  
+
 private:
   UChar         m_ucState;                                                                  ///< internal state variable
-  static const  UChar m_aucNextStateMPS[ 128 ];
-  static const  UChar m_aucNextStateLPS[ 128 ];
-  static const Int m_entropyBits[ 128 ];
+
+  static const  UInt  m_totalStates = (1 << CONTEXT_STATE_BITS) * 2; //*2 for MPS = [0|1]
+  static const  UChar m_aucNextStateMPS[m_totalStates];
+  static const  UChar m_aucNextStateLPS[m_totalStates];
+  static const  Int   m_entropyBits    [m_totalStates];
 #if FAST_BIT_EST
-  static UChar m_nextState[128][2];
+  static UChar m_nextState[m_totalStates][2 /*MPS = [0|1]*/];
 #endif
   UInt          m_binsCoded;