Changeset 1163 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:04:18 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0182_VPS_VUI_PS_FLAG

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

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

@@ -789 +789 @@
 #endif
 #endif
-
-#if P0182_VPS_VUI_PS_FLAG
   UInt       m_baseLayerPSCompatibilityFlag[MAX_LAYERS];
-#endif
-
 #if P0307_VPS_NON_VUI_EXTENSION
   Int        m_vpsNonVuiExtLength;
@@ -1177 +1173 @@
 #endif
 #endif
-#if P0182_VPS_VUI_PS_FLAG
-  Void   setBaseLayerPSCompatibilityFlag (Int layer, int val)        { m_baseLayerPSCompatibilityFlag[layer] = val; }
-  Int    getBaseLayerPSCompatibilityFlag (Int layer)   { return m_baseLayerPSCompatibilityFlag[layer];}
-#endif
-
-  Bool   getAltOuputLayerFlag(Int idx)         { return m_altOutputLayerFlag[idx]; }
-  Void   setAltOuputLayerFlag(Int idx, Bool x) { m_altOutputLayerFlag[idx] = x;    }
+  Void   setBaseLayerPSCompatibilityFlag (Int layer, int val)   { m_baseLayerPSCompatibilityFlag[layer] = val; }
+  Int    getBaseLayerPSCompatibilityFlag (Int layer)            { return m_baseLayerPSCompatibilityFlag[layer];}
+  Bool   getAltOuputLayerFlag(Int idx)                          { return m_altOutputLayerFlag[idx]; }
+  Void   setAltOuputLayerFlag(Int idx, Bool x)                  { m_altOutputLayerFlag[idx] = x;    }
 
 #if REPN_FORMAT_IN_VPS

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

@@ -126 +126 @@
 #define VPS_VUI_VIDEO_SIGNAL_MOVE        1      ///< JCTVC-P0076 Move video signal information syntax structure earlier in the VPS VUI
 #endif 
-#define P0182_VPS_VUI_PS_FLAG            1      ///< JCTVC-P0182, add base_layer_parameter_set_compatibility_flag
 
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC

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

@@ -3759 +3759 @@
   }
 #endif
-#if P0182_VPS_VUI_PS_FLAG
-  for(i = 1; i < vps->getMaxLayers(); i++)
+
+  for( i = 1; i < vps->getMaxLayers(); i++ )
   {
     if (vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0)
@@ -3772 +3772 @@
     }
   }
-#endif
 }
 

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

@@ -607 +607 @@
     }
 
-#if P0182_VPS_VUI_PS_FLAG
     UInt layerIdx = activeVPS->getLayerIdxInVps( m_layerId );
 
@@ -627 +626 @@
       assert( repFormat->getConformanceWindowVps().getWindowBottomOffset() == sps->getConformanceWindow().getWindowBottomOffset() );
     }    
-#endif
   }
 

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

@@ -2624 +2624 @@
     }
 #endif
-#if P0182_VPS_VUI_PS_FLAG
-    for(i = 1; i < vps->getMaxLayers(); i++)
+
+    for( i = 1; i < vps->getMaxLayers(); i++ )
     {
       if( vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0 ) 
@@ -2632 +2632 @@
       }
     }
-#endif
 }
 

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

@@ -1509 +1509 @@
     }
 
-#if P0182_VPS_VUI_PS_FLAG
     if( m_cVPS.getNumRefLayers( m_layerId ) == 0 )
     {
@@ -1535 +1534 @@
       }
     }
-#endif
   }
 }