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

Timestamp:

8 Jul 2015, 00:24:37 (11 years ago)

Author:

seregin

Message:

macro cleanup: VPS_TSLAYERS

File:

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

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

@@ -2823 +2823 @@
   }
 #endif
-#if VPS_TSLAYERS
+
   READ_FLAG( uiCode, "vps_sub_layers_max_minus1_present_flag"); vps->setMaxTSLayersPresentFlag(uiCode ? true : false);
 
@@ -2840 +2840 @@
     }
   }
-#endif
+
   READ_FLAG( uiCode, "max_tid_ref_present_flag"); vps->setMaxTidRefPresentFlag(uiCode ? true : false);
-  if (vps->getMaxTidRefPresentFlag())
-  {
-    for(i = 0; i < vps->getMaxLayers() - 1; i++)
-    {
-      for( j = i+1; j < vps->getMaxLayers(); j++)
-      {
-        if(vps->getDirectDependencyFlag(j, i))
+  if( vps->getMaxTidRefPresentFlag() )
+  {
+    for( i = 0; i < vps->getMaxLayers() - 1; i++ )
+    {
+      for( j = i+1; j < vps->getMaxLayers(); j++ )
+      {
+        if( vps->getDirectDependencyFlag(j, i) )
         {
           READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i][j]" ); vps->setMaxTidIlRefPicsPlus1(i, j, uiCode);