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

Timestamp:

8 Jul 2015, 21:16:48 (10 years ago)

Author:

seregin

Message:

macro cleanup: POC_RESET_IDC_SIGNALLING

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -126 +126 @@
 , m_bDiscardableFlag              ( false )
 , m_bCrossLayerBLAFlag            ( false )
-#if POC_RESET_IDC_SIGNALLING
 , m_pocResetIdc                   ( 0 )
 , m_pocResetPeriodId              ( 0 )
@@ -135 +134 @@
 , m_pocMsbValPresentFlag          ( false )
 , m_pocMsbValNeeded               ( false )
-#endif
 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
 , m_picOrderCntLsb (0)
@@ -221 +219 @@
   m_cabacInitFlag        = false;
   m_enableTMVPFlag = true;
-#if POC_RESET_IDC_SIGNALLING
   m_pocResetIdc                   = 0;
   m_pocResetPeriodId              = 0;
@@ -229 +226 @@
   m_pocMsbValRequiredFlag         = false;
   m_pocMsbValPresentFlag          = false;
-#endif
 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   m_picOrderCntLsb = 0;

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

@@ -2003 +2003 @@
   Bool        m_bDiscardableFlag;
   Bool        m_bCrossLayerBLAFlag;
-#if POC_RESET_IDC_SIGNALLING
   Int         m_pocResetIdc;
   Int         m_pocResetPeriodId;
@@ -2013 +2012 @@
   Bool        m_pocMsbValNeeded;
   Int         m_pocResetDeltaPoc;
-#endif
 #if POC_RESET_IDC_ENCODER
   Int         m_pocValueBeforeReset;
@@ -2350 +2348 @@
 
   Void setILRPic(TComPic **pcIlpPic);
-#if POC_RESET_IDC_SIGNALLING
+
   Int       getPocResetIdc       ()                              { return m_pocResetIdc;       }
   Void      setPocResetIdc       (Int b)                         { m_pocResetIdc = b;          }
@@ -2369 +2367 @@
   Bool      getPocMsbValRequiredFlag ()                           { return m_pocMsbValRequiredFlag; }
   Void      setPocMsbValRequiredFlag (Bool x)                     { m_pocMsbValRequiredFlag = x; }
-#endif
 
   Bool      getBlaPicFlag       ();

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

@@ -69 +69 @@
 #define POC_RESET_IDC                    1      ///< JCTVC-P0041: Include poc_reset_idc and related derivation
 #if POC_RESET_IDC
-#define POC_RESET_IDC_SIGNALLING         1      ///< JCTVC-P0041: Include signalling for poc_reset related syntax elements
 #define POC_RESET_IDC_ENCODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the encoder
 #define POC_RESET_IDC_DECODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the decoder
 #endif
-#define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
 #define SCALINGLIST_INFERRING            1      ///< JCTVC-N0371: inter-layer scaling list