Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp

Timestamp:

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

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp (modified) (17 diffs)

trunk/source/Lib/TLibEncoder/TEncBinCoderCABAC.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.  
- *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * granted under this license.
+ *
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -38 +38 @@
 #include "TEncBinCoderCABAC.h"
 #include "TLibCommon/TComRom.h"
-
+#include "TLibCommon/Debug.h"
 
 //! \ingroup TLibEncoder
@@ -74 +74 @@
   m_numBufferedBytes = 0;
   m_bufferedByte     = 0xff;
+#if FAST_BIT_EST
+  m_fracBits         = 0;
+#endif
 }
 
@@ -100 +103 @@
       m_pcTComBitIf->write( 0xff, 8 );
       m_numBufferedBytes--;
-    }    
+    }
   }
   m_pcTComBitIf->write( m_uiLow >> 8, 24 - m_bitsLeft );
@@ -143 +146 @@
 }
 
-Void TEncBinCABAC::copyState( TEncBinIf* pcTEncBinIf )
-{
-  TEncBinCABAC* pcTEncBinCABAC = pcTEncBinIf->getTEncBinCABAC();
+Void TEncBinCABAC::copyState( const TEncBinIf* pcTEncBinIf )
+{
+  const TEncBinCABAC* pcTEncBinCABAC = pcTEncBinIf->getTEncBinCABAC();
   m_uiLow           = pcTEncBinCABAC->m_uiLow;
   m_uiRange         = pcTEncBinCABAC->m_uiRange;
@@ -153 +156 @@
 #if FAST_BIT_EST
   m_fracBits = pcTEncBinCABAC->m_fracBits;
+  D_PRINT_INDENT(g_traceEncFracBits,  "CopyState " + n2s(m_fracBits) );    
 #endif
 }
@@ -167 +171 @@
   }
 #if FAST_BIT_EST
+  D_PRINT_INDENT( g_traceEncFracBits, "Reset Bits Before" + n2s(m_fracBits) );
   m_fracBits &= 32767;
+  D_PRINT_INDENT( g_traceEncFracBits, "Reset Bits " + n2s(m_fracBits) );  
 #endif
 }
@@ -184 +190 @@
 Void TEncBinCABAC::encodeBin( UInt binValue, ContextModel &rcCtxModel )
 {
-  {
-#if !H_MV
-    DTRACE_CABAC_VL( g_nSymbolCounter++ )
-    DTRACE_CABAC_T( "\tstate=" )
-    DTRACE_CABAC_V( ( rcCtxModel.getState() << 1 ) + rcCtxModel.getMps() )
-    DTRACE_CABAC_T( "\tsymbol=" )
-    DTRACE_CABAC_V( binValue )
-    DTRACE_CABAC_T( "\n" )
-#endif
-  }
+#if !NH_MV
+  //{
+  //  DTRACE_CABAC_VL( g_nSymbolCounter++ )
+  //  DTRACE_CABAC_T( "\tstate=" )
+  //  DTRACE_CABAC_V( ( rcCtxModel.getState() << 1 ) + rcCtxModel.getMps() )
+  //  DTRACE_CABAC_T( "\tsymbol=" )
+  //  DTRACE_CABAC_V( binValue )
+  //  DTRACE_CABAC_T( "\n" )
+  //}
+#endif
+#if DEBUG_CABAC_BINS
+  const UInt startingRange = m_uiRange;
+#endif
+
   m_uiBinsCoded += m_binCountIncrement;
   rcCtxModel.setBinsCoded( 1 );
-  
+
   UInt  uiLPS   = TComCABACTables::sm_aucLPSTable[ rcCtxModel.getState() ][ ( m_uiRange >> 6 ) & 3 ];
   m_uiRange    -= uiLPS;
-  
+
   if( binValue != rcCtxModel.getMps() )
   {
@@ -206 +216 @@
     m_uiRange   = uiLPS << numBits;
     rcCtxModel.updateLPS();
-    
     m_bitsLeft -= numBits;
+    testAndWriteOut();
   }
   else
   {
     rcCtxModel.updateMPS();
-    if ( m_uiRange >= 256 )
-    {
-      return;
-    }
-    
-    m_uiLow <<= 1;
-    m_uiRange <<= 1;
-    m_bitsLeft--;
-  }
-  
-  testAndWriteOut();
+
+    if ( m_uiRange < 256 )
+    {
+      m_uiLow <<= 1;
+      m_uiRange <<= 1;
+      m_bitsLeft--;
+      testAndWriteOut();
+    }
+  }
+
+#if DEBUG_CABAC_BINS
+  if ((g_debugCounter + debugCabacBinWindow) >= debugCabacBinTargetLine)
+  {
+    std::cout << g_debugCounter << ": coding bin value " << binValue << ", range = [" << startingRange << "->" << m_uiRange << "]\n";
+  }
+
+  if (g_debugCounter >= debugCabacBinTargetLine)
+  {
+    Char breakPointThis;
+    breakPointThis = 7;
+  }
+  if (g_debugCounter >= (debugCabacBinTargetLine + debugCabacBinWindow))
+  {
+    exit(0);
+  }
+
+  g_debugCounter++;
+#endif
 }
 
@@ -232 +259 @@
 Void TEncBinCABAC::encodeBinEP( UInt binValue )
 {
-  {
-#if !H_MV
+  if (false)
+  {
+#if !NH_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tEPsymbol=" )
@@ -240 +268 @@
 #endif
   }
+
   m_uiBinsCoded += m_binCountIncrement;
+
+  if (m_uiRange == 256)
+  {
+    encodeAlignedBinsEP(binValue, 1);
+    return;
+  }
+
   m_uiLow <<= 1;
   if( binValue )
@@ -247 +283 @@
   }
   m_bitsLeft--;
-  
+
   testAndWriteOut();
 }
@@ -260 +296 @@
 {
   m_uiBinsCoded += numBins & -m_binCountIncrement;
-  
-  for ( Int i = 0; i < numBins; i++ )
-  {
-#if !H_MV
-    DTRACE_CABAC_VL( g_nSymbolCounter++ )
-    DTRACE_CABAC_T( "\tEPsymbol=" )
-    DTRACE_CABAC_V( ( binValues >> ( numBins - 1 - i ) ) & 1 )
-    DTRACE_CABAC_T( "\n" )
-#endif
-  }
-  
+
+  if (false)
+  {
+    for ( Int i = 0; i < numBins; i++ )
+    {
+#if !NH_MV
+      DTRACE_CABAC_VL( g_nSymbolCounter++ )
+      DTRACE_CABAC_T( "\tEPsymbol=" )
+      DTRACE_CABAC_V( ( binValues >> ( numBins - 1 - i ) ) & 1 )
+      DTRACE_CABAC_T( "\n" )
+#endif
+    }
+  }
+
+  if (m_uiRange == 256)
+  {
+    encodeAlignedBinsEP(binValues, numBins);
+    return;
+  }
+
   while ( numBins > 8 )
   {
     numBins -= 8;
-    UInt pattern = binValues >> numBins; 
+    UInt pattern = binValues >> numBins;
     m_uiLow <<= 8;
     m_uiLow += m_uiRange * pattern;
     binValues -= pattern << numBins;
     m_bitsLeft -= 8;
-    
+
     testAndWriteOut();
   }
-  
+
   m_uiLow <<= numBins;
   m_uiLow += m_uiRange * binValues;
   m_bitsLeft -= numBins;
-  
+
   testAndWriteOut();
+}
+
+Void TEncBinCABAC::align()
+{
+  m_uiRange = 256;
+}
+
+Void TEncBinCABAC::encodeAlignedBinsEP( UInt binValues, Int numBins )
+{
+  Int binsRemaining = numBins;
+
+  assert(m_uiRange == 256); //aligned encode only works when range = 256
+
+  while (binsRemaining > 0)
+  {
+    const UInt binsToCode = std::min<UInt>(binsRemaining, 8); //code bytes if able to take advantage of the system's byte-write function
+    const UInt binMask    = (1 << binsToCode) - 1;
+
+    const UInt newBins = (binValues >> (binsRemaining - binsToCode)) & binMask;
+
+    //The process of encoding an EP bin is the same as that of coding a normal
+    //bin where the symbol ranges for 1 and 0 are both half the range:
+    //
+    //  low = (low + range/2) << 1       (to encode a 1)
+    //  low =  low            << 1       (to encode a 0)
+    //
+    //  i.e.
+    //  low = (low + (bin * range/2)) << 1
+    //
+    //  which is equivalent to:
+    //
+    //  low = (low << 1) + (bin * range)
+    //
+    //  this can be generalised for multiple bins, producing the following expression:
+    //
+    m_uiLow = (m_uiLow << binsToCode) + (newBins << 8); //range is known to be 256
+
+    binsRemaining -= binsToCode;
+    m_bitsLeft    -= binsToCode;
+
+    testAndWriteOut();
+  }
 }
 
@@ -314 +401 @@
     m_uiLow   <<= 1;
     m_uiRange <<= 1;
-    m_bitsLeft--;    
-  }
-  
+    m_bitsLeft--;
+  }
+
   testAndWriteOut();
 }
@@ -336 +423 @@
   m_bitsLeft += 8;
   m_uiLow &= 0xffffffffu >> m_bitsLeft;
-  
+
   if ( leadByte == 0xff )
   {
@@ -349 +436 @@
       m_bufferedByte = leadByte & 0xff;
       m_pcTComBitIf->write( byte, 8 );
-      
+
       byte = ( 0xff + carry ) & 0xff;
       while ( m_numBufferedBytes > 1 )
@@ -361 +448 @@
       m_numBufferedBytes = 1;
       m_bufferedByte = leadByte;
-    }      
-  }    
+    }
+  }
 }