Changeset 582 in 3DVCSoftware

Timestamp:

17 Aug 2013, 01:38:28 (11 years ago)

Author:

hisilicon-htm

Message:

JCT3V-E0242:On DMM simplification
JCT3V-E0283:Fast Intra Prediction Mode Selection for Intra Depth Map Coding

Location:

branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib

Files:

• TLibCommon/TComPrediction.cpp (modified) (1 diff)
• TLibCommon/TComRdCost.cpp (modified) (1 diff)
• TLibCommon/TComRdCost.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibCommon/TComPrediction.cpp

@@ -2140 +2140 @@
     iDC += piRefBlkY[k]; 
   }
+
 #if SCU_HS_DMM4_REMOVE_DIV_E0242
-  iDC = iDC >> (6 - pcCU->getDepth(0))*2;
+Int cuMaxLog2Size = g_aucConvertToBit[g_uiMaxCUWidth]+2;
+iDC = iDC >> (cuMaxLog2Size - pcCU->getDepth(0))*2;
 #else
   iDC /= (uiWidth*uiHeight);

branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibCommon/TComRdCost.cpp

@@ -486 +486 @@
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
 
-UInt TComRdCost::calcVAR (Pel* pi0, Int iStride, Int cuDepth)
-{
-  UInt uiSum = 0;
+UInt TComRdCost::calcVAR (Pel* pi0, Int uiWidth, Int uiHeight, Int cuDepth)
+{ 
   Int x, y;
   Int temp = 0;
-  if (iStride == 4)
-      cuDepth = 4;
-
-  for (x = 0; x < iStride; x++)
-  {
-      for (y = 0; y < iStride; y++)
+
+  for (x = 0; x <  uiHeight; x++)
+  {
+     for (y = 0; y < uiWidth; y++)
       {
-         temp += pi0[x*iStride+y];
+         temp += pi0[x*uiHeight+y]; 
       }
   }
-  temp = temp >> (6-cuDepth)*2;
-
-  for (x = 0; x < iStride; x++)
-  {
-      for (y = 0; y < iStride; y++)
+  Int cuMaxLog2Size = g_aucConvertToBit[g_uiMaxCUWidth]+2;
+  if (uiWidth == 4)
+  {
+     cuDepth = cuMaxLog2Size-2;
+  }
+
+  temp = temp >> (cuMaxLog2Size-cuDepth)*2;
+
+  UInt uiSum = 0;
+    for (x = 0; x <  uiHeight; x++)
+  {
+      for (y = 0; y < uiWidth; y++)
       {
-         uiSum += (pi0[x*iStride+y]-temp)*(pi0[x*iStride+y]-temp);
+        uiSum += (pi0[x*uiHeight+y]-temp)*(pi0[x*uiHeight+y]-temp);
       }
   }
-  return (uiSum >> (6-cuDepth)*2);
+     return (uiSum >> (cuMaxLog2Size-cuDepth)*2);
 
 }

branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibCommon/TComRdCost.h

@@ -229 +229 @@
   UInt    calcHAD(Int bitDepth, Pel* pi0, Int iStride0, Pel* pi1, Int iStride1, Int iWidth, Int iHeight );
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
-  UInt    calcVAR (Pel* pi0, Int iStride, Int cuDepth);
+  UInt    calcVAR(Pel* pi0, Int uiWidth, Int uiHeight, Int cuDepth);
 #endif  
   // for motion cost

branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2836 +2836 @@
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
 Int threshold = max(((pcCU->getQP(0))>>3)-1,3);
-Int varThreshold = (int)(threshold*threshold - 8);
-UInt uiVarCU=m_pcRdCost->calcVAR(piOrg, uiWidth,pcCU->getDepth(0));
-#endif
+Int varThreshold = (Int)(threshold*threshold - 8);
+UInt uiVarCU=m_pcRdCost->calcVAR(piOrg, uiWidth,uiHeight,pcCU->getDepth(0));
+#endif
+
 
 #if H_3D_DIM_DMM
-       if( m_pcEncCfg->getUseDMM()
+      if( m_pcEncCfg->getUseDMM()
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
-        && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
-#endif
-         )
-       {
+         && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
+#endif
+        )
+      {
         for( UInt dmmType = 0; dmmType < DMM_NUM_TYPE; dmmType++ )
         {
@@ -2919 +2920 @@
 #endif
 #if H_3D_DIM_RBC
-       if( m_pcEncCfg->getUseRBC()
+      if( m_pcEncCfg->getUseRBC()
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
           && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
 #endif
-         )
-       {
+        )
+      {
         if( xSearchRbcEdge( pcCU, uiPartOffset, piOrg, uiStride, uiWidth, uiHeight ) )
         {