Changeset 1174 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:57:29 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0042_PROFILE_INDICATION

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -1459 +1459 @@
   UInt        m_numScaledRefLayerOffsets;
   Bool        m_multiLayerExtSpsFlag;
-#if R0042_PROFILE_INDICATION  
   Int         m_NumDirectRefLayers;
-#endif
 #if REPN_FORMAT_IN_VPS
   Bool        m_updateRepFormatFlag;
@@ -1629 +1627 @@
 
   //These two functions shall be used / called when the syntax element sps_ext_or_max_sub_layers_minus1 and V1CompatibleSPSFlag are implemented
-  Bool getV1CompatibleSPSFlag()                     { return m_bV1CompatibleSPSFlag; }
-  Void setV1CompatibleSPSFlag(Bool x)               { m_bV1CompatibleSPSFlag = x;    }
-
-#if R0042_PROFILE_INDICATION
+  Bool     getV1CompatibleSPSFlag()                 { return m_bV1CompatibleSPSFlag; }
+  Void     setV1CompatibleSPSFlag(Bool x)           { m_bV1CompatibleSPSFlag = x;    }
+
   Int      getNumDirectRefLayers()                  { return  m_NumDirectRefLayers;  }
   Void     setNumDirectRefLayers(Int n)             {  m_NumDirectRefLayers = n;     }
-#endif
 #if REPN_FORMAT_IN_VPS
   Bool     getUpdateRepFormatFlag()                 { return m_updateRepFormatFlag;   }

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

@@ -61 +61 @@
 #define R0227_VUI_BSP_HRD_FLAG           1      ///< JCTVC-R0227, Conformance checking such that VPS VUI HRD only present if VPS timing info is signalled
 #define R0227_REP_FORMAT_CONSTRAINT      1      ///< JCTVC-R0227, Conformance checking such that representation format of a particular layer shall not be greater than the one defined in VPS for that layer
-#define R0042_PROFILE_INDICATION         1      ///< JCTVC-R0042, Profile indication for additional layer sets
 
 #define Q0108_TSA_STSA                   1      ///< JCTVC-Q0108, Remove cross-layer alignment constraints of TSA and STSA pictures, enable to have different prediction structures in different layers

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

@@ -740 +740 @@
 #if SVC_EXTENSION
   m_cSPS.setExtensionFlag( m_layerId > 0 ? true : false );
-#if R0042_PROFILE_INDICATION
   m_cSPS.setNumDirectRefLayers(m_numDirectRefLayers);
-#endif
 
   if( !m_numDirectRefLayers && m_numAddLayerSets )