Changeset 1139 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

7 Jul 2015, 23:25:11 (10 years ago)

Author:

seregin

Message:

macro cleanup: NO_OUTPUT_OF_PRIOR_PICS

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (5 diffs)

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

@@ -3955 +3955 @@
 }
 
-#if NO_OUTPUT_OF_PRIOR_PICS
 Bool TComSlice::getBlaPicFlag       ()
 {
@@ -3962 +3961 @@
     || getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP;
 }
+
 Bool TComSlice::getCraPicFlag       ()
 {
     return getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA;
 }
-#endif
+
 #if POC_RESET_IDC_DECODER
 Bool TComSlice::getRaslPicFlag      ()

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

@@ -2596 +2596 @@
 #endif
 
-#if NO_OUTPUT_OF_PRIOR_PICS
   Bool      getBlaPicFlag       ();
   Bool      getCraPicFlag       ();
-#endif
 #if POC_RESET_IDC_DECODER
   Bool      getRaslPicFlag      ();
@@ -2618 +2616 @@
 
 #endif //SVC_EXTENSION
+
 protected:
   TComPic*  xGetRefPic        (TComList<TComPic*>& rcListPic, Int poc);

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

@@ -117 +117 @@
 #endif
 #define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
-#define NO_OUTPUT_OF_PRIOR_PICS          1      ///< Use no_output_of_prior_pics_flag
 #define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
 #define RPL_INIT_N0316_N0082             1      ///< JCTVC-N0316, JCTVC-N0082: initial reference picture list construction 

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -838 +838 @@
   bNewPOC = m_apcSlicePilot->getPOC() != m_prevPOC || ( m_apcSlicePilot->getFirstSliceInPic() && m_parseIdc == -1 );
 
-#if NO_OUTPUT_OF_PRIOR_PICS
 #if NO_CLRAS_OUTPUT_FLAG
   if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag())
@@ -892 +891 @@
     }
   }
-#endif
 
 #if POC_RESET_IDC_DECODER
@@ -1357 +1355 @@
   if (m_bFirstSliceInPicture)
   {
+#if SVC_EXTENSION
 #if AVC_BASE
     if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
@@ -1465 +1464 @@
 #endif
 
-#if NO_OUTPUT_OF_PRIOR_PICS
     if ( m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() && getNoClrasOutputFlag() )
     {
@@ -1474 +1472 @@
       }
     }
-#endif
-
-#if SVC_EXTENSION
+
     xCheckLayerReset();
     xSetLayerInitializedFlag();