Changeset 213 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibEncoder/NALwrite.cpp

Timestamp:

31 Dec 2012, 18:33:14 (12 years ago)

Author:

mitsubishi-htm

Message:

A final release, as planned

• Migrate to HTM 5.1
• For VC project files, only VC9 file is updated
• To be used as an additional anchor for CE1.h for 3rd JCTVC meeting at Geneva

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibEncoder/NALwrite.cpp (modified) (5 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibEncoder/NALwrite.cpp

@@ -64 +64 @@
 #endif
 
+#if QC_MVHEVC_B0046
+  bsNALUHeader.write(nalu.m_layerId,        5); // when nal_ref_flag is signalled, 5 bits here. otherwise, 6 bits
+  bsNALUHeader.write(nalu.m_temporalId + 1, 3); // temporal_id
+#else
 #if VIDYO_VPS_INTEGRATION
   bsNALUHeader.write(nalu.m_temporalId, 3); // temporal_id
@@ -79 +83 @@
   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:
@@ -95 +101 @@
 #endif
 #endif
-  
+#endif 
   out.write(bsNALUHeader.getByteStream(), bsNALUHeader.getByteStreamLength());
 
@@ -196 +202 @@
 }
 
+#if !QC_MVHEVC_B0046
 /**
  * Copy NALU from naluSrc to naluDest
@@ -222 +229 @@
   naluDest.m_Bitstream   = naluSrc.m_Bitstream;
 }
+#endif
 
 //! \}