Changeset 608 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/AnnexBread.cpp

Timestamp:

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

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/Lib/TLibDecoder/AnnexBread.cpp (modified) (6 diffs)

trunk/source/Lib/TLibDecoder/AnnexBread.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -31 +31 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/**
+ \file     AnnexBread.cpp
+ \brief    reading functions for Annex B byte streams
+ */
+
 
 #include <stdint.h>
@@ -111 +117 @@
    */
   /* NB, (unsigned)x > 2 implies n!=0 && n!=1 */
-  while (bs.eofBeforeNBytes(24/8) || bs.peekBytes(24/8) > 1) // since 0x000002 tile marker may exist in the bitstream
+  while (bs.eofBeforeNBytes(24/8) || bs.peekBytes(24/8) > 2) 
   {
     nalUnit.push_back(bs.readByte());
@@ -147 +153 @@
  *         otherwise true.
  */
-bool
+Bool
 byteStreamNALUnit(
   InputByteStream& bs,
@@ -153 +159 @@
   AnnexBStats& stats)
 {
-  bool eof = false;
+  Bool eof = false;
   try
   {
@@ -162 +168 @@
     eof = true;
   }
-  stats.m_numBytesInNALUnit = unsigned(nalUnit.size());
+  stats.m_numBytesInNALUnit = UInt(nalUnit.size());
   return eof;
 }