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

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

trunk/source/Lib/TLibEncoder/TEncBinCoderCABAC.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.
  *
@@ -36 +36 @@
 */
 
-#ifndef __TENC_BIN_CODER_CABAC__
-#define __TENC_BIN_CODER_CABAC__
+#ifndef __TENCBINCODERCABAC__
+#define __TENCBINCODERCABAC__
 
 #include "TLibCommon/TComCABACTables.h"
@@ -50 +50 @@
   TEncBinCABAC ();
   virtual ~TEncBinCABAC();
-  
+
   Void  init              ( TComBitIf* pcTComBitIf );
   Void  uninit            ();
-  
+
   Void  start             ();
   Void  finish            ();
-  Void  copyState         ( TEncBinIf* pcTEncBinIf );
+  Void  copyState         ( const TEncBinIf* pcTEncBinIf );
   Void  flush            ();
 
@@ -62 +62 @@
   Void  encodePCMAlignBits();
   Void  xWritePCMCode     ( UInt uiCode, UInt uiLength );
-  
+
   Void  resetBits         ();
   UInt  getNumWrittenBits ();
-  
+
   Void  encodeBin         ( UInt  binValue,  ContextModel& rcCtxModel );
   Void  encodeBinEP       ( UInt  binValue                            );
   Void  encodeBinsEP      ( UInt  binValues, Int numBins              );
   Void  encodeBinTrm      ( UInt  binValue                            );
-  
+
+  Void  align             ();
+  Void  encodeAlignedBinsEP( UInt  binValues, Int numBins             );
+
   TEncBinCABAC* getTEncBinCABAC()  { return this; }
-  
+  const TEncBinCABAC* getTEncBinCABAC() const { return this; }
+
   Void  setBinsCoded              ( UInt uiVal )  { m_uiBinsCoded = uiVal;               }
   UInt  getBinsCoded              ()              { return m_uiBinsCoded;                }
   Void  setBinCountingEnableFlag  ( Bool bFlag )  { m_binCountIncrement = bFlag ? 1 : 0; }
   Bool  getBinCountingEnableFlag  ()              { return m_binCountIncrement != 0;     }
-  
+
 #if FAST_BIT_EST
 protected:
@@ -85 +89 @@
   Void testAndWriteOut();
   Void writeOut();
-  
+
   TComBitIf*          m_pcTComBitIf;
   UInt                m_uiLow;