Changeset 1235 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

Timestamp:

13 Jul 2015, 20:38:11 (9 years ago)

Author:

seregin

Message:

port rev 4219 and rev 4246

File:

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

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

@@ -407 +407 @@
     streamYUV.close();
   }
-  pcBLPic.destroy();
 
 #if CONFORMANCE_BITSTREAM_MODE
@@ -705 +704 @@
   Int numPicsNotYetDisplayed = 0;
   Int dpbFullness = 0;
-#if SVC_EXTENSION
-TComSPS* activeSPS = m_acTDecTop[layerId].getActiveSPS();
-#else
-  TComSPS* activeSPS = m_cTDecTop.getActiveSPS();
-#endif
+  const TComSPS* activeSPS = &(pcListPic->front()->getPicSym()->getSPS());
   UInt numReorderPicsHighestTid;
   UInt maxDecPicBufferingHighestTid;
@@ -781 +776 @@
         {
           const Window &conf = pcPicTop->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
+          const Window  defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
           const Bool isTff = pcPicTop->isTopField();
 
@@ -815 +810 @@
         {
           const Window &conf = pcPicTop->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
+          const Window  defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
           const Bool isTff = pcPicTop->isTopField();
 
@@ -906 +901 @@
         {
           const Window &conf = pcPic->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();          
+          const Window  defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();          
 
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
@@ -924 +919 @@
         {
           const Window &conf    = pcPic->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
+          const Window  defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
 
           m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec(),
@@ -1034 +1029 @@
         {
           const Window &conf = pcPicTop->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
+          const Window  defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
           const Bool isTff = pcPicTop->isTopField();          
 
@@ -1053 +1048 @@
         {
           const Window &conf = pcPicTop->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
+          const Window  defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
           const Bool isTff = pcPicTop->isTopField();
           m_cTVideoIOYuvReconFile.write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
@@ -1131 +1126 @@
         {
           const Window &conf = pcPic->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();          
+          const Window  defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();          
 
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
@@ -1149 +1144 @@
         {
           const Window &conf    = pcPic->getConformanceWindow();
-          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
+          const Window  defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
 
           m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec(),
@@ -1613 +1608 @@
 }
 
-TComVPS *TAppDecTop::findDpbParametersFromVps(std::vector<Int> const &listOfPocs, std::vector<Int> const *listOfPocsInEachLayer, std::vector<Int> const *listOfPocsPositionInEachLayer, DpbStatus &maxDpbLimit)
+const TComVPS *TAppDecTop::findDpbParametersFromVps(std::vector<Int> const &listOfPocs, std::vector<Int> const *listOfPocsInEachLayer, std::vector<Int> const *listOfPocsPositionInEachLayer, DpbStatus &maxDpbLimit)
 {
   Int targetOutputLsIdx = getCommonDecoderParams()->getTargetOutputLayerSetIdx();
-  TComVPS *vps = NULL;
+  const TComVPS *vps = NULL;
 
   if( targetOutputLsIdx == 0 )   // Only base layer is output
   {
-    TComSPS *sps = NULL;
+    const TComSPS *sps = NULL;
     assert( listOfPocsInEachLayer[0].size() != 0 );
     TComList<TComPic*>::iterator iterPic;
@@ -1704 +1699 @@
     {
       TComPic *pic = *iterPic;
+
+      assert( pic->getPicSym() );
+
       if( !pic->getSlice(0)->isReferenced() && !pic->getOutputMark() )
       {
@@ -1743 +1741 @@
                             )
 {
-  TComVPS *vps = NULL;
+  const TComVPS *vps = NULL;
   dpbStatus.init();