Changeset 1164 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

8 Jul 2015, 01:06:51 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0307_VPS_NON_VUI_EXTENSION

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -1975 +1975 @@
 #endif
 #endif
-#if P0307_VPS_NON_VUI_EXTENSION
 , m_vpsNonVuiExtLength (0)
-#endif
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
 , m_vpsPocLsbAlignedFlag(false)

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

@@ -790 +790 @@
 #endif
   UInt       m_baseLayerPSCompatibilityFlag[MAX_LAYERS];
-#if P0307_VPS_NON_VUI_EXTENSION
   Int        m_vpsNonVuiExtLength;
-#endif
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool       m_vpsPocLsbAlignedFlag;
@@ -1235 +1233 @@
   Bool   getVpsExtensionFlag()                         { return m_vpsExtensionFlag;  }
   Void   setVpsExtensionFlag(Bool x)                   { m_vpsExtensionFlag = x;     }
-
-#if P0307_VPS_NON_VUI_EXTENSION
-  Int    getVpsNonVuiExtLength()         { return m_vpsNonVuiExtLength; }
-  Void   setVpsNonVuiExtLength(Int x)    { m_vpsNonVuiExtLength = x; }
-#endif
+  Int    getVpsNonVuiExtLength()                       { return m_vpsNonVuiExtLength; }
+  Void   setVpsNonVuiExtLength(Int x)                  { m_vpsNonVuiExtLength = x; }
 #if O0164_MULTI_LAYER_HRD
   Void   setBspHrdParameters( UInt hrdIdx, UInt frameRate, UInt numDU, UInt bitRate, Bool randomAccess );

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

@@ -72 +72 @@
 
 #define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0
-#define P0307_VPS_NON_VUI_EXTENSION      1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling
 #define P0307_VPS_NON_VUI_EXT_UPDATE     1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling