Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/NALwrite.h

Timestamp:

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

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibEncoder/NALwrite.h (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/NALwrite.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 @@
 #pragma once
 
+#ifndef __NALWRITE__
+#define __NALWRITE__
+
 #include <ostream>
 
-#include "TLibCommon/TypeDef.h"
+#include "TLibCommon/CommonDef.h"
 #include "TLibCommon/TComBitStream.h"
 #include "TLibCommon/NAL.h"
@@ -57 +60 @@
     NalUnitType nalUnitType,
     UInt temporalID = 0,
-#if H_MV
+#if NH_MV
     Int layerId = 0)
 #else
     UInt reserved_zero_6bits = 0)
 #endif
-#if H_MV
+#if NH_MV
   : NALUnit(nalUnitType, temporalID, layerId)
 #else
@@ -80 +83 @@
 };
 
-void write(std::ostream& out, OutputNALUnit& nalu);
-void writeRBSPTrailingBits(TComOutputBitstream& bs);
+Void write(std::ostream& out, OutputNALUnit& nalu);
 
 inline NALUnitEBSP::NALUnitEBSP(OutputNALUnit& nalu)
@@ -89 +91 @@
 }
 
-void copyNaluData(OutputNALUnit& naluDest, const OutputNALUnit& naluSrc);
+//! \}
 
-//! \}
+#endif