Changeset 56 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecBinCoderCABAC.h

Timestamp:

11 May 2012, 21:20:17 (13 years ago)

Author:

hschwarz

Message:

updated trunk (move to HM6.1)

File:

• trunk/source/Lib/TLibDecoder/TDecBinCoderCABAC.h (modified) (5 diffs)

trunk/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-2011, ISO/IEC
+ * Copyright (c) 2010-2012, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -15 +15 @@
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- *  * Neither the name of the ISO/IEC nor the names of its contributors may
+ *  * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
  *    be used to endorse or promote products derived from this software without
  *    specific prior written permission.
@@ -32 +32 @@
  */
 
-
-
 /** \file     TDecBinCoderCABAC.h
     \brief    binary entropy decoder of CABAC
@@ -41 +39 @@
 #define __TDEC_BIN_CODER_CABAC__
 
-#include "../TLibCommon/TComCABACTables.h"
+#include "TLibCommon/TComCABACTables.h"
 #include "TDecBinCoder.h"
 
+//! \ingroup TLibDecoder
+//! \{
 
 class TDecBinCABAC : public TDecBinIf
@@ -50 +50 @@
   TDecBinCABAC ();
   virtual ~TDecBinCABAC();
-
-  Void  init              ( TComBitstream* pcTComBitstream );
+  
+  Void  init              ( TComInputBitstream* pcTComBitstream );
   Void  uninit            ();
-
+  
   Void  start             ();
   Void  finish            ();
-
+#if OL_FLUSH
+  Void  flush             ();
+#endif
+  
   Void  decodeBin         ( UInt& ruiBin, ContextModel& rcCtxModel );
   Void  decodeBinEP       ( UInt& ruiBin                           );
+  Void  decodeBinsEP      ( UInt& ruiBin, Int numBins              );
   Void  decodeBinTrm      ( UInt& ruiBin                           );
+  
+  Void  resetBac          ();
+#if BURST_IPCM
+  Void  decodeNumSubseqIPCM( Int& numSubseqIPCM ) ;
+#endif
+  Void  decodePCMAlignBits();
+  Void  xReadPCMCode      ( UInt uiLength, UInt& ruiCode );
+  
+  Void  copyState         ( TDecBinIf* pcTDecBinIf );
+  TDecBinCABAC* getTDecBinCABAC()  { return this; }
+#if !OL_FLUSH_ALIGN
+  Int   getBitsReadAhead() { return -m_bitsNeeded; }
+#endif
 
 private:
-  Void  xReadBit          ( UInt& ruiVal );
-
-private:
-  TComBitstream*      m_pcTComBitstream;
+  TComInputBitstream* m_pcTComBitstream;
   UInt                m_uiRange;
   UInt                m_uiValue;
+#if OL_FLUSH && !OL_FLUSH_ALIGN
+  UInt                m_uiLastByte;
+#endif
+  Int                 m_bitsNeeded;
 };
 
+//! \}
 
 #endif