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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: M0040_ADAPTIVE_RESOLUTION_CHANGE

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -85 +85 @@
 #if SVC_EXTENSION
   Window  m_conformanceWindow;
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Bool    m_isReconstructed;
 #endif
-#endif //SVC_EXTENSION
  
 public:
@@ -106 +104 @@
                                    const UInt uiMaxCUHeight,
                                    const UInt uiMaxCUDepth );
-#endif //SVC_EXTENSION
+#endif
   
   Void          destroy           ();
@@ -168 +166 @@
   
 #if SVC_EXTENSION
-  Void          setHeight   ( Int iPicHeight )     { m_iPicHeight = iPicHeight; }
+  Void          setHeight   ( Int iPicHeight )                   { m_iPicHeight = iPicHeight;               }
   Window&       getConformanceWindow()                           { return  m_conformanceWindow;             }
   Void          setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  Void          setReconstructed(Bool x) { m_isReconstructed = x;    }
-  Bool          isReconstructed()        { return m_isReconstructed; }
-#endif
+  Void          setReconstructed(Bool x)                         { m_isReconstructed = x;                   }
+  Bool          isReconstructed()                                { return m_isReconstructed;                }
 #if AUXILIARY_PICTURES  
   Void          convertToMonochrome();
 #endif
-#endif //SVC_EXTENSION
+#endif
+
   Void          dump( Char* pFileName, Bool bAdd, Int bitDepth );
 

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

@@ -481 +481 @@
 #if SVC_EXTENSION
   Int numInterLayerRPSPics = 0;
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   if( m_layerId > 0 && m_activeNumILRRefIdx > 0 )
-#else
-  if( m_layerId > 0 )
-#endif
   {
     for( i=0; i < m_pcVPS->getNumDirectRefLayers( m_layerId ); i++ )

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

@@ -706 +706 @@
   UInt       m_maxTSLayerMinus1[MAX_LAYERS];
 #endif
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Bool       m_singleLayerForNonIrapFlag;
-#endif
   Bool       m_higherLayerIrapSkipFlag;
 #if VPS_VUI_TILES_NOT_IN_USE__FLAG
@@ -1128 +1126 @@
   Void   setMaxTSLayersMinus1(Int layerIdx, UInt maxTSublayer)         { m_maxTSLayerMinus1[layerIdx] = maxTSublayer;}
 #endif
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Bool   getSingleLayerForNonIrapFlag()                             { return m_singleLayerForNonIrapFlag; }
   Void   setSingleLayerForNonIrapFlag(Bool x)                       { m_singleLayerForNonIrapFlag = x;    }
-#endif
   Bool   getHigherLayerIrapSkipFlag()                             { return m_higherLayerIrapSkipFlag; }
   Void   setHigherLayerIrapSkipFlag(Bool x)                       { m_higherLayerIrapSkipFlag = x;    }

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

@@ -138 +138 @@
 #define VPS_EXTN_PROFILE_INFO            1      ///< Include profile information for layer sets in VPS extension
 #define VPS_EXTN_DIRECT_REF_LAYERS       1      ///< Include indication of direct dependency of layers in VPS extension
-#define M0040_ADAPTIVE_RESOLUTION_CHANGE 1
 #define R0071_IRAP_EOS_CROSS_LAYER_IMPACTS 1
 
@@ -244 +243 @@
 #define JCTVC_M0259_LAMBDAREFINEMENT     1      ///< JCTVC-M0259: lambda refinement (encoder only optimization)
 #define ENCODER_FAST_MODE                1      ///< JCTVC-L0174: enable encoder fast mode. TestMethod 1 is enabled by setting to 1 and TestMethod 2 is enable by setting to 2. By default it is set to 1.
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
 #define HIGHER_LAYER_IRAP_SKIP_FLAG      1      ///< JCTVC-O0199: Indication that higher layer IRAP picture uses skip blocks only
-#endif
 #define LAYER_CTB                        0      ///< enable layer-specific CTB structure
 

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

@@ -3463 +3463 @@
   vps->setCrossLayerIrapAlignFlag( false );
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   // When single_layer_for_non_irap_flag is not present, it is inferred to be equal to 0.
   vps->setSingleLayerForNonIrapFlag( false );
-#endif
 
   // When higher_layer_irap_skip_flag is not present it is inferred to be equal to 0
@@ -3834 +3832 @@
 #endif
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
-#endif
+
   READ_FLAG(uiCode, "higher_layer_irap_skip_flag" ); vps->setHigherLayerIrapSkipFlag(uiCode == 1 ? true : false);
 

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

@@ -1711 +1711 @@
     // Create upsampling reference layer pictures for all possible dependent layers and do it only once for the first slice. 
     // Other slices might choose which reference pictures to be used for inter-layer prediction
-    if( m_layerId > 0 && m_uiSliceIdx == 0 )
-    {      
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-      if( !pcSlice->getVPS()->getSingleLayerForNonIrapFlag() || ( pcSlice->getVPS()->getSingleLayerForNonIrapFlag() && pcSlice->isIRAP() ) )
-#endif
+    if( m_layerId > 0 && m_uiSliceIdx == 0 && ( !pcSlice->getVPS()->getSingleLayerForNonIrapFlag() || pcSlice->isIRAP() ) )
+    {
       for( Int i = 0; i < pcSlice->getNumILRRefIdx(); i++ )
       {
@@ -1865 +1862 @@
       pcSlice->setRefPicList( m_cListPic, false, m_cIlpPic);
     }
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
     else if ( m_layerId > 0 )
     {
       pcSlice->setRefPicList( m_cListPic, false, NULL);
     }
-#endif
 #if MFM_ENCCONSTRAINT
     if( pcSlice->getMFMEnabledFlag() )
@@ -1889 +1884 @@
 #endif
     
-    if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag() )
-    {
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-      if( !pcSlice->getVPS()->getSingleLayerForNonIrapFlag() || ( pcSlice->getVPS()->getSingleLayerForNonIrapFlag() && pcSlice->isIRAP() ) )
-#endif
+    if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag() && ( !pcSlice->getVPS()->getSingleLayerForNonIrapFlag() || pcSlice->isIRAP() ) )
+    {
       for(Int dependentLayerIdx = 0; dependentLayerIdx < pcSlice->getVPS()->getNumDirectRefLayers(m_layerId); dependentLayerIdx++)
       {

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

@@ -2642 +2642 @@
 #endif
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   WRITE_FLAG(vps->getSingleLayerForNonIrapFlag(), "single_layer_for_non_irap_flag" );
-#endif
 
   // When single_layer_for_non_irap_flag is equal to 0, higher_layer_irap_skip_flag shall be equal to 0

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -370 +370 @@
   UInt      m_numLayer;
   Int       m_elRapSliceBEnabled;
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Int       m_adaptiveResolutionChange;
-#endif
 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   int       m_layerSwitchOffBegin;
@@ -1007 +1005 @@
 #endif
 #if SVC_EXTENSION
-  UInt      getLayerId            () { return m_layerId;              }
-  Void      setLayerId            (UInt layer) { m_layerId = layer; }
-  UInt      getNumLayer           () { return m_numLayer;             }  
-  Void      setNumLayer           (UInt uiNum)   { m_numLayer = uiNum;  }
+  UInt      getLayerId()                                     { return m_layerId;    }
+  Void      setLayerId( UInt layer )                         { m_layerId = layer;   }
+  UInt      getNumLayer()                                    { return m_numLayer;   }  
+  Void      setNumLayer( UInt uiNum )                        { m_numLayer = uiNum;  }
   Void      setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
-  Void      setElRapSliceTypeB(Int bEnabled) {m_elRapSliceBEnabled = bEnabled;}
-  Int       getElRapSliceTypeB()              {return m_elRapSliceBEnabled;}
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  Void      setAdaptiveResolutionChange(Int x) { m_adaptiveResolutionChange = x;    }
-  Int       getAdaptiveResolutionChange()      { return m_adaptiveResolutionChange; }
-#endif
+  Void      setElRapSliceTypeB(Int bEnabled)                 { m_elRapSliceBEnabled = bEnabled;   }
+  Int       getElRapSliceTypeB()                             { return m_elRapSliceBEnabled;       }
+  Void      setAdaptiveResolutionChange(Int x)               { m_adaptiveResolutionChange = x;    }
+  Int       getAdaptiveResolutionChange()                    { return m_adaptiveResolutionChange; }
 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Void      setLayerSwitchOffBegin(Int x)    { m_layerSwitchOffBegin = x;    }

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

@@ -1105 +1105 @@
     }
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+#if SVC_EXTENSION
     if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId > 0 && pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) ||
                                                           (m_layerId == 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())) )
@@ -1263 +1263 @@
     xSetLayerInitializedFlag(pcSlice);
 #endif
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
     if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId > 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())
     {
@@ -1270 +1269 @@
       pcSlice->setMFMEnabledFlag(false);
     }
-#endif
 #endif //SVC_EXTENSION
 
@@ -3482 +3480 @@
     pcPic->getPicYuvRec()->copyToPic(pcPicYuvRecOut);
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+#if SVC_EXTENSION
     pcPicYuvRecOut->setReconstructed(true);
 #endif