Changeset 455 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Timestamp:

4 Jun 2013, 00:01:30 (11 years ago)

Author:

zhang

Message:

NBDV for 3D-HEVC

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCu.cpp

@@ -457 +457 @@
 
       rpcTempCU->initEstData( uiDepth, iQP );
-
+#if H_3D_NBDV
+      DisInfo DvInfo; 
+      DvInfo.bDV = false;
+      DvInfo.m_acNBDV.setZero();
+      DvInfo.m_aVIdxCan = 0;
+#if H_3D_NBDV_REF
+      DvInfo.m_acDoNBDV.setZero();
+#endif
+
+      if( rpcTempCU->getSlice()->getSliceType() != I_SLICE )
+      {
+        if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done. Remove this comment once it is done.
+        {
+          PartSize ePartTemp = rpcTempCU->getPartitionSize(0);
+          rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );     
+#if H_3D_NBDV_REF
+          if(m_pcSlice->getSPS()->getUseDVPRefine())  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
+            DvInfo.bDV = rpcTempCU->getDisMvpCandNBDV(&DvInfo, true);
+          else
+#endif 
+            DvInfo.bDV = rpcTempCU->getDisMvpCandNBDV(&DvInfo);
+
+          rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
+          rpcBestCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
+          rpcTempCU->setPartSizeSubParts( ePartTemp, 0, uiDepth );
+        }
+      }
+#endif
       // do inter modes, SKIP and 2Nx2N
       if( rpcBestCU->getSlice()->getSliceType() != I_SLICE )

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1028 +1028 @@
     m_storedStartCUAddrForEncodingSliceSegment.push_back(nextCUAddr);
     startCUAddrSliceSegmentIdx++;
-
+#if H_3D_NBDV
+      if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
+      {
+        Int iColPoc = pcSlice->getRefPOC(RefPicList(1-pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
+        pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
+      }
+#endif
     while(nextCUAddr<uiRealEndAddress) // determine slice boundaries
     {