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

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/Lib/TLibDecoder/TDecTop.cpp (modified) (5 diffs)

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();