Changeset 1352 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

22 Jul 2015, 03:36:39 (10 years ago)

Author:

seregin

Message:

port rev 4430

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComBitCounter.h (modified) (1 diff)
• TComBitStream.h (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComBitCounter.h

@@ -63 +63 @@
 
   Void        write                 ( UInt /*uiBits*/, UInt uiNumberOfBits )  { m_uiBitCounter += uiNumberOfBits; }
-  Void        resetBits             ()                                    { m_uiBitCounter = 0;               }
-  UInt getNumberOfWrittenBits() const { return m_uiBitCounter; }
+  Void        resetBits             ()                                        { m_uiBitCounter = 0;               }
+  UInt        getNumberOfWrittenBits() const                                  { return m_uiBitCounter; }
+  Int         getNumBitsUntilByteAligned() const                              { return (8 - m_uiBitCounter) & 0x7;}
+
 };
 

branches/SHM-dev/source/Lib/TLibCommon/TComBitStream.h

@@ -63 +63 @@
   virtual Void        write                 ( UInt uiBits, UInt uiNumberOfBits )  = 0;
   virtual Void        resetBits             ()                                    = 0;
-  virtual UInt getNumberOfWrittenBits() const = 0;
+  virtual UInt        getNumberOfWrittenBits() const = 0;
+  virtual Int         getNumBitsUntilByteAligned() const = 0;
   virtual ~TComBitIf() {}
 };
@@ -130 +131 @@
    * achieve byte alignment.
    */
-  Int getNumBitsUntilByteAligned() { return (8 - m_num_held_bits) & 0x7; }
+  Int getNumBitsUntilByteAligned() const { return (8 - m_num_held_bits) & 0x7; }
 
   /**