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

Timestamp:

8 Nov 2013, 07:09:02 (11 years ago)

Author:

seregin

Message:

remove VPS_SPLIT_FLAG macro

File:

• branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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

@@ -1010 +1010 @@
   vps->setNumScalabilityTypes(numScalabilityTypes);
 
-#if VPS_SPLIT_FLAG
   for(j = 0; j < numScalabilityTypes - vps->getSplittingFlag(); j++)
-#else
-  for(j = 0; j < numScalabilityTypes; j++)
-#endif
   {
     READ_CODE( 3, uiCode, "dimension_id_len_minus1[j]" ); vps->setDimensionIdLen(j, uiCode + 1);
   }
-#if VPS_SPLIT_FLAG
+
   if(vps->getSplittingFlag())
   {
@@ -1030 +1026 @@
     numBits = 6;
   }
-#else
-  if(vps->getSplittingFlag())
-  {
-    UInt numBits = 0;
-    for(j = 0; j < numScalabilityTypes; j++)
-    {
-      numBits += vps->getDimensionIdLen(j);
-    }
-    assert( numBits <= 6 );
-  }
-#endif
 
   READ_FLAG( uiCode, "vps_nuh_layer_id_present_flag" ); vps->setNuhLayerIdPresentFlag(uiCode ? true : false);
@@ -1058 +1043 @@
     vps->setLayerIdInVps(vps->getLayerIdInNuh(i), i);
 
-#if VPS_SPLIT_FLAG
-    if(!vps->getSplittingFlag())
-#endif
-    for(j = 0; j < numScalabilityTypes; j++)
-    {
-      READ_CODE( vps->getDimensionIdLen(j), uiCode, "dimension_id[i][j]" ); vps->setDimensionId(i, j, uiCode);
-      assert( uiCode <= vps->getMaxLayerId() );
+    if( !vps->getSplittingFlag() )
+    {
+      for(j = 0; j < numScalabilityTypes; j++)
+      {
+        READ_CODE( vps->getDimensionIdLen(j), uiCode, "dimension_id[i][j]" ); vps->setDimensionId(i, j, uiCode);
+        assert( uiCode <= vps->getMaxLayerId() );
+      }
     }
   }