Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibEncoder/NALwrite.h

Timestamp:

19 Feb 2013, 20:33:52 (12 years ago)

Author:

tech

Message:

Removed HM-6.1 related guard macros.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibEncoder/NALwrite.h (modified) (3 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/NALwrite.h

@@ -54 +54 @@
    * written to the bitstream.
    */
-#if H0388
   OutputNALUnit(
     NalUnitType nalUnitType,
-#if NAL_REF_FLAG
     Bool nalRefFlag,
-#else
-    NalRefIdc nalRefIDC,
-#endif
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     unsigned layerId,
@@ -69 +64 @@
 #endif
     unsigned temporalID = 0)
-#if NAL_REF_FLAG
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   : NALUnit(nalUnitType, nalRefFlag, layerId, temporalID)
@@ -75 +69 @@
   : NALUnit(nalUnitType, nalRefFlag, viewId, isDepth, temporalID)
 #endif
-#else
-#if VIDYO_VPS_INTEGRATION
-  : NALUnit(nalUnitType, nalRefIDC, layerId, temporalID)
-#else
-  : NALUnit(nalUnitType, nalRefIDC, viewId, isDepth, temporalID)
-#endif
-#endif
   , m_Bitstream()
   {}
-#else
-  OutputNALUnit(
-    NalUnitType nalUnitType,
-    NalRefIdc nalRefIDC,
-    Int viewId,
-    Bool isDepth,
-    unsigned temporalID = 0,
-    bool outputFlag = true)
-  : NALUnit(nalUnitType, nalRefIDC, viewId, isDepth, temporalID, outputFlag)
-  , m_Bitstream()
-  {}
-#endif
 
   OutputNALUnit(const NALUnit& src)