Changeset 390 in 3DVCSoftware for branches/HTM-6.2-dev2-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

10 May 2013, 10:17:06 (11 years ago)

Author:

mediatek-htm

Message:

ARP Warning Fix, the related MACRO is "QC_ARP_WARNING_FIX"

by Yu-Lin Chang (yulin.chang@…)

File:

• branches/HTM-6.2-dev2-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp (modified) (8 diffs)

branches/HTM-6.2-dev2-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp

@@ -69 +69 @@
     if (vspIdx < 4)
     {
+#if MTK_VSP_USING_NBDV_D0105
+      pcMvFieldNeighbours[ iCount<<1].setMvField ( pDInfo->m_acMvCandNoRef[0],  NOT_VALID );
+#else
       pcMvFieldNeighbours[ iCount<<1].setMvField ( pDInfo->m_acMvCand[0],  NOT_VALID );
+#endif
       if ( pcCURef->getSlice()->isInterB() )
       {
+#if MTK_VSP_USING_NBDV_D0105
+        pcMvFieldNeighbours[(iCount<<1)+1 ].setMvField ( pDInfo->m_acMvCandNoRef[0],  NOT_VALID );
+#else
          pcMvFieldNeighbours[(iCount<<1)+1 ].setMvField ( pDInfo->m_acMvCand[0],  NOT_VALID );
+#endif
       }
     }
@@ -81 +89 @@
                                           UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, Int* iVSPIndexTrue, Int mrgCandIdx, DisInfo* pDInfo )
 {
+#if MTK_LGE_VSP_DEPTH_OFF_D0105_D0139
+  if (getSlice()->getSPS()->isDepth())
+  {
+    return true;
+  }
+#endif
+
 #if MERL_VSP_C0152_BugFix_ForNoDepthCase
   TComPic* pRefPicBaseDepth = NULL;
@@ -105 +120 @@
           if (vspIdx < 4) // spatial
           {
+#if MTK_VSP_USING_NBDV_D0105
+            pcMvFieldNeighbours[iCount<<1].setMvField(pDInfo->m_acMvCandNoRef[0], NOT_VALID );
+#else
             pcMvFieldNeighbours[iCount<<1].setMvField(pDInfo->m_acMvCand[0], NOT_VALID );
+#endif
             if ( getSlice()->isInterB() )
             {
+#if MTK_VSP_USING_NBDV_D0105
+              pcMvFieldNeighbours[(iCount<<1)+1].setMvField( pDInfo->m_acMvCandNoRef[0], NOT_VALID );
+#else
               pcMvFieldNeighbours[(iCount<<1)+1].setMvField( pDInfo->m_acMvCand[0], NOT_VALID );
+#endif
             }
           }
@@ -3715 +3738 @@
       cDisInfo.m_acMvCand[0] = getDvInfo(uiAbsPartIdx).m_acMvCand[0];
       cDisInfo.m_aVIdxCan[0] = getDvInfo(uiAbsPartIdx).m_aVIdxCan[0];
+#if MTK_VSP_USING_NBDV_D0105
+      cDisInfo.m_acMvCandNoRef[0] = getDvInfo(uiAbsPartIdx).m_acMvCandNoRef[0];
+#endif
     }
 #else
@@ -3780 +3806 @@
         clipMv(cMvPred);
         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
+#if MTK_LGE_VSP_DEPTH_OFF_D0105_D0139
+        if (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0)
+        {
+          assert(pcTextureCU->getVSPIndex(uiPartIdxCenter)!=0);  
+          for (Int i=0; i<getSlice()->getNumRefIdx(REF_PIC_LIST_0); i++)
+          {
+            if (getSlice()->getRefPOC(REF_PIC_LIST_0, i) == getSlice()->getPOC())
+            {
+              pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,i);
+              break;
+            }
+          }
+        }
+#endif
       }
       if ( getSlice()->isInterB() )
@@ -3792 +3832 @@
           clipMv(cMvPred);
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
+#if MTK_LGE_VSP_DEPTH_OFF_D0105_D0139
+          if (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0)
+          {
+            assert(pcTextureCU->getVSPIndex(uiPartIdxCenter)!=0);  
+            for (Int i=0; i<getSlice()->getNumRefIdx(REF_PIC_LIST_1); i++)
+            {
+              if (getSlice()->getRefPOC(REF_PIC_LIST_1, i) == getSlice()->getPOC())
+              {
+                pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,i);
+                break;
+              }
+            }
+          }
+#endif
         }
       }
 #if MERL_VSP_C0152
+#if !MTK_LGE_VSP_DEPTH_OFF_D0105_D0139
       xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-      if ( mrgCandIdx == iCount )
-      {
-        return;
-      }
-      iCount ++;
+#endif
+#if MTK_LGE_VSP_DEPTH_OFF_D0105_D0139
+      if (!((pcMvFieldNeighbours[iCount<<1].getRefIdx()<0 && !getSlice()->isInterB())
+        || (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0 && pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0 && getSlice()->isInterB())))
+      {
+#endif
+        if ( mrgCandIdx == iCount )
+        {
+          return;
+        }
+        iCount ++;
+#if MTK_LGE_VSP_DEPTH_OFF_D0105_D0139
+      }
+      else
+      {
+        assert(0);
+      }
+#endif
     }
   }
@@ -5043 +5111 @@
     Int depthEndPosX   = Clip3(0,   iPictureWidth - 1,  iBlkX + iBlkWidth - 1 + (mv->getHor()>>2));
     Int depthEndPosY   = Clip3(0,   iPictureHeight - 1,  iBlkY + iBlkHeight - 1 + (mv->getVer()>>2));
+#if !MTK_DEPTH_TO_DISP_D0138
     Int iCenterX = (depthStartPosX + depthEndPosX) >> 1;
     Int iCenterY = (depthStartPosY + depthEndPosY) >> 1;
+#endif
 
     Pel *depthTL  = pcBaseViewDepthPicYuv->getLumaAddr();
@@ -5052 +5122 @@
     aiDepth[2] = depthTL[ (depthStartPosY) * depStride + depthEndPosX   ];      // Right Top
     aiDepth[3] = depthTL[ (depthEndPosY)   * depStride + depthEndPosX   ];      // Right Bottom
+#if MTK_DEPTH_TO_DISP_D0138
+    for (Int i = 0; i < 4; i++)
+#else
     aiDepth[4] = depthTL[ (iCenterY)       * depStride + iCenterX       ];      // Center
     for (Int i = 0; i < 5; i++)
+#endif
     {
       if (maxDepthVal < aiDepth[i])