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

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

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

trunk/source/Lib/TLibCommon/TComBitStream.cpp

@@ -73 +73 @@
   m_puiTileMarkerLocation     = new UInt[MAX_MARKER_PER_NALU];
   m_uiTileMarkerLocationCount = 0;
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   m_numBitsRead = 0;
-#endif
 }
 
@@ -212 +210 @@
   assert( uiNumberOfBits <= 32 );
   
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   m_numBitsRead += uiNumberOfBits;
-#endif
 
   /* NB, bits are extracted from the MSB of each byte. */
@@ -334 +330 @@
     buf->push_back(uiByte);
   }
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
   buf->push_back(0); // The final chunk might not start byte aligned.
 #endif