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

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.cpp (modified) (5 diffs)

trunk/source/Lib/TLibCommon/ContextModel.cpp

@@ -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.
  *
@@ -65 +65 @@
 }
 
-const UChar ContextModel::m_aucNextStateMPS[ 128 ] =
+const UChar ContextModel::m_aucNextStateMPS[ ContextModel::m_totalStates ] =
 {
   2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
@@ -77 +77 @@
 };
 
-const UChar ContextModel::m_aucNextStateLPS[ 128 ] =
+const UChar ContextModel::m_aucNextStateLPS[ ContextModel::m_totalStates ] =
 {
   1, 0, 0, 1, 2, 3, 4, 5, 4, 5, 8, 9, 8, 9, 10, 11,
@@ -90 +90 @@
 
 #if FAST_BIT_EST
-UChar ContextModel::m_nextState[128][2];
+UChar ContextModel::m_nextState[ ContextModel::m_totalStates ][2 /*MPS = [0|1]*/];
 
 Void ContextModel::buildNextStateTable()
 {
-  for (Int i = 0; i < 128; i++)
+  for (Int i = 0; i < ContextModel::m_totalStates; i++)
   {
     for (Int j = 0; j < 2; j++)
@@ -104 +104 @@
 #endif
 
-const Int ContextModel::m_entropyBits[128] =
+const Int ContextModel::m_entropyBits[ ContextModel::m_totalStates ] =
 {
 #if FAST_BIT_EST