Changeset 1166 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:10:28 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_VST_PARAMS

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -49 +49 @@
 #define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture
 #define VPS_RESERVED_FLAGS               1      ///< vps_base_layer_internal_flag and vps_base_layer_available_flag
-#define VPS_VUI_VST_PARAMS               1      ///< JCTVC-R0227: Related to signalling of VST parameters of the base layer.
 #define VPS_VUI_OFFSET                   1      ///< N0085: Signal VPS VUI offset in the VPS extension 
 #define POC_RESET_RESTRICTIONS           1      ///< Restrictions on semantics of POC reset-related syntax elements, including one item from R0223

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

@@ -3475 +3475 @@
   else
   {
-#if VPS_VUI_VST_PARAMS
     vps->setNumVideoSignalInfo(vps->getMaxLayers() - vps->getBaseLayerInternalFlag() ? 0 : 1);
-#else
-    vps->setNumVideoSignalInfo(vps->getMaxLayers());
-#endif
   }
 
@@ -3490 +3486 @@
     READ_CODE(8, uiCode, "matrix_coeffs_vps" );vps->setMaxtrixCoeff(i,uiCode);
   }
-#if VPS_VUI_VST_PARAMS
+
   if( vps->getVideoSigPresentVpsFlag() && vps->getNumVideoSignalInfo() > 1 )
   {
@@ -3512 +3508 @@
     }
   }
-#else
-  if(!vps->getVideoSigPresentVpsFlag())
-  {
-    for (i=0; i < vps->getMaxLayers(); i++)
-    {
-      vps->setVideoSignalInfoIdx(i,i);
-    }
-  }
-  else {
-    vps->setVideoSignalInfoIdx(0,0);
-    if (vps->getNumVideoSignalInfo() > 1 )
-    {
-      for (i=1; i < vps->getMaxLayers(); i++)
-        READ_CODE(4, uiCode, "vps_video_signal_info_idx" ); vps->setVideoSignalInfoIdx(i, uiCode);
-    }
-    else {
-      for (i=1; i < vps->getMaxLayers(); i++)
-      {
-        vps->setVideoSignalInfoIdx(i,0);
-      }
-    }
-  }
-#endif
+
 #endif 
 #if VPS_VUI_TILES_NOT_IN_USE__FLAG

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

@@ -2446 +2446 @@
   }
 
-  if (vps->getVideoSigPresentVpsFlag() && vps->getNumVideoSignalInfo() > 1 )
-  {
-#if VPS_VUI_VST_PARAMS
-    for(i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getMaxLayers(); i++)
+  if( vps->getVideoSigPresentVpsFlag() && vps->getNumVideoSignalInfo() > 1 )
+  {
+    for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getMaxLayers(); i++ )
     {
       WRITE_CODE( vps->getVideoSignalInfoIdx(i), 4, "vps_video_signal_info_idx" );
     }
-#else
-    for (i=1; i < vps->getMaxLayers(); i++)
-      WRITE_CODE(vps->getVideoSignalInfoIdx(i), 4, "vps_video_signal_info_idx" );
-#endif
   }
 #endif