Changeset 1210 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

8 Jul 2015, 22:47:39 (9 years ago)

Author:

seregin

Message:

macro cleanup: POC_RESET_IDC_DECODER, POC_RESET_IDC

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecTop.cpp (modified) (11 diffs)
• TAppDecTop.h (modified) (1 diff)

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

@@ -245 +245 @@
       {
         bNewPicture = m_acTDecTop[nalu.m_layerId].decode(nalu, m_iSkipFrame, m_aiPOCLastDisplay[nalu.m_layerId], curLayerId, bNewPOC);
-#if POC_RESET_IDC_DECODER
-        if ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || (m_acTDecTop[nalu.m_layerId].getParseIdc() == 0) )
+
+#if SVC_POC
+        if( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || (m_acTDecTop[nalu.m_layerId].getParseIdc() == 0) )
 #else
         if (bNewPicture)
@@ -265 +266 @@
 #endif
         }
-#if POC_RESET_IDC_DECODER
+#if SVC_POC
         else if(m_acTDecTop[nalu.m_layerId].getParseIdc() == 1) 
         {
@@ -281 +282 @@
     }
 
-#if POC_RESET_IDC_DECODER
-    if ( ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || m_acTDecTop[nalu.m_layerId].getParseIdc() == 0 || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS ) && 
+#if SVC_POC
+    if( ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || m_acTDecTop[nalu.m_layerId].getParseIdc() == 0 || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS ) && 
         !m_acTDecTop[nalu.m_layerId].getFirstSliceInSequence() )
 #else
@@ -310 +311 @@
     }
 
-#if POC_RESET_IDC_DECODER
+#if SVC_POC
     if( bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 0 )
     {
@@ -342 +343 @@
       }
 
-#if POC_RESET_IDC_DECODER
+#if SVC_POC
       if( bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() != 0 )
       // New picture, slice header parsed but picture not decoded
@@ -1401 +1402 @@
 
     // Find the status of the DPB
-#if POC_RESET_IDC_DECODER
+#if SVC_POC
     xFindDPBStatus(listOfPocs, listOfPocsInEachLayer, listOfPocsPositionInEachLayer, dpbStatus, false);
 #else
@@ -1786 +1787 @@
                             , std::vector<Int> *listOfPocsPositionInEachLayer
                             , DpbStatus &dpbStatus
-#if POC_RESET_IDC_DECODER
                             , Bool notOutputCurrAu
-#endif
                             )
 {
@@ -1817 +1816 @@
           vps = pic->getSlice(0)->getVPS();
         }
-#if POC_RESET_IDC_DECODER
+
         if( !(pic->isCurrAu() && notOutputCurrAu ) )
         {
-#endif
           std::vector<Int>::iterator it;
           if( pic->getOutputMark() ) // && pic->getPOC() > m_aiPOCLastDisplay[i])
           {
             it = find( listOfPocs.begin(), listOfPocs.end(), pic->getPOC() ); // Check if already included
+
             if( it == listOfPocs.end() )  // New POC value - i.e. new AU - add to the list
             {
@@ -1832 +1831 @@
             listOfPocsPositionInEachLayer [i].push_back( picPositionInList  );  // For ease of access
           }
+
           if( pic->getSlice(0)->isReferenced() || pic->getOutputMark() )
           {
             dpbStatus.m_numPicsInSubDpb[i]++;  // Count pictures that are "used for reference" or "needed for output"
           }
-#if POC_RESET_IDC_DECODER
-        }
-#endif
-      }
+        }
+      }
+
       iterPic++;
       picPositionInList++;
@@ -1874 +1873 @@
 }  
 
-#if POC_RESET_IDC_DECODER
 Void TAppDecTop::outputAllPictures(Int layerId, Bool notOutputCurrPic)
 {
@@ -1900 +1898 @@
   }
 }
-#endif
 #endif
 

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

@@ -111 +111 @@
 
   Void xOutputAndMarkPic( TComPic *pic, const Char *reconFile, const Int layerId, Int &pocLastDisplay, DpbStatus &dpbStatus);
-#if POC_RESET_IDC_DECODER
   Void outputAllPictures(Int layerId, Bool notOutputCurrAu);
-#endif
   Void xFindDPBStatus( std::vector<Int> &listOfPocs
                             , std::vector<Int> *listOfPocsInEachLayer
                             , std::vector<Int> *listOfPocsPositionInEachLayer
                             , DpbStatus &dpbStatus
-#if POC_RESET_IDC_DECODER
                             , Bool notOutputCurrAu = true
-#endif
                             );