Changeset 1029 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecBinCoderCABAC.h

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibDecoder/TDecBinCoderCABAC.h (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecBinCoderCABAC.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-2014, ITU/ISO/IEC
@@ -36 +36 @@
 */
 
-#ifndef __TDEC_BIN_CODER_CABAC__
-#define __TDEC_BIN_CODER_CABAC__
+#ifndef __TDECBINCODERCABAC__
+#define __TDECBINCODERCABAC__
 
 #include "TLibCommon/TComCABACTables.h"
@@ -50 +50 @@
   TDecBinCABAC ();
   virtual ~TDecBinCABAC();
-  
+
   Void  init              ( TComInputBitstream* pcTComBitstream );
   Void  uninit            ();
-  
+
   Void  start             ();
   Void  finish            ();
-  
+
+#if RExt__DECODER_DEBUG_BIT_STATISTICS
+  Void  decodeBin          ( UInt& ruiBin, ContextModel& rcCtxModel, const class TComCodingStatisticsClassType &whichStat );
+  Void  decodeBinEP        ( UInt& ruiBin                          , const class TComCodingStatisticsClassType &whichStat );
+  Void  decodeBinsEP       ( UInt& ruiBin, Int numBins             , const class TComCodingStatisticsClassType &whichStat );
+  Void  decodeAlignedBinsEP( UInt& ruiBins, Int numBins            , const class TComCodingStatisticsClassType &whichStat );
+#else
   Void  decodeBin         ( UInt& ruiBin, ContextModel& rcCtxModel );
   Void  decodeBinEP       ( UInt& ruiBin                           );
   Void  decodeBinsEP      ( UInt& ruiBin, Int numBins              );
+  Void  decodeAlignedBinsEP( UInt& ruiBins, Int numBins             );
+#endif
+
+  Void  align             ();
+
   Void  decodeBinTrm      ( UInt& ruiBin                           );
-  
+
   Void  xReadPCMCode      ( UInt uiLength, UInt& ruiCode );
-  
-  Void  copyState         ( TDecBinIf* pcTDecBinIf );
-  TDecBinCABAC* getTDecBinCABAC()  { return this; }
+
+  Void  copyState         ( const TDecBinIf* pcTDecBinIf );
+  TDecBinCABAC* getTDecBinCABAC()             { return this; }
+  const TDecBinCABAC* getTDecBinCABAC() const { return this; }
 
 private: