Changeset 564 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h

Timestamp:

27 Jan 2014, 17:54:11 (11 years ago)

Author:

seregin

Message:

remove JCTVC_M0458_INTERLAYER_RPS_SIG macro

File:

• branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h (modified) (7 diffs)

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

@@ -546 +546 @@
 #endif
   Int        m_profileLevelTierIdx[64];     
-#if JCTVC_M0458_INTERLAYER_RPS_SIG
   Bool       m_maxOneActiveRefLayerFlag;
-#endif
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
   Bool       m_pocLsbNotPresentFlag[MAX_VPS_LAYER_ID_PLUS1];
@@ -655 +653 @@
 #endif
 
-#endif //SVC_EXTENSION
 #if !P0307_REMOVE_VPS_VUI_OFFSET
 #if VPS_VUI_OFFSET
@@ -664 +661 @@
   Int     m_vpsNonVuiExtLength;
 #endif
+#endif //SVC_EXTENSION
 public:
   TComVPS();
@@ -841 +839 @@
   Int    getProfileLevelTierIdx(Int i)                        { return m_profileLevelTierIdx[i]; }
   Void   setProfileLevelTierIdx(Int i, Int x)                 { m_profileLevelTierIdx[i] = x   ; }
-#if JCTVC_M0458_INTERLAYER_RPS_SIG
   Bool   getMaxOneActiveRefLayerFlag()                                          { return m_maxOneActiveRefLayerFlag;                      }
   Void   setMaxOneActiveRefLayerFlag(Bool x)                                    { m_maxOneActiveRefLayerFlag = x;                         }
-#endif
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
   UInt   getPocLsbNotPresentFlag(Int i)                                         { return m_pocLsbNotPresentFlag[i]; }
@@ -1871 +1867 @@
 #endif
 
-#if JCTVC_M0458_INTERLAYER_RPS_SIG
   Bool        m_interLayerPredEnabledFlag;
   Int         m_activeNumILRRefIdx;        //< Active inter-layer reference pictures
   Int         m_interLayerPredLayerIdc  [MAX_VPS_LAYER_ID_PLUS1];
-#else
-#if SVC_EXTENSION
-  Int         m_numILRRefIdx;       //< for inter-layer reference picture ser
-#endif
-#endif 
 #if POC_RESET_FLAG
   Bool        m_bPocResetFlag;
@@ -2142 +2132 @@
 #endif
 
-#if JCTVC_M0458_INTERLAYER_RPS_SIG
   Int       getActiveNumILRRefIdx     ( )               { return  m_activeNumILRRefIdx; }
   Void      setActiveNumILRRefIdx     ( Int i )         { m_activeNumILRRefIdx = i;     }  
@@ -2151 +2140 @@
   Void      setInterLayerPredEnabledFlag     ( Bool   val )    { m_interLayerPredEnabledFlag = val; }
   Bool      getInterLayerPredEnabledFlag     ()                { return m_interLayerPredEnabledFlag;}
-#else
-  Void      setNumILRRefIdx     ( Int i )               { m_numILRRefIdx = i;     }
-#endif 
 
   Void      setNumMotionPredRefLayers(int i)            { m_numMotionPredRefLayers = i; }