Changeset 519 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

4 Jul 2013, 02:34:03 (12 years ago)

Author:

mitsubishi-htm

Message:

-intermediate version. equivalent as previous.

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp (modified) (9 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2189 +2189 @@
   setSubPart<Char>( iVSPFlag, m_piVSPFlag, uiAbsPartIdx, uiDepth, uiPartIdx );
 }
+
 #endif
 
@@ -2632 +2633 @@
  * \param uiCount: The next position to add merge candidate. Will be updated if VSP is successfully added
  * \param abCandIsInter: abCandIsInter[iCount] tells that VSP candidate is an Inter candidate, if VSP is successfully added
- * \param pcMvFieldNeighbours:   Return the "disparity vector". Type 1 MV. To be used to fetch a depth block. A "global" variable
- * \param puhInterDirNeighbours: Tells the VSP prediction direction. TODO: The value does NOT matter for VSP, as the direction will be determined based on availability later
- *                                Having it as output is mainly for coding beauty
+ * \param pcMvFieldNeighbours:   Return combined motion information, then stored to a global buffer
+ *                                    1) the "disparity vector". Type 1 MV. To be used to fetch a depth block.
+ *                                    2) the ref index /list.    Type 2 reference picture pointer, typically for texture
+ * \param puhInterDirNeighbours: Indicate the VSP prediction direction.
  * \param vspFlag: vspFlag[iCount] will be set (equal to 1), if VSP is successfully added. To be used to indicate the actual position of the VSP candidate
  *
@@ -2654 +2656 @@
     return false;
   
-  //////////
-  // Code if simply re-writing
-//  if(ucVspMergePos == H_3D_VSPPOSITION && picDepth != NULL && 0 != m_pcSlice->getViewIndex() ) // VSP can be used only when depth is used as input
-//  {
-//    abCandIsInter[iCount] = true;
-//    puhInterDirNeighbours[iCount] = 1;
-//    vspFlag[iCount] = 1;
-//    vspDirTrue[iCount] = 0; // TODO: Check if this is really useful!!!!
-//
-//    Int iRefIdxList0 = getSlice()->getRefPic(REF_PIC_LIST_0, 0)->getPOC() == getSlice()->getPOC() ? 0 :
-//                      (getSlice()->getAlterRefIdx(REF_PIC_LIST_0) == -1 ? NOT_VALID : getSlice()->getAlterRefIdx(REF_PIC_LIST_0));
-//    pcMvFieldNeighbours[iCount<<1].setMvField( pDInfo->m_acDoNBDV, iRefIdxList0 );
-//    if (getSlice()->isInterB())
-//    {
-//      puhInterDirNeighbours[iCount] = xGetVspDirection(uiPUIdx);
-//      Int iRefIdxList1 = getSlice()->getRefPic(REF_PIC_LIST_1, 0)->getPOC() == getSlice()->getPOC() ? 0 :
-//                        (getSlice()->getAlterRefIdx(REF_PIC_LIST_1) == -1 ? NOT_VALID : getSlice()->getAlterRefIdx(REF_PIC_LIST_1));
-//      pcMvFieldNeighbours[(iCount<<1)+1].setMvField( pDInfo->m_acDoNBDV, iRefIdxList1 );
-//    }
-//
-//    if ( mrgCandIdx == iCount )
-//      return true;
-//
-//    iCount++;
-//  }
-  /////////////
-  
-  
   Bool refViewAvailFlag = false;
   UChar predFlag[2] = {0, 0};
@@ -2711 +2685 @@
     {
       TComPic* refPic = m_pcSlice->getRefPic(eRefPicList, i);
-      if ( refPic->getPOC() == m_pcSlice->getPOC() ) // is inter-view reference
+      if ( refPic->getPOC() == m_pcSlice->getPOC() ) // inter-view reference
       {
         Int viewIdxRefInList = refPic->getViewIndex();
@@ -2736 +2710 @@
   return false;
 }
+
 #endif
 
@@ -4726 +4701 @@
             estimateDVFromDM(iTargetViewIdx, uiPartIdx, picDepth, uiPartAddr, &cColMv );
 
-#if 0 // H_3D_VSP
-          Int refFrmIdx = 0;
-          RefPicList privateRefPicList = REF_PIC_LIST_0;
-          //getRefListAndRefFrmIdx(iTargetViewIdx, privateRefPicList, refFrmIdx);
-
-          //pDInfo->m_aListIdx[ pDInfo->iN ]  = privateRefPicList;
-          //pDInfo->m_aRefIdx [ pDInfo->iN ]  = -1-refFrmIdx;
-          assert(pDInfo->m_aRefIdx [ pDInfo->iN ] < 0);
-#endif //H_3D_VSP
           pDInfo->m_acDoNBDV  = cColMv;
 #endif //H_3D_NBDV_REF
@@ -4844 +4810 @@
 #endif
           pDInfo->m_acDoNBDV = cDispVec;
-          
-#if 0 // H_3D_VSP
-          Int refFrmIdx = 0;
-          RefPicList privateRefPicList = REF_PIC_LIST_0 ;
-          getRefListAndRefFrmIdx(0, privateRefPicList, refFrmIdx); // find the reference picture from base view
-
-          pDInfo->m_aListIdx[ pDInfo->iN ]  = privateRefPicList;
-          pDInfo->m_aRefIdx [ pDInfo->iN ]  = -1-refFrmIdx;
-          assert(pDInfo->m_aRefIdx [ pDInfo->iN ] < 0);
-#endif //H_3D_VSP
-          
 #endif
           return true;
@@ -4875 +4830 @@
   }
   pDInfo->m_acDoNBDV = defaultDV;
-
-#if 0 // H_3D_VSP
-  Int refFrmIdx = 0;
-  RefPicList privateRefPicList = REF_PIC_LIST_0 ;
-  getRefListAndRefFrmIdx(0, privateRefPicList, refFrmIdx); // find the reference picture from base view
-
-  pDInfo->m_aListIdx[ pDInfo->iN ]  = privateRefPicList;
-  pDInfo->m_aRefIdx [ pDInfo->iN ]  = -1-refFrmIdx;
-  assert(pDInfo->m_aRefIdx [ pDInfo->iN ] < 0);
-#endif
-#endif
+#endif
+
   return false; 
 }
@@ -4968 +4914 @@
           if (picDepth && bDepthRefine)
             estimateDVFromDM(refViewIdx, uiPartIdx, picDepth, uiPartAddr, &cMvPred );
-
-#if 0 // H_3D_VSP
-          pNbDvInfo->m_aListIdx[ pNbDvInfo->iN ] = eRefPicList;
-          pNbDvInfo->m_aRefIdx [ pNbDvInfo->iN ] = -1-refId;
-          assert(pNbDvInfo->m_aRefIdx [ pNbDvInfo->iN ] < 0);
-#endif
 
           pNbDvInfo->m_acDoNBDV = cMvPred;