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

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.cpp (modified) (4 diffs)

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

@@ -56 +56 @@
 
   bsNALUHeader.write(0,1); // forbidden_zero_flag
-#if NAL_REF_FLAG
   bsNALUHeader.write(nalu.m_nalRefFlag? 1 : 0, 1); // nal_ref_flag
   bsNALUHeader.write(nalu.m_nalUnitType, 6);          // nal_unit_type
-#else
-  bsNALUHeader.write(nalu.m_nalRefIDC, 2); // nal_ref_idc
-  bsNALUHeader.write(nalu.m_nalUnitType, 5); // nal_unit_type
-#endif
 
 #if QC_MVHEVC_B0046
@@ -72 +67 @@
   bsNALUHeader.write(nalu.m_layerId + 1, 5); // layer_id_plus1
 #else
-#if H0388
   bsNALUHeader.write(nalu.m_temporalId, 3); // temporal_id
  // bsNALUHeader.write(1, 5); // reserved_one_5bits
   bsNALUHeader.write(nalu.m_viewId+1,4); 
   bsNALUHeader.write(nalu.m_isDepth,1);
-#else
-  switch (nalu.m_nalUnitType)
-  {
-  case NAL_UNIT_CODED_SLICE:
-  case NAL_UNIT_CODED_SLICE_IDR:
-#if H0566_TLA
-#if !QC_REM_IDV_B0046
-  case NAL_UNIT_CODED_SLICE_IDV:
-#endif
-  case NAL_UNIT_CODED_SLICE_CRA:
-  case NAL_UNIT_CODED_SLICE_TLA:
-#else
-  case NAL_UNIT_CODED_SLICE_CDR:
-#endif
-    bsNALUHeader.write(nalu.m_temporalId, 3); // temporal_id
-    bsNALUHeader.write(nalu.m_OutputFlag, 1); // output_flag
-  //  bsNALUHeader.write(1, 4); // reserved_one_4bits
-    bsNALUHeader.write(nalu.m_viewId+1,3); 
-    bsNALUHeader.write(nalu.m_isDepth,1);
-    break;
-  default: break;
-  }
-#endif
 #endif
 #endif 
@@ -209 +180 @@
 {
   naluDest.m_nalUnitType = naluSrc.m_nalUnitType;
-#if NAL_REF_FLAG
   naluDest.m_nalRefFlag  = naluSrc.m_nalRefFlag;
-#else
-  naluDest.m_nalRefIDC   = naluSrc.m_nalRefIDC;
-#endif
 #if !VIDYO_VPS_INTEGRATION
   naluDest.m_viewId      = naluSrc.m_viewId;
@@ -223 +190 @@
 #else
   
-#if !H0388
-  naluDest.m_OutputFlag  = naluSrc.m_OutputFlag;
-#endif
 #endif
   naluDest.m_Bitstream   = naluSrc.m_Bitstream;