Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/NALread.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/NALread.h (modified) (3 diffs)

trunk/source/Lib/TLibDecoder/NALread.h

@@ -4 +4 @@
  * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -34 +34 @@
 /**
  \file     NALread.h
- \brief    reading funtionality for NAL units
+ \brief    reading functionality for NAL units
  */
 
 #pragma once
 
-#include "../TLibCommon/TypeDef.h"
-#include "../TLibCommon/TComBitStream.h"
-#include "../TLibCommon/NAL.h"
-
+#ifndef __NALREAD__
+#define __NALREAD__
+#include "TLibCommon/CommonDef.h"
+#include "TLibCommon/TComBitStream.h"
+#include "TLibCommon/NAL.h"
 //! \ingroup TLibDecoder
 //! \{
@@ -50 +51 @@
  * bitstream object.
  */
-struct InputNALUnit : public NALUnit
+class InputNALUnit : public NALUnit
 {
-  InputNALUnit() : m_Bitstream(0) {};
-  ~InputNALUnit() { delete m_Bitstream; }
+  private:
+    TComInputBitstream m_Bitstream;
 
-  TComInputBitstream* m_Bitstream;
+  public:
+    InputNALUnit(const InputNALUnit &src) : NALUnit(src), m_Bitstream(src.m_Bitstream) {};
+    InputNALUnit() : m_Bitstream() {};
+    virtual ~InputNALUnit() { }
+    const TComInputBitstream &getBitstream() const { return m_Bitstream; }
+          TComInputBitstream &getBitstream()       { return m_Bitstream; }
 };
 
-void read(InputNALUnit& nalu, std::vector<uint8_t>& nalUnitBuf);
+Void read(InputNALUnit& nalu);
+Void readNalUnitHeader(InputNALUnit& nalu);
 
 //! \}
+
+#endif