Changeset 1365 in SHVCSoftware for branches/SHM-dev

Timestamp:

22 Jul 2015, 04:14:51 (9 years ago)

Author:

seregin

Message:

port rev 4449

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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

@@ -1636 +1636 @@
   Int nrOfPositivePictures = 0;
   TComReferencePictureSet* pcRPS = this->getLocalRPS();
+  (*pcRPS)=TComReferencePictureSet();
+
   Bool irapIsInRPS = false; // Used when bEfficientFieldIRAPEnabled==true
 #if SVC_POC

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

@@ -1319 +1319 @@
       pcSlice->setPOC(0);
       TComReferencePictureSet* rps = pcSlice->getLocalRPS();
-      rps->setNumberOfNegativePictures(0);
-      rps->setNumberOfPositivePictures(0);
-      rps->setNumberOfLongtermPictures(0);
-      rps->setNumberOfPictures(0);
+      (*rps)=TComReferencePictureSet();
       pcSlice->setRPS(rps);
     }
@@ -1378 +1375 @@
       TComReferencePictureSet* rps;
       rps = pcSlice->getLocalRPS();
+      (*rps)=TComReferencePictureSet();
+
       pcSlice->setRPS(rps);
       READ_FLAG( uiCode, "short_term_ref_pic_set_sps_flag" );
@@ -1528 +1527 @@
         // In the case of BLA picture types, rps data is read from slice header but ignored
         rps = pcSlice->getLocalRPS();
-        rps->setNumberOfNegativePictures(0);
-        rps->setNumberOfPositivePictures(0);
-        rps->setNumberOfLongtermPictures(0);
-        rps->setNumberOfPictures(0);
+        (*rps)=TComReferencePictureSet();
         pcSlice->setRPS(rps);
       }