Changeset 529 in SHVCSoftware for branches/SHM-4.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

25 Dec 2013, 05:53:40 (11 years ago)

Author:

seregin

Message:

remove IL_SL_SIGNALLING_N0371 macro and related code

File:

• branches/SHM-4.1-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (4 diffs)

branches/SHM-4.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1465 +1465 @@
   if(pcSlice->getSPS()->getScalingListFlag())
   {
-#if IL_SL_SIGNALLING_N0371
-    pcSlice->getSPS()->getScalingList()->setLayerId( m_layerId );
-#endif
-
     pcSlice->setScalingList ( pcSlice->getSPS()->getScalingList()  );
 
     if(pcSlice->getPPS()->getScalingListPresentFlag())
     {
-#if IL_SL_SIGNALLING_N0371
-      pcSlice->getPPS()->getScalingList()->setLayerId( m_layerId );
-#endif
-
       pcSlice->setScalingList ( pcSlice->getPPS()->getScalingList()  );
     }
@@ -1484 +1476 @@
     if(!pcSlice->getPPS()->getScalingListPresentFlag() && !pcSlice->getSPS()->getScalingListPresentFlag())
     {
-#if IL_SL_SIGNALLING_N0371
-      pcSlice->setDefaultScalingList( m_layerId );
-#else
       pcSlice->setDefaultScalingList();
-#endif
     }
     m_cTrQuant.setScalingListDec(pcSlice->getScalingList());
@@ -1495 +1483 @@
   else
   {
-#if IL_SL_SIGNALLING_N0371
-    m_cTrQuant.setFlatScalingList( m_layerId );
-#else
     m_cTrQuant.setFlatScalingList();
-#endif
     m_cTrQuant.setUseScalingList(false);
   }
@@ -1543 +1527 @@
   TComPPS* pps = new TComPPS();
 
-#if SCALINGLIST_INFERRING || IL_SL_SIGNALLING_N0371
+#if SCALINGLIST_INFERRING
   pps->setLayerId( m_layerId );
 #endif