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

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

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (3 diffs)

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++)
       {