Changeset 1267 in 3DVCSoftware for branches/HTM-14.1-update-dev3-MediaTek2/source

Timestamp:

13 Jul 2015, 04:10:34 (9 years ago)

Author:

mediatek-htm

Message:

Reactive integer MV for depth coding with the MACRO "NH_3D_INTEGER_MV_DEPTH".

by Yi-Wen Chen (yiwen.chen@…)

Location:

branches/HTM-14.1-update-dev3-MediaTek2/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibCommon/TComPrediction.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (7 diffs)

branches/HTM-14.1-update-dev3-MediaTek2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4489 +4489 @@
   const TComSPS &sps=*(m_pcSlice->getSPS());
   Int  iMvShift = 2;
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( getSlice()->getIsDepth() )
     iMvShift = 0;

branches/HTM-14.1-update-dev3-MediaTek2/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1920 +1920 @@
   Int     yFrac  = mv->getVer() & ((1<<shiftVer)-1);
 
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( cu->getSlice()->getIsDepth() )
   {
     refOffset = mv->getHor() + mv->getVer() * refStride;
-    ref       = refPic->getLumaAddr( cu->getAddr(), cu->getZorderIdxInCU() + partAddr ) + refOffset;
+    ref       = refPic->getAddr(compID, cu->getCtuRsAddr(), cu->getZorderIdxInCtu() + partAddr ) + refOffset;
     xFrac     = 0;
     yFrac     = 0;

branches/HTM-14.1-update-dev3-MediaTek2/source/Lib/TLibCommon/TypeDef.h

@@ -75 +75 @@
 #define NH_3D_IV_MERGE                    1
 #define NH_3D_SPIVMP                      1
+#define NH_3D_INTEGER_MV_DEPTH            1
 #endif
 

branches/HTM-14.1-update-dev3-MediaTek2/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -5109 +5109 @@
 
   m_pcRdCost->setPredictor  ( *pcMvPred );
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( pcCU->getSlice()->getIsDepth() )
   {
@@ -5118 +5118 @@
 #endif
     m_pcRdCost->setCostScale  ( 2 );    
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   }
 #endif
@@ -5145 +5145 @@
 
   m_pcRdCost->getMotionCost( true, 0, pcCU->getCUTransquantBypass(uiPartAddr) );
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( ! pcCU->getSlice()->getIsDepth() )
   {
@@ -5158 +5158 @@
   rcMv += (cMvHalf <<= 1);
   rcMv +=  cMvQter;
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   }
 #endif
 
   UInt uiMvBits = m_pcRdCost->getBits( rcMv.getHor(), rcMv.getVer() );
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( pcCU->getSlice()->getIsDepth() )
   {
@@ -5177 +5177 @@
 {
   Int  iMvShift = 2;
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( pcCU->getSlice()->getIsDepth() )
   {
@@ -5335 +5335 @@
   UInt uiSearchRange = m_iSearchRange;
   pcCU->clipMv( rcMv );
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
   if( ! pcCU->getSlice()->getIsDepth() )
 #endif
@@ -5355 +5355 @@
       TComMv cMv = m_acMvPredictors[index];
       pcCU->clipMv( cMv );
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
       if( ! pcCU->getSlice()->getIsDepth() )
       {      
 #endif
         cMv >>= 2;
-#if H_3D_IC
+#if NH_3D_INTEGER_MV_DEPTH
       }
 #endif