Changeset 1210 in 3DVCSoftware for branches/HTM-14.1-update-dev3-Samsung-Qualcomm/source/Lib/TLibEncoder

Timestamp:

14 May 2015, 03:55:10 (10 years ago)

Author:

samsung-htm

Message:

Alignment and reactivation of NBDV

• new macro NH_3D_NBDV for NBDV

Location:

branches/HTM-14.1-update-dev3-Samsung-Qualcomm/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (3 diffs)
• TEncGOP.cpp (modified) (3 diffs)

branches/HTM-14.1-update-dev3-Samsung-Qualcomm/source/Lib/TLibEncoder/TEncCu.cpp ¶

@@ -441 +441 @@
   Bool    earlyDetectionSkipMode = false;
 
-#if H_3D_VSP
+#if NH_3D_NBDV
   DisInfo DvInfo; 
   DvInfo.m_acNBDV.setZero();
@@ -584 +584 @@
 #endif
 
-#if H_3D_NBDV
+#if NH_3D_NBDV
       if( rpcTempCU->getSlice()->getSliceType() != I_SLICE )
       {
@@ -602 +602 @@
         {
           PartSize ePartTemp = rpcTempCU->getPartitionSize(0);
-          rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );     
+          rpcTempCU->setPartSizeSubParts(SIZE_2Nx2N, 0, uiDepth);
 #if H_3D_IV_MERGE
           if (rpcTempCU->getSlice()->getIsDepth() )

branches/HTM-14.1-update-dev3-Samsung-Qualcomm/source/Lib/TLibEncoder/TEncGOP.cpp ¶

@@ -1471 +1471 @@
     pcSlice->setRefPicList ( rcListPic );
 #endif
-#if H_3D
+#if NH_3D_NBDV
     pcSlice->setDefaultRefView();
 #endif
@@ -1731 +1731 @@
     UInt uiNumSliceSegments = 1;
 
-#if H_3D_NBDV
+#if NH_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());
+        Int iColPoc = pcSlice->getRefPOC(RefPicList(1 - pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
         pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
       }
@@ -1743 +1743 @@
 #endif
 
-#if H_3D_NBDV
+#if NH_3D_NBDV
       if(pcSlice->getViewIndex() && !pcSlice->getIsDepth() && !pcSlice->isIntra()) //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.
       {