Changeset 655 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

9 Apr 2014, 04:52:27 (11 years ago)

Author:

seregin

Message:

remove ILRP's SPS reference

File:

• branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)

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

@@ -3668 +3668 @@
 
     TComPic* pcRefPicBL = pcRefPicRL[refLayerIdc];
+
     //set reference picture POC of each ILP reference 
     Int thePoc = ilpPic[refLayerIdc]->getPOC(); 
@@ -3674 +3675 @@
     ilpPic[refLayerIdc]->getSlice(0)->setBaseColPic( refLayerIdc, pcRefPicBL );
 
-    //copy reference pictures marking from the reference layer
-    ilpPic[refLayerIdc]->getSlice(0)->copySliceInfo(pcRefPicBL->getSlice(0));
+    //copy layer id from the reference layer    
+    ilpPic[refLayerIdc]->setLayerId( pcRefPicBL->getLayerId() );
+
+    //copy slice type from the reference layer
+    ilpPic[refLayerIdc]->getSlice(0)->setSliceType( pcRefPicBL->getSlice(0)->getSliceType() );
 
     for( Int refList = 0; refList < 2; refList++ )
@@ -3697 +3701 @@
         ilpPic[refLayerIdc]->getSlice(0)->setRefPOC(0, refPicList, refIdx); 
         ilpPic[refLayerIdc]->getSlice(0)->setRefPic(NULL, refPicList, refIdx); 
+      }
+
+      //copy reference pictures' marking from the reference layer
+      for(Int j = 0; j < MAX_NUM_REF + 1; j++)
+      {
+        ilpPic[refLayerIdc]->getSlice(0)->setIsUsedAsLongTerm(refList, j, pcRefPicBL->getSlice(0)->getIsUsedAsLongTerm(refList, j));
       }
     }