Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp

Timestamp:

19 Feb 2013, 20:33:52 (12 years ago)

Author:

tech

Message:

Removed HM-6.1 related guard macros.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp (modified) (5 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp

@@ -105 +105 @@
 }
 
-#if OL_FLUSH
 Void TEncBinCABAC::flush()
 {
@@ -117 +116 @@
   start();
 }
-#endif
 
 /** Reset BAC register and counter values.
@@ -127 +125 @@
 }
 
-#if BURST_IPCM
 /** Encode # of subsequent IPCM blocks.
  * \param numSubseqIPCM 
@@ -153 +150 @@
   }
 }
-#endif
 
 /** Encode PCM alignment zero bits.
@@ -160 +156 @@
 Void TEncBinCABAC::encodePCMAlignBits()
 {
-#if !BURST_IPCM
-  finish();
-  m_pcTComBitIf->write( 1, 1 ); // stop bit
-#endif
   m_pcTComBitIf->writeAlignZero(); // pcm align zero
 }