Changeset 608 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComBitStream.cpp

Timestamp:

1 Sep 2013, 22:47:26 (12 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/Lib/TLibCommon/TComBitStream.cpp (modified) (21 diffs)

trunk/source/Lib/TLibCommon/TComBitStream.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -55 +55 @@
   m_fifo = new vector<uint8_t>;
   clear();
-  m_puiTileMarkerLocation     = new UInt[MAX_MARKER_PER_NALU];
-  m_uiTileMarkerLocationCount = 0;
 }
 
@@ -62 +60 @@
 {
   delete m_fifo;
-  delete [] m_puiTileMarkerLocation;
 }
 
@@ -71 +68 @@
   m_held_bits = 0;
   m_num_held_bits = 0;
-  m_puiTileMarkerLocation     = new UInt[MAX_MARKER_PER_NALU];
-  m_uiTileMarkerLocationCount = 0;
   m_numBitsRead = 0;
 }
@@ -78 +73 @@
 TComInputBitstream::~TComInputBitstream()
 {
-  delete [] m_puiTileMarkerLocation;
 }
 
@@ -85 +79 @@
 // ====================================================================================================================
 
-char* TComOutputBitstream::getByteStream() const
-{
-  return (char*) &m_fifo->front();
-}
-
-unsigned int TComOutputBitstream::getByteStreamLength()
-{
-  return unsigned(m_fifo->size());
+Char* TComOutputBitstream::getByteStream() const
+{
+  return (Char*) &m_fifo->front();
+}
+
+UInt TComOutputBitstream::getByteStreamLength()
+{
+  return UInt(m_fifo->size());
 }
 
@@ -100 +94 @@
   m_held_bits = 0;
   m_num_held_bits = 0;
-  m_uiTileMarkerLocationCount = 0;
 }
 
@@ -106 +99 @@
 {
   assert( uiNumberOfBits <= 32 );
+  assert( uiNumberOfBits == 32 || (uiBits & (~0 << uiNumberOfBits)) == 0 );
 
   /* any modulo 8 remainder of num_total_bits cannot be written this time,
    * and will be held until next time. */
-  unsigned num_total_bits = uiNumberOfBits + m_num_held_bits;
-  unsigned next_num_held_bits = num_total_bits % 8;
+  UInt num_total_bits = uiNumberOfBits + m_num_held_bits;
+  UInt next_num_held_bits = num_total_bits % 8;
 
   /* form a byte aligned word (write_bits), by concatenating any held bits
@@ -118 +112 @@
    * len(H)=7, len(V)=2: ... ---- HHHH HHHV . V000 0000, next_num_held_bits=1
    * if total_bits < 8, the value of v_ is not used */
-  unsigned char next_held_bits = uiBits << (8 - next_num_held_bits);
+  UChar next_held_bits = uiBits << (8 - next_num_held_bits);
 
   if (!(num_total_bits >> 3))
@@ -131 +125 @@
 
   /* topword serves to justify held_bits to align with the msb of uiBits */
-  unsigned topword = (uiNumberOfBits - next_num_held_bits) & ~((1 << 3) -1);
-  unsigned int write_bits = (m_held_bits << topword) | (uiBits >> next_num_held_bits);
+  UInt topword = (uiNumberOfBits - next_num_held_bits) & ~((1 << 3) -1);
+  UInt write_bits = (m_held_bits << topword) | (uiBits >> next_num_held_bits);
 
   switch (num_total_bits >> 3)
@@ -148 +142 @@
 Void TComOutputBitstream::writeAlignOne()
 {
-  unsigned int num_bits = getNumBitsUntilByteAligned();
+  UInt num_bits = getNumBitsUntilByteAligned();
   write((1 << num_bits) - 1, num_bits);
   return;
@@ -156 +150 @@
 {
   if (0 == m_num_held_bits)
+  {
     return;
+  }
   m_fifo->push_back(m_held_bits);
   m_held_bits = 0;
@@ -182 +178 @@
 }
 
+Void TComOutputBitstream::writeByteAlignment()
+{
+  write( 1, 1);
+  writeAlignZero();
+}
+
+Int TComOutputBitstream::countStartCodeEmulations()
+{
+  UInt cnt = 0;
+  vector<uint8_t>& rbsp   = getFIFO();
+  for (vector<uint8_t>::iterator it = rbsp.begin(); it != rbsp.end();)
+  {
+    vector<uint8_t>::iterator found = it;
+    do
+    {
+      // find the next emulated 00 00 {00,01,02,03}
+      // NB, end()-1, prevents finding a trailing two byte sequence
+      found = search_n(found, rbsp.end()-1, 2, 0);
+      found++;
+      // if not found, found == end, otherwise found = second zero byte
+      if (found == rbsp.end())
+      {
+        break;
+      }
+      if (*(++found) <= 3)
+      {
+        break;
+      }
+    } while (true);
+    it = found;
+    if (found != rbsp.end())
+    {
+      cnt++;
+    }
+  }
+  return cnt;
+}
+
 /**
  * read #uiNumberOfBits# from bitstream without updating the bitstream
@@ -192 +226 @@
 Void TComInputBitstream::pseudoRead ( UInt uiNumberOfBits, UInt& ruiBits )
 {
-  unsigned int saved_num_held_bits = m_num_held_bits;
-  unsigned char saved_held_bits = m_held_bits;
-  unsigned int saved_fifo_idx = m_fifo_idx;
-
-  unsigned num_bits_to_read = min(uiNumberOfBits, getNumBitsLeft());
+  UInt saved_num_held_bits = m_num_held_bits;
+  UChar saved_held_bits = m_held_bits;
+  UInt saved_fifo_idx = m_fifo_idx;
+
+  UInt num_bits_to_read = min(uiNumberOfBits, getNumBitsLeft());
   read(num_bits_to_read, ruiBits);
   ruiBits <<= (uiNumberOfBits - num_bits_to_read);
@@ -213 +247 @@
 
   /* NB, bits are extracted from the MSB of each byte. */
-  unsigned retval = 0;
+  UInt retval = 0;
   if (uiNumberOfBits <= m_num_held_bits)
   {
@@ -243 +277 @@
    * n=5,  len(H)=1, load 1byte,  shift_down=1+3
    */
-  unsigned aligned_word = 0;
-  unsigned num_bytes_to_load = (uiNumberOfBits - 1) >> 3;
+  UInt aligned_word = 0;
+  UInt num_bytes_to_load = (uiNumberOfBits - 1) >> 3;
   assert(m_fifo_idx + num_bytes_to_load < m_fifo->size());
 
@@ -256 +290 @@
 
   /* resolve remainder bits */
-  unsigned next_num_held_bits = (32 - uiNumberOfBits) % 8;
+  UInt next_num_held_bits = (32 - uiNumberOfBits) % 8;
 
   /* copy required part of aligned_word into retval */
@@ -272 +306 @@
  * into this at byte position pos.
  */
-void TComOutputBitstream::insertAt(const TComOutputBitstream& src, unsigned pos)
-{
-  unsigned src_bits = src.getNumberOfWrittenBits();
+void TComOutputBitstream::insertAt(const TComOutputBitstream& src, UInt pos)
+{
+  UInt src_bits = src.getNumberOfWrittenBits();
   assert(0 == src_bits % 8);
 
@@ -298 +332 @@
   this->m_num_held_bits             = src.m_num_held_bits;
   this->m_held_bits                 = src.m_held_bits;
-  this->m_uiTileMarkerLocationCount = src.m_uiTileMarkerLocationCount;
-  for (Int uiIdx=0; uiIdx<m_uiTileMarkerLocationCount; uiIdx++)
-  {
-    this->m_puiTileMarkerLocation[uiIdx] = src.m_puiTileMarkerLocation[uiIdx];
-  }
 
   return *this;
@@ -330 +359 @@
     buf->push_back(uiByte);
   }
-#if !OL_FLUSH_ALIGN
-  buf->push_back(0); // The final chunk might not start byte aligned.
-#endif
   return new TComInputBitstream(buf);
 }
@@ -345 +371 @@
 }
 
+Void TComInputBitstream::readByteAlignment()
+{
+  UInt code = 0;
+  read( 1, code );
+  assert(code == 1);
+
+  UInt numBits = getNumBitsUntilByteAligned();
+  if(numBits)
+  {
+    assert(numBits <= getNumBitsLeft());
+    read( numBits, code );
+    assert(code == 0);
+  }
+}
+
 //! \}