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

Timestamp:

7 Jul 2015, 03:13:38 (10 years ago)

Author:

seregin

Message:

macro cleanup: M0040_ADAPTIVE_RESOLUTION_CHANGE

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (8 diffs)

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

@@ -1685 +1685 @@
   ("SEITemporalMotionVectorPredictionConstraints",             m_TMVPConstraintsSEIEnabled,              0, "Control generation of TMVP constrants SEI message")
 #endif
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   ("AdaptiveResolutionChange",     m_adaptiveResolutionChange, 0, "Adaptive resolution change frame number. Should coincide with EL RAP picture. (0: disable)")
-#endif
 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   ("LayerSwitchOffBegin%d", cfg_layerSwitchOffBegin, 0, MAX_LAYERS, "Switch layer %d off after given poc")
@@ -4349 +4347 @@
   }
 #endif //VPS_EXTN_DIRECT_REF_LAYERS
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  if (m_adaptiveResolutionChange > 0)
+
+  if( m_adaptiveResolutionChange > 0 )
   {
     xConfirmPara(m_numLayers != 2, "Adaptive resolution change works with 2 layers only");
     xConfirmPara(m_acLayerCfg[1].m_iIntraPeriod == 0 || (m_adaptiveResolutionChange % m_acLayerCfg[1].m_iIntraPeriod) != 0, "Adaptive resolution change must happen at enhancement layer RAP picture");
   }
-#endif
-
-  if (m_adaptiveResolutionChange > 0)
+
+  if( m_adaptiveResolutionChange > 0 )
   {
     xConfirmPara(m_crossLayerIrapAlignFlag != 0, "Cross layer IRAP alignment must be disabled when using adaptive resolution change.");
   }
-  if (m_skipPictureAtArcSwitch)
+
+  if( m_skipPictureAtArcSwitch )
   {
     xConfirmPara(m_adaptiveResolutionChange <= 0, "Skip picture at ARC switching only works when Adaptive Resolution Change is active (AdaptiveResolutionChange > 0)");
@@ -4497 +4495 @@
   printf("Auxiliary pictures                : %d\n", m_scalabilityMask[AUX_ID] );
 #endif
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   printf("Adaptive Resolution Change        : %d\n", m_adaptiveResolutionChange );
-#endif
   printf("Skip picture at ARC switch        : %d\n", m_skipPictureAtArcSwitch );
   printf("Align picture type                : %d\n", m_crossLayerPictureTypeAlignFlag );

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

@@ -473 +473 @@
   Void  xPrintUsage     ();                                   ///< print usage
 #if SVC_EXTENSION
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
-#endif
   Bool      m_skipPictureAtArcSwitch;                         ///< Indicates that when ARC up-switching is performed the higher layer picture is a skip picture
 #if REPN_FORMAT_IN_VPS

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

@@ -787 +787 @@
     }
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
     m_acTEncTop[layer].setAdaptiveResolutionChange               ( m_adaptiveResolutionChange );
-#endif
 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     m_acTEncTop[layer].setLayerSwitchOffBegin                    (m_acLayerCfg[layer].m_layerSwitchOffBegin);
@@ -1769 +1767 @@
       }
     }
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);
-#endif 
   vps->setHigherLayerIrapSkipFlag(m_skipPictureAtArcSwitch);
 
@@ -2095 +2091 @@
 #endif
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-    if (m_adaptiveResolutionChange)
+    if( m_adaptiveResolutionChange )
     {
       for(UInt layer = 0; layer < m_numLayers; layer++)
@@ -2108 +2103 @@
       }
     }
-#endif
 
     // loop through frames in one GOP
@@ -2509 +2503 @@
       TComPicYuv*  pcPicYuvRecBottom  = *(iterPicYuvRec++);
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-      if (!m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRecTop->isReconstructed() && pcPicYuvRecBottom->isReconstructed())
-#else
-      if (!m_acLayerCfg[layer].getReconFile().empty())
-#endif
+      if( !m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRecTop->isReconstructed() && pcPicYuvRecBottom->isReconstructed() )
       {
 #if REPN_FORMAT_IN_VPS
@@ -2538 +2528 @@
     {
       TComPicYuv*  pcPicYuvRec  = *(iterPicYuvRec++);
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-      if (!m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRec->isReconstructed())
-#else
-      if (!m_acLayerCfg[layer].getReconFile().empty())
-#endif
+      if( !m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRec->isReconstructed() )
       {
 #if REPN_FORMAT_IN_VPS
@@ -2564 +2550 @@
     list<AccessUnit>::const_iterator iterBitstream = accessUnits.begin();
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-    for ( i = 0; i < iNumEncoded/2 && iterBitstream != accessUnits.end(); i++ )
-#else
-    for ( i = 0; i < iNumEncoded/2; i++ )
-#endif
+    for( i = 0; i < iNumEncoded/2 && iterBitstream != accessUnits.end(); i++ )
     {
       const AccessUnit& auTop = *(iterBitstream++);
@@ -2585 +2567 @@
     list<AccessUnit>::const_iterator iterBitstream = accessUnits.begin();
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-    for ( i = 0; i < iNumEncoded && iterBitstream != accessUnits.end(); i++ )
-#else
-    for ( i = 0; i < iNumEncoded; i++ )
-#endif
+    for( i = 0; i < iNumEncoded && iterBitstream != accessUnits.end(); i++ )
     {
       const AccessUnit& au = *(iterBitstream++);