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

Timestamp:

2 Jul 2015, 21:00:14 (9 years ago)

Author:

seregin

Message:

cleanup macros: POC_RESET_RPS, PREVTID0_POC_RESET, POC_RESET_FLAG

File:

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

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

@@ -2331 +2331 @@
   Int         m_activeNumILRRefIdx;        //< Active inter-layer reference pictures
   Int         m_interLayerPredLayerIdc  [MAX_VPS_LAYER_IDX_PLUS1];
-#if POC_RESET_FLAG
-  Bool        m_bPocResetFlag;
-  Int         m_pocValueBeforeReset;
-#endif  
   Bool        m_bDiscardableFlag;
 #if O0149_CROSS_LAYER_BLA_FLAG
@@ -2478 +2474 @@
 
 #if SVC_EXTENSION
-#if PREVTID0_POC_RESET
-  Void      adjustPrevTid0POC      (Int adj)             { m_prevTid0POC=m_prevTid0POC-adj; }
-#endif
 #if POC_RESET_IDC_DECODER
   Void      setPrevTid0POC( Int x ) { m_prevTid0POC = x; }
@@ -2676 +2669 @@
                                   || m_eNalUnitType == NAL_UNIT_RESERVED_VCL_N14 ); }
 #endif
-#if POC_RESET_FLAG
-  Bool      getPocResetFlag  ()                              { return m_bPocResetFlag;       }
-  Void      setPocResetFlag  (Bool b)                        { m_bPocResetFlag = b;          }
-  Int       getPocValueBeforeReset ()                        { return m_pocValueBeforeReset; }
-  Void      setPocValueBeforeReset (Int x)                   { m_pocValueBeforeReset = x ;   }
-#endif
   Bool      getDiscardableFlag  ()                           { return m_bDiscardableFlag;    }
   Void      setDiscardableFlag  (Bool b)                     { m_bDiscardableFlag = b;       }