Changeset 1116 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

7 Jul 2015, 01:18:46 (10 years ago)

Author:

seregin

Message:

macro cleanup: VPS_AVC_BL_FLAG_REMOVAL

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (7 diffs)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (7 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2022 +2022 @@
 
 #if VPS_EXTN_MASK_AND_DIM_INFO
-#if VPS_AVC_BL_FLAG_REMOVAL
   m_nonHEVCBaseLayerFlag = false;
-#else
-  m_avcBaseLayerFlag = false;
-#endif
   m_splittingFlag = false;
   ::memset(m_scalabilityMask, 0, sizeof(m_scalabilityMask));
@@ -3712 +3708 @@
   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
   {
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
-#else
-    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
-#endif
 #else
   if ( layerId == 0 )
@@ -3755 +3747 @@
   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
   {
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
-#else
-    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
-#endif
 #else
   if ( layerId == 0 )
@@ -3807 +3795 @@
   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
   {
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
-#else
-    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
-#endif
 #else
   if ( layerId == 0 )
@@ -3854 +3838 @@
   {
 #endif
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
-#else
-    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
-#endif
     {
       retVal = vps->getVpsRepFormat(layerId)->getBitDepthVpsLuma();
@@ -3896 +3876 @@
   {
 #endif
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
-#else
-    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
-#endif
     {
       retVal = vps->getVpsRepFormat(layerId)->getBitDepthVpsChroma();
@@ -3944 +3920 @@
   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
   {
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
-#else
-    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
-#endif
 #else
   if ( layerId == 0 )

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

@@ -631 +631 @@
   // ------------------------------------------
 #if VPS_EXTN_MASK_AND_DIM_INFO
-#if VPS_AVC_BL_FLAG_REMOVAL
   Bool       m_nonHEVCBaseLayerFlag; 
-#else
-  Bool       m_avcBaseLayerFlag;                                // For now, always set to true.
-#endif
   Bool       m_splittingFlag;
   Bool       m_scalabilityMask[MAX_VPS_NUM_SCALABILITY_TYPES];
@@ -1010 +1006 @@
   Void    setNumLayerSets(UInt v)                               { m_numLayerSets = v;    }
 #if VPS_EXTN_MASK_AND_DIM_INFO
-#if VPS_AVC_BL_FLAG_REMOVAL
   Bool   getNonHEVCBaseLayerFlag()                              { return m_nonHEVCBaseLayerFlag;   }
   Void   setNonHEVCBaseLayerFlag(Bool x)                        { m_nonHEVCBaseLayerFlag = x;      }
-#else
-  Bool   getAvcBaseLayerFlag()                                  { return m_avcBaseLayerFlag;       }
-  Void   setAvcBaseLayerFlag(Bool x)                            { m_avcBaseLayerFlag = x;          }
-#endif
 
   Bool   getSplittingFlag()                                     { return m_splittingFlag;          }

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

@@ -48 +48 @@
 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
 #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_AVC_BL_FLAG_REMOVAL          1      ///< remove avc_base_layer_flag and direct the function its offer to vps_base_layer_internal_flag and vps_base_layer_available_flag
 #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.

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

@@ -1003 +1003 @@
   READ_FLAG( uiCode, "vps_base_layer_internal_flag");             pcVPS->setBaseLayerInternalFlag( uiCode ? true : false );
   READ_FLAG( uiCode, "vps_base_layer_available_flag");            pcVPS->setBaseLayerAvailableFlag( uiCode ? true : false );
-#if VPS_AVC_BL_FLAG_REMOVAL
   pcVPS->setNonHEVCBaseLayerFlag( (pcVPS->getBaseLayerAvailableFlag() && !pcVPS->getBaseLayerInternalFlag()) ? true : false);
-#endif
 #else
   READ_CODE( 2,  uiCode,  "vps_reserved_three_2bits" );           assert(uiCode == 3);
@@ -2722 +2720 @@
   UInt numScalabilityTypes = 0, i = 0, j = 0;
 
-#if !VPS_AVC_BL_FLAG_REMOVAL
-  READ_FLAG( uiCode, "avc_base_layer_flag" ); vps->setAvcBaseLayerFlag(uiCode ? true : false);
-#endif
-
   READ_FLAG( uiCode, "splitting_flag" ); vps->setSplittingFlag(uiCode ? true : false);
 

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

@@ -498 +498 @@
 
     // When avc_base_layer_flag is equal to 1, it is a requirement of bitstream conformance that the value of sps_scaling_list_ref_layer_id shall be greater than 0
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( activeVPS->getNonHEVCBaseLayerFlag() )
-#else
-    if( activeVPS->getAvcBaseLayerFlag() )
-#endif
     {
       assert( refLayerId > 0 );
@@ -531 +527 @@
 
     // When avc_base_layer_flag is equal to 1, it is a requirement of bitstream conformance that the value of sps_scaling_list_ref_layer_id shall be greater than 0
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( activeVPS->getNonHEVCBaseLayerFlag() )
-#else
-    if( activeVPS->getAvcBaseLayerFlag() )
-#endif
     {
       assert( refLayerId > 0 );
@@ -561 +553 @@
 
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   if( activeVPS->getNonHEVCBaseLayerFlag() )
-#else
-  if( activeVPS->getAvcBaseLayerFlag() )
-#endif
   {
     TComPic* pBLPic = (*m_ppcTDecTop[0]->getListPic()->begin());
@@ -1389 +1377 @@
   {
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
-#else
-    if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getAvcBaseLayerFlag() )
-#endif
     {
       TComPic* pBLPic = (*m_ppcTDecTop[0]->getListPic()->begin());
@@ -1748 +1732 @@
         UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc);
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
         if( refLayerId == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getNonHEVCBaseLayerFlag() )
-#else
-        if( refLayerId == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() )
-#endif
         {          
           TComPic* pic = *m_ppcTDecTop[0]->getListPic()->begin();
@@ -1864 +1844 @@
         UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
         if( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getNonHEVCBaseLayerFlag() )
-#else
-        if( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() )
-#endif
         {
           pcSlice->setBaseColPic ( refLayerIdc, *m_ppcTDecTop[0]->getListPic()->begin() );
@@ -2233 +2209 @@
 #endif
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
-#else
-      if( m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getAvcBaseLayerFlag() )
-#endif
       {
         if( !m_ppcTDecTop[0]->getBLReconFile()->good() )

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

@@ -2005 +2005 @@
 #if VPS_EXTN_MASK_AND_DIM_INFO
   UInt i = 0, j = 0;
-#if !VPS_AVC_BL_FLAG_REMOVAL
-  WRITE_FLAG( vps->getAvcBaseLayerFlag(),              "avc_base_layer_flag" );
-#endif
 
   WRITE_FLAG( vps->getSplittingFlag(),                 "splitting_flag" );

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

@@ -1290 +1290 @@
       // inferring of the scaling list can be moved to the config file
       UInt refLayerId = 0;
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( m_layerId > 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#else
-      if( m_layerId > 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#endif
       {
         m_pcEncTop->getSPS()->setInferScalingListFlag( true );
@@ -1324 +1320 @@
       // inferring of the scaling list can be moved to the config file
       UInt refLayerId = 0;
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( m_layerId > 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#else
-      if( m_layerId > 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#endif
       {
         m_pcEncTop->getSPS()->setInferScalingListFlag( true );
@@ -2292 +2284 @@
 
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( m_layerId == 0 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() )
-#else
-    if( m_layerId == 0 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() )
-#endif
     {
       pcPic->getPicYuvOrg()->copyToPic( pcPic->getPicYuvRec() );
@@ -2388 +2376 @@
       OutputNALUnit nalu( NAL_UNIT_VPS, 0, 0 ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) )
-#else
-      if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) )
-#endif
 #else
       if( m_layerId == 0 )