Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncBinCoder.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/TEncBinCoder.h (modified) (4 diffs)

trunk/source/Lib/TLibEncoder/TEncBinCoder.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__
-#define __TENC_BIN_CODER__
+#ifndef __TENCBINCODER__
+#define __TENCBINCODER__
 
 #include "TLibCommon/ContextModel.h"
@@ -55 +55 @@
   virtual Void  start             ()                                          = 0;
   virtual Void  finish            ()                                          = 0;
-  virtual Void  copyState         ( TEncBinIf* pcTEncBinIf )                  = 0;
+  virtual Void  copyState         ( const TEncBinIf* pcTEncBinIf )            = 0;
   virtual Void  flush            ()                                           = 0;
 
@@ -70 +70 @@
   virtual Void  encodeBinTrm      ( UInt  uiBin                            )  = 0;
 
+  virtual Void  align             ()                                          = 0;
+
   virtual TEncBinCABAC*   getTEncBinCABAC   ()  { return 0; }
-  
+  virtual const TEncBinCABAC*   getTEncBinCABAC   () const { return 0; }
+
   virtual ~TEncBinIf() {}
 };