Changeset 1095 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

2 Jul 2015, 21:15:31 (9 years ago)

Author:

seregin

Message:

cleanup macros: MOVE_ADDN_LS_SIGNALLING

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -61 +61 @@
 #define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag
 #define OUTPUT_LAYER_SETS_CONFIG         1
-#define MOVE_ADDN_LS_SIGNALLING          1      ///< JCTVC-R0238: (Ed.) Move additional layer set signalling in VPS extn.
 #define PTL_SIGNALLING                   1      ///< Overall macro for all PTL-related signalling
 #if PTL_SIGNALLING

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

@@ -2877 +2877 @@
   vps->setTreePartitionLayerIdList();
 #endif
-#if MOVE_ADDN_LS_SIGNALLING
 #if Q0078_ADD_LAYER_SETS
   if (vps->getNumIndependentLayers() > 1)
@@ -2905 +2904 @@
     vps->setNumAddLayerSets(0);
   }
-#endif
 #endif
 #if VPS_TSLAYERS
@@ -2997 +2995 @@
 #endif
   }
-#endif
-
-#if !MOVE_ADDN_LS_SIGNALLING
-#if Q0078_ADD_LAYER_SETS
-  if (vps->getNumIndependentLayers() > 1)
-  {
-    READ_UVLC(uiCode, "num_add_layer_sets"); vps->setNumAddLayerSets(uiCode);
-    for (i = 0; i < vps->getNumAddLayerSets(); i++)
-    {
-      for (j = 1; j < vps->getNumIndependentLayers(); j++)
-      {
-        int len = 1;
-        while ((1 << len) < (vps->getNumLayersInTreePartition(j) + 1))
-        {
-          len++;
-        }
-        READ_CODE(len, uiCode, "highest_layer_idx_plus1[i][j]"); vps->setHighestLayerIdxPlus1(i, j, uiCode);
-      }
-    }
-    vps->setNumLayerSets(vps->getNumLayerSets() + vps->getNumAddLayerSets());
-    vps->setLayerIdIncludedFlagsForAddLayerSets();
-  }
-#endif
 #endif
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2127 +2127 @@
   }
 #endif
-#if MOVE_ADDN_LS_SIGNALLING
 #if Q0078_ADD_LAYER_SETS
   if (vps->getNumIndependentLayers() > 1)
@@ -2145 +2144 @@
     }
   }
-#endif
 #endif
 #if VPS_TSLAYERS
@@ -2212 +2210 @@
 #endif
 
-
-#if !MOVE_ADDN_LS_SIGNALLING
-#if Q0078_ADD_LAYER_SETS
-  if (vps->getNumIndependentLayers() > 1)
-  {
-    WRITE_UVLC( vps->getNumAddLayerSets(), "num_add_layer_sets" );
-    for (i = 0; i < vps->getNumAddLayerSets(); i++)
-    {
-      for (j = 1; j < vps->getNumIndependentLayers(); j++)
-      {
-        int len = 1;
-        while ((1 << len) < (vps->getNumLayersInTreePartition(j) + 1))
-        {
-          len++;
-        }
-        WRITE_CODE(vps->getHighestLayerIdxPlus1(i, j), len, "highest_layer_idx_plus1[i][j]");
-      }
-    }
-  }
-#endif
-#endif
-
 #if !VPS_EXTN_UEV_CODING
   Int numOutputLayerSets = vps->getNumOutputLayerSets() ;