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

Timestamp:

8 Jul 2015, 20:02:01 (10 years ago)

Author:

seregin

Message:

macro cleanup: P0297_VPS_POC_LSB_ALIGNED_FLAG

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -134 +134 @@
 , m_pocMsbValRequiredFlag         ( false )
 , m_pocMsbValPresentFlag          ( false )
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
 , m_pocMsbValNeeded               ( false )
-#endif
 #endif
 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
@@ -235 +233 @@
   m_picOrderCntLsb = 0;
 #endif
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
   m_pocMsbValNeeded  = false;
   m_pocResetDeltaPoc = 0;
-#endif
 }
 
@@ -1692 +1688 @@
   Bool irapIsInRPS = false;
 #endif
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+#if SVC_POC
   Bool pocsAdjusted = false;
 #endif
@@ -1707 +1703 @@
       rpcPic = *(iterPic++);
 
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+#if SVC_POC
       // poc adjustement by poc reset needs to be taken into account here
       Int deltaPOC = pReferencePictureSet->getDeltaPOC(i) - rpcPic->getPicSym()->getSlice(0)->getPocResetDeltaPoc();
@@ -1722 +1718 @@
         // This picture exists as a reference picture
         // and should be added to the explicit Reference Picture Set
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+#if SVC_POC
         pcRPS->setDeltaPOC(k, deltaPOC);
 #else
@@ -1729 +1725 @@
         pcRPS->setUsed(k, pReferencePictureSet->getUsed(i) && (!isRAP));
 #if ALLOW_RECOVERY_POINT_AS_RAP
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+#if SVC_POC
         pcRPS->setUsed(k, pcRPS->getUsed(k) && !(bUseRecoveryPoint && this->getPOC() > pocRandomAccess && this->getPOC() + deltaPOC < pocRandomAccess) ); 
 #else
@@ -1784 +1780 @@
     || useNewRPS
 #endif
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+#if SVC_POC
     || pocsAdjusted  // inter RPS prediction does not work if POCs have been adjusted
 #endif
@@ -1946 +1942 @@
 , m_viewIdLen                (0)
 , m_vpsNonVuiExtLength (0)
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
 , m_vpsPocLsbAlignedFlag(false)
-#endif
 {
   for( Int i = 0; i < MAX_TLAYER; i++)

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

@@ -730 +730 @@
   UInt       m_baseLayerPSCompatibilityFlag[MAX_LAYERS];
   Int        m_vpsNonVuiExtLength;
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool       m_vpsPocLsbAlignedFlag;
-#endif
   std::vector< std::vector<Bool> > m_necessaryLayerFlag;
   std::vector<Int>                 m_numNecessaryLayers;
@@ -942 +940 @@
   UInt   getPocLsbNotPresentFlag(Int i)                                         { return m_pocLsbNotPresentFlag[i];              }
   Void   setPocLsbNotPresentFlag(Int i, Bool x)                                 { m_pocLsbNotPresentFlag[i] = x;                 }
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool   getVpsPocLsbAlignedFlag()                                              { return m_vpsPocLsbAlignedFlag;                 }
   Void   setVpsPocLsbAlignedFlag(Bool x)                                        { m_vpsPocLsbAlignedFlag = x;                    }
-#endif
   Bool   getCrossLayerPictureTypeAlignFlag()                                    { return m_crossLayerPictureTypeAlignFlag;       }
   Void   setCrossLayerPictureTypeAlignFlag(Bool x)                              { m_crossLayerPictureTypeAlignFlag = x;          }
@@ -2022 +2018 @@
   Bool        m_pocMsbValRequiredFlag;
   Bool        m_pocMsbValPresentFlag;
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool        m_pocMsbValNeeded;
   Int         m_pocResetDeltaPoc;
-#endif
 #endif
 #if POC_RESET_IDC_ENCODER
@@ -2375 +2369 @@
   Int       getPocLsbVal         ()                              { return m_pocLsbVal;       }
   Void      setPocLsbVal       (Int b)                           { m_pocLsbVal = b;          }
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Void      setPocMsbNeeded      (Bool x)                        { m_pocMsbValNeeded = x; }
   Bool      getPocMsbNeeded      ()                              { return m_pocMsbValNeeded; }
   Int       getPocResetDeltaPoc  ()                              { return m_pocResetDeltaPoc; }
   Void      setPocResetDeltaPoc  (Int x)                         { m_pocResetDeltaPoc = x; }
-#endif
   Int       getPocMsbVal         ()                              { return m_pocMsbVal;       }
   Void      setPocMsbVal       (Int b)                           { m_pocMsbVal = b;          }

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

@@ -85 +85 @@
 #define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
 #define SCALINGLIST_INFERRING            1      ///< JCTVC-N0371: inter-layer scaling list
-#define P0297_VPS_POC_LSB_ALIGNED_FLAG   1      ///< JCTVC-P0297: vps_poc_lsb_aligned_flag for cross-layer POC anchor picture derivation
 
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
+#define SVC_POC                          1      ///< POC signalling and reset
 
 #define REF_IDX_MFM                      1      ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture