Changeset 99 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon

Timestamp:

25 Mar 2013, 18:29:05 (12 years ago)

Author:

seregin

Message:

check for MFM flag

Location:

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPic.cpp

@@ -736 +736 @@
       }
     }
-    memset( pcCUDes->getPartitionSize(), SIZE_2Nx2N, sizeof(char)*numPartitions);
+    memset( pcCUDes->getPartitionSize(), SIZE_2Nx2N, sizeof(Char)*numPartitions);
   }
 }

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

@@ -2155 +2155 @@
   {
     RefPicList refPicList = RefPicList( refList );
-
-    //initialize reference POC of ILP 
-    for(Int refIdx = 0; refIdx < MAX_NUM_REF; refIdx++) 
+    
+    //set reference POC of ILP
+    ilpPic[0]->getSlice(0)->setNumRefIdx(refPicList, pcRefPicBL->getSlice(0)->getNumRefIdx(refPicList));
+    assert(ilpPic[0]->getSlice(0)->getNumRefIdx(refPicList) >= 0);
+    assert(ilpPic[0]->getSlice(0)->getNumRefIdx(refPicList) <= MAX_NUM_REF);
+
+    //initialize reference POC of ILP
+    for(Int refIdx = 0; refIdx < pcRefPicBL->getSlice(0)->getNumRefIdx(refPicList); refIdx++)
+    {
+      ilpPic[0]->getSlice(0)->setRefPOC(pcRefPicBL->getSlice(0)->getRefPOC(refPicList, refIdx), refPicList, refIdx);
+      ilpPic[0]->getSlice(0)->setRefPic(pcRefPicBL->getSlice(0)->getRefPic(refPicList, refIdx), refPicList, refIdx);
+    }
+
+    for(Int refIdx = pcRefPicBL->getSlice(0)->getNumRefIdx(refPicList); refIdx < MAX_NUM_REF; refIdx++) 
     { 
       ilpPic[0]->getSlice(0)->setRefPOC(0, refPicList, refIdx); 
       ilpPic[0]->getSlice(0)->setRefPic(NULL, refPicList, refIdx); 
     }
-
-    //set reference POC of ILP 
-    ilpPic[0]->getSlice(0)->setNumRefIdx(refPicList, pcRefPicBL->getSlice(0)->getNumRefIdx(refPicList));
-    assert(ilpPic[0]->getSlice(0)->getNumRefIdx(refPicList) <= MAX_NUM_REF); 
-
-    for(Int refIdx = 0; refIdx < pcRefPicBL->getSlice(0)->getNumRefIdx(refPicList); refIdx++) 
-    {
-      ilpPic[0]->getSlice(0)->setRefPOC(pcRefPicBL->getSlice(0)->getRefPOC(refPicList, refIdx), refPicList, refIdx); 
-      ilpPic[0]->getSlice(0)->setRefPic(pcRefPicBL->getSlice(0)->getRefPic(refPicList, refIdx), refPicList, refIdx); 
-    }
   }
   return;