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

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/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (4 diffs)

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 )