Changeset 1160 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

8 Jul 2015, 00:47:56 (11 years ago)

Author:

seregin

Message:

macro cleanup: DEF_OPT_LAYER_IDC

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2957 +2957 @@
       if( vps->getDefaultTargetOutputLayerIdc() == 1 )
       {
-        for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
-        {
-#if DEF_OPT_LAYER_IDC
+        for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
+        {
           vps->setOutputLayerFlag(i, j, (j == (vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet)-1))  );
-
-#else
-          vps->setOutputLayerFlag(i, j, (j == (vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet)-1)) && (vps->getDimensionId(j,1) == 0) );
-#endif
-        }
-      }
-      else if ( vps->getDefaultTargetOutputLayerIdc() == 0 )
-      {
-        for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
+        }
+      }
+      else if( vps->getDefaultTargetOutputLayerIdc() == 0 )
+      {
+        for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
         {
           vps->setOutputLayerFlag(i, j, 1);