Changeset 1139 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

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

Author:

seregin

Message:

macro cleanup: NO_OUTPUT_OF_PRIOR_PICS

File:

• branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -332 +332 @@
 #if ALIGNED_BUMPING
       Bool outputPicturesFlag = true;  
-#if NO_OUTPUT_OF_PRIOR_PICS
+
       if( m_acTDecTop[nalu.m_layerId].getNoOutputPriorPicsFlag() )
       {
         outputPicturesFlag = false;
       }
-#endif
 
       if (nalu.m_nalUnitType == NAL_UNIT_EOS) // End of sequence
@@ -351 +350 @@
 #endif
       {
-#if NO_OUTPUT_OF_PRIOR_PICS
-        if( 
-#else
-        if ( bNewPOC &&
-#endif
-           (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
+         if(   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL
-            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) )
+            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP   )
         {
           flushAllPictures( nalu.m_layerId, outputPicturesFlag );