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

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/ContextModel.cpp (modified) (3 diffs)

trunk/source/Lib/TLibCommon/ContextModel.cpp

@@ -56 +56 @@
 Void ContextModel::init( Int qp, Int initValue )
 {
-#if H0736_AVC_STYLE_QP_RANGE
   qp = Clip3(0, 51, qp);
-#endif
 
-#if CABAC_LINEAR_INIT
   Int  slope      = (initValue>>4)*5 - 45;
   Int  offset     = ((initValue&15)<<3)-16;
@@ -66 +63 @@
   UInt mpState    = (initState >= 64 );
   m_ucState       = ( (mpState? (initState - 64):(63 - initState)) <<1) + mpState;
-#else
-  Int m = m_slopes[initValue>>4];
-  Int n = initValue & 15;
-  
-  Int val = max( 0, min( 3839, (n<<8) + m * (qp-26) + 128 ) );
-  val -= 1920;
-  Int valMps = val >= 0;
-  val = ( val ^ (val>>11) ) + 128;
-  Int segmentIdx = val >> 8;
-  Int pStateIdx = m_accumulatedSegOffset[segmentIdx] + ( (val&255) * m_segOffset[segmentIdx] >> 8);
-  
-  m_ucState = (pStateIdx<<1) + valMps;
-#endif
 }
 
@@ -143 +127 @@
 #endif
 };
-#if !CABAC_LINEAR_INIT
-const Int ContextModel::m_slopes[16] = { -239, -143, -85, -51, -31, -19, -11, 0, 11, 19, 31, 51, 85, 143, 239, 399 };
-const Int ContextModel::m_segOffset[8]            = {   6,  7,  5,  7, 10, 14, 16,  1 };
-const Int ContextModel::m_accumulatedSegOffset[8] = {  -3,  3, 10, 15, 22, 32, 46, 62 };
-#endif
 //! \}