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

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

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1482 +1482 @@
 
       // pcPic is statically created for the external (AVC) base layer, no need to delete it
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( !m_acTDecTop[layerIdx].getParameterSetManager()->getActiveVPS()->getNonHEVCBaseLayerFlag() || layerIdx )
-#else
-      if( !m_acTDecTop[layerIdx].getParameterSetManager()->getActiveVPS()->getAvcBaseLayerFlag() || layerIdx )
-#endif
       {
         delete pcPic;

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -108 +108 @@
 : m_pBitstreamFile()
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
 , m_nonHEVCBaseLayerFlag(0)
-#else
-, m_avcBaseLayerFlag(0)
-#endif
 #endif
 , m_maxTidRefPresentFlag(1)
@@ -1182 +1178 @@
 #endif
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   ("NonHEVCBase,-nonhevc",                            m_nonHEVCBaseLayerFlag,                                0, "BL is available but not internal")
-#else
-  ("AvcBase,-avc",                                    m_avcBaseLayerFlag,                                    0, "avc_base_layer_flag")
-#endif
   ("InputBLFile,-ibl",                                cfg_BLInputFile,                              string(""), "Base layer rec YUV input file name")
 #endif
@@ -1793 +1785 @@
 #if SVC_EXTENSION
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   if( m_nonHEVCBaseLayerFlag )
-#else
-  if( m_avcBaseLayerFlag )
-#endif
   {
     *cfg_InputFile[0] = cfg_BLInputFile;
@@ -3499 +3487 @@
   
   // it can be updated after AVC BL support will be added to the WD
-#if VPS_AVC_BL_FLAG_REMOVAL
   if( m_nonHEVCBaseLayerFlag )
-#else
-  if( m_avcBaseLayerFlag )
-#endif
   {
     m_crossLayerIrapAlignFlag = false;
@@ -4514 +4498 @@
   printf("Scalable                          : %d\n", m_scalabilityMask[SCALABILITY_ID] );
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   printf("Base layer                        : %s\n", m_nonHEVCBaseLayerFlag ? "Non-HEVC" : "HEVC");
-#else
-  printf("Base layer                        : %s\n", m_avcBaseLayerFlag ? "AVC" : "HEVC");
-#endif
 #endif
 #if AUXILIARY_PICTURES

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -70 +70 @@
   Int       m_framesToBeEncoded;                              ///< number of encoded frames
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   Int       m_nonHEVCBaseLayerFlag;                           ///< non HEVC BL
-#else
-  Int       m_avcBaseLayerFlag;                               ///< avc_baselayer_flag
-#endif
 #endif
   Bool      m_maxTidRefPresentFlag; 

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -291 +291 @@
 #if REF_IDX_MFM
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
     m_acTEncTop[layer].setMFMEnabledFlag                                  (layer == 0 ? false : ( m_nonHEVCBaseLayerFlag ? false : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers());
-#else
-    m_acTEncTop[layer].setMFMEnabledFlag                                  (layer == 0 ? false : ( m_avcBaseLayerFlag ? false : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers());
-#endif
 #else
     m_acTEncTop[layer].setMFMEnabledFlag                                  (layer == 0 ? false : ( m_acLayerCfg[layer].getNumMotionPredRefLayers() > 0 ) );
@@ -1371 +1367 @@
 #if VPS_EXTN_MASK_AND_DIM_INFO
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   vps->setNonHEVCBaseLayerFlag( m_nonHEVCBaseLayerFlag );
   if ( m_nonHEVCBaseLayerFlag )
@@ -1377 +1372 @@
     vps->setBaseLayerInternalFlag (false);
   }
-#else
-  vps->setAvcBaseLayerFlag(m_avcBaseLayerFlag);
-#endif
 #else
   vps->setAvcBaseLayerFlag(false);