Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibDecoder/NALread.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/TLibDecoder/NALread.cpp (modified) (4 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/NALread.cpp

@@ -124 +124 @@
   assert(forbidden_zero_bit == 0);
 
-#if NAL_REF_FLAG
   nalu.m_nalRefFlag  = (bs.read(1) != 0 );
   nalu.m_nalUnitType = (NalUnitType) bs.read(6);
-#else
-  nalu.m_nalRefIDC   = (NalRefIdc) bs.read(2);
-  nalu.m_nalUnitType = (NalUnitType) bs.read(5);
-#endif
 
 #if QC_MVHEVC_B0046
@@ -137 +132 @@
   nalu.m_temporalId = bs.read(3) - 1;
 #else
-#if H0388
   nalu.m_temporalId = bs.read(3);
  //  unsigned reserved_one_5bits = bs.read(5);
@@ -147 +141 @@
   nalu.m_isDepth  = bs.read(1);
 #endif
-#if H0566_TLA
   if ( nalu.m_temporalId )
   {
@@ -157 +150 @@
   }
 #endif
-#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
-    {
-      nalu.m_temporalId = bs.read(3);
-#if VIDYO_VPS_INTEGRATION
-      nalu.m_layerId    = bs.read(5) - 1;
-#else
-      nalu.m_OutputFlag = bs.read(1);
-  //    unsigned reserved_one_4bits = bs.read(4);
-  //    assert(reserved_one_4bits == 1);
-      nalu.m_viewId   = bs.read(3)-1;
-      nalu.m_isDepth  = bs.read(1);
-#endif
-
-#if H0566_TLA
-      if (nalu.m_temporalId == 0)
-      {
-#if QC_REM_IDV_B0046
-        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR);
-#else
-        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV );
-#endif
-      }
-      else
-      {
-        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA);
-      }
-#endif
-    }
-    break;
-  default:
-    nalu.m_temporalId = 0;
-    nalu.m_OutputFlag = true;
-    break;
-  }
-#endif
-#endif
 }
 //! \}