Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/AnnexBread.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

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

trunk/source/Lib/TLibDecoder/AnnexBread.h

@@ -4 +4 @@
  * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -39 +39 @@
 #pragma once
 
+#ifndef __ANNEXBREAD__
+#define __ANNEXBREAD__
+
 #include <stdint.h>
 #include <istream>
 #include <vector>
 
-#include "../TLibCommon/TypeDef.h"
+#include "TLibCommon/CommonDef.h"
 
 //! \ingroup TLibDecoder
@@ -72 +75 @@
    * modified externally to this class
    */
-  void reset()
+  Void reset()
   {
     m_NumFutureBytes = 0;
@@ -86 +89 @@
     assert(n <= 4);
     if (m_NumFutureBytes >= n)
+    {
       return false;
+    }
 
     n -= m_NumFutureBytes;
@@ -150 +155 @@
     uint32_t val = 0;
     for (UInt i = 0; i < n; i++)
+    {
       val = (val << 8) | readByte();
+    }
     return val;
   }
+
+#if RExt__DECODER_DEBUG_BIT_STATISTICS
+  UInt GetNumBufferedBytes() const { return m_NumFutureBytes; }
+#endif
 
 private:
@@ -185 +196 @@
 
 //! \}
+
+#endif