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

Timestamp:

7 Jul 2015, 02:58:30 (9 years ago)

Author:

seregin

Message:

macro cleanup: HIGHER_LAYER_IRAP_SKIP_FLAG, HIGHER_LAYER_IRAP_SKIP_FLAG (keep it for encoder only)

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (3 diffs)

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

@@ -1169 +1169 @@
   ("CrossLayerPictureTypeAlignFlag",                 m_crossLayerPictureTypeAlignFlag,                   true, "align picture type across layers" )  
   ("CrossLayerIrapAlignFlag",                        m_crossLayerIrapAlignFlag,                          true, "align IRAP across layers" )  
-#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   ("CrossLayerAlignedIdrOnlyFlag",                   m_crossLayerAlignedIdrOnlyFlag,                     true, "only idr for IRAP across layers" )  
-#endif
 #if O0194_WEIGHTED_PREDICTION_CGS
   ("InterLayerWeightedPred",                          m_useInterLayerWeightedPred,                       false, "enable IL WP parameters estimation at encoder" )  
@@ -1694 +1692 @@
   ("LayerSwitchOffEnd%d", cfg_layerSwitchOffEnd, 0, MAX_LAYERS, "Switch layer %d on at given poc")
 #endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
   ("SkipPictureAtArcSwitch",     m_skipPictureAtArcSwitch, false, "Code the higher layer picture in ARC up-switching as a skip picture. (0: disable)")
-#endif
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   ("SEIInterLayerConstrainedTileSets", m_interLayerConstrainedTileSetsSEIEnabled, false, "Control generation of inter layer constrained tile sets SEI message")
@@ -4360 +4356 @@
   }
 #endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
+
   if (m_adaptiveResolutionChange > 0)
   {
@@ -4369 +4365 @@
     xConfirmPara(m_adaptiveResolutionChange <= 0, "Skip picture at ARC switching only works when Adaptive Resolution Change is active (AdaptiveResolutionChange > 0)");
   }
-#endif
+
   if( layerIdx < MAX_LAYERS-1 )
   {
@@ -4504 +4500 @@
   printf("Adaptive Resolution Change        : %d\n", m_adaptiveResolutionChange );
 #endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
   printf("Skip picture at ARC switch        : %d\n", m_skipPictureAtArcSwitch );
-#endif
   printf("Align picture type                : %d\n", m_crossLayerPictureTypeAlignFlag );
   printf("Cross layer IRAP alignment        : %d\n", m_crossLayerIrapAlignFlag );
-#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   printf("IDR only for IRAP                 : %d\n", m_crossLayerAlignedIdrOnlyFlag );
-#endif
 #if O0194_WEIGHTED_PREDICTION_CGS
   printf("InterLayerWeightedPred            : %d\n", m_useInterLayerWeightedPred );

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

@@ -476 +476 @@
   Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
 #endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
   Bool      m_skipPictureAtArcSwitch;                         ///< Indicates that when ARC up-switching is performed the higher layer picture is a skip picture
-#endif
 #if REPN_FORMAT_IN_VPS
   RepFormatCfg m_repFormatCfg[16];                            ///< Rep_format structures
@@ -515 +513 @@
   Bool                                m_overlayInfoPersistenceFlag;
 #endif
-#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   Bool      m_crossLayerAlignedIdrOnlyFlag;
-#endif
 #if O0149_CROSS_LAYER_BLA_FLAG
   Bool      m_crossLayerBLAFlag;

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

@@ -188 +188 @@
                                                                             m_acLayerCfg[mapIdxToLayer[idx]].m_confWinBottom );
 
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
     m_acTEncTop[mapIdxToLayer[idx]].setSkipPictureAtArcSwitch             ( m_skipPictureAtArcSwitch );
-#endif
   }
   delete [] mapIdxToLayer;
@@ -1755 +1753 @@
 #endif
     vps->setCrossLayerPictureTypeAlignFlag( m_crossLayerPictureTypeAlignFlag );
-#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
     vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag );
-#endif
     vps->setCrossLayerIrapAlignFlag( m_crossLayerIrapAlignFlag );
     for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
@@ -1776 +1772 @@
   vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);
 #endif 
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
   vps->setHigherLayerIrapSkipFlag(m_skipPictureAtArcSwitch);
-#endif
 
   for (Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++)