Changeset 402 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source

Timestamp:

13 May 2013, 18:59:47 (12 years ago)

Author:

mitsubishi-htm

Message:

-D0165, constrained VSP @ 1x1. The VSP compensation unit would be set back to 4x4 (CTC) at the end of MERL integration.

Location:

branches/HTM-6.2-dev2-MERL/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPrediction.cpp (modified) (6 diffs)
• Lib/TLibCommon/TComPrediction.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCu.cpp (modified) (2 diffs)

branches/HTM-6.2-dev2-MERL/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1086 +1086 @@
 #if MERL_VSP_C0152
 #if MERL_VSP_C0152_BugFix_ForNoDepthCase
-        if(m_bUsingDepthMaps) //VSP can be used only when depth is available as input
+        if(m_bUsingDepthMaps) // VSP can be used only when depth is available as input
         {
 #endif

branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp

@@ -50 +50 @@
 #endif
 
+#if MERL_VSP_C0152
+#if MERL_CVSP_D0165
+Int TComPrediction::m_iRangeLuma[12]   = {14, 34, 21, 15, 36, 26, 21, 49, 41, 36, 80, 72};
+Int TComPrediction::m_iRangeChroma[12] = { 2,  8,  5,  4, 11,  9,  8, 19, 17, 15, 34, 32};
+#endif
+#endif
+
 TComPrediction::TComPrediction()
 : m_pLumaRecBuffer(0)
@@ -1522 +1529 @@
 #endif
 
+#if MERL_CVSP_D0165
+  Int widthDepth  = pPicBaseDepth->getWidth();
+  Int heightDepth = pPicBaseDepth->getHeight();
+#endif
+
   Int nTxtPerDepthX = widthLuma  / ( pPicBaseDepth->getWidth() );  // texture pixel # per depth pixel
   Int nTxtPerDepthY = heightLuma / ( pPicBaseDepth->getHeight() );
@@ -1610 +1622 @@
 #endif
   
+#if MERL_VSP_BLOCKSIZE_C0152 == 1
+#if MERL_CVSP_D0165
+  //get LUT based horizontal reference range
+  Int range = 0;
+  if( size_x == 4 && size_y == 8 )
+    range = m_iRangeLuma[0];
+  else if( size_x == 8 && size_y == 4 )
+    range = m_iRangeLuma[1];
+  else if( size_x == 8 && size_y == 8 )
+    range = m_iRangeLuma[2];
+  else if( size_x == 8 && size_y == 16 )
+    range = m_iRangeLuma[3];
+  else if( size_x == 16 && size_y == 8 )
+    range = m_iRangeLuma[4];
+  else if( size_x == 16 && size_y == 16 )
+    range = m_iRangeLuma[5];
+  else if( size_x == 16 && size_y == 32 )
+    range = m_iRangeLuma[6];
+  else if( size_x == 32 && size_y == 16 )
+    range = m_iRangeLuma[7];
+  else if( size_x == 32 && size_y == 32 )
+    range = m_iRangeLuma[8];
+  else if( size_x == 32 && size_y == 64 )
+    range = m_iRangeLuma[9];
+  else if( size_x == 64 && size_y == 32 )
+    range = m_iRangeLuma[10];
+  else if( size_x == 64 && size_y == 64 )
+    range = m_iRangeLuma[11];
+  else 
+    assert(0);
+
+  // The minimum depth value
+  Int min_relative_pos = 5000;
+  Int max_relative_pos = -5000;
+
+  Pel* depth_temp, *depth_initial=depth;
+  for (Int yTxt =0; yTxt<size_y; yTxt++)
+  {
+    for (Int xTxt =0; xTxt<size_x; xTxt++)
+    {
+      if (depthPosX+xTxt < widthDepth)
+        depth_temp = depth_initial + xTxt;
+      else
+        depth_temp = depth_initial + (widthDepth - depthPosX - 1);
+
+      Int disparity = pShiftLUT[ *depth_temp ] << iShiftPrec;
+      Int disparity_int = disparity >> 2;
+
+      if( disparity <= 0)
+      {
+        if (min_relative_pos > disparity_int+xTxt)
+            min_relative_pos = disparity_int+xTxt;
+      }
+      else
+      {
+        if (max_relative_pos < disparity_int+xTxt)
+            max_relative_pos = disparity_int+xTxt;
+      }
+    }
+    if (depthPosY+yTxt < heightDepth)
+      depth_initial = depth_initial + depStride;
+  }
+
+  Int disparity_tmp = pShiftLUT[ *depth ] << iShiftPrec;
+  if (disparity_tmp <= 0)
+    max_relative_pos = min_relative_pos + range -1 ;
+  else
+    min_relative_pos = max_relative_pos - range +1 ;
+#endif
+#endif
+
 #if MERL_VSP_BLOCKSIZE_C0152 != 1
   Int yDepth = 0;
@@ -1632 +1715 @@
       Int refOffset = xTxt + (disparity >> 2);
       Int xFrac = disparity & 0x3;
+#if MERL_CVSP_D0165
+      if(refOffset<min_relative_pos || refOffset>max_relative_pos)
+        xFrac = 0;
+      refOffset = Clip3(min_relative_pos, max_relative_pos, refOffset);
+#endif
       Int absX  = posX + refOffset;
 
@@ -1823 +1911 @@
 
 
+#if MERL_VSP_BLOCKSIZE_C0152 == 1
+#if MERL_CVSP_D0165
+  //get LUT based horizontal reference range
+  Int range=0;
+  if( size_x == 2 && size_y == 4 )
+    range = m_iRangeChroma[0];
+  else if( size_x == 4 && size_y == 2 )
+    range = m_iRangeChroma[1];
+  else if( size_x == 4 && size_y == 4 )
+    range = m_iRangeChroma[2];
+  else if( size_x == 4 && size_y == 8 )
+    range = m_iRangeChroma[3];
+  else if( size_x == 8 && size_y == 4 )
+    range = m_iRangeChroma[4];
+  else if( size_x == 8 && size_y == 8 )
+    range = m_iRangeChroma[5];
+  else if( size_x == 8 && size_y == 16 )
+    range = m_iRangeChroma[6];
+  else if( size_x == 16 && size_y == 8 )
+    range = m_iRangeChroma[7];
+  else if( size_x == 16 && size_y == 16 )
+    range = m_iRangeChroma[8];
+  else if( size_x == 16 && size_y == 32 )
+    range = m_iRangeChroma[9];
+  else if( size_x == 32 && size_y == 16 )
+    range = m_iRangeChroma[10];
+  else if( size_x == 32 && size_y == 32 )
+    range = m_iRangeChroma[11];
+  else
+    assert(0);
+  
+  // The minimum depth value
+  Int min_relative_pos = 5000;
+  Int max_relative_pos = -5000;
+
+  Int depth_tmp;
+  for (Int yTxt=0; yTxt<size_y; yTxt++)
+  {
+    for (Int xTxt=0; xTxt<size_x; xTxt++)
+    {
+      depth_tmp = m_pDepth[xTxt+yTxt*dW];
+      Int disparity = pShiftLUT[ depth_tmp ] << iShiftPrec;
+      Int disparity_int = disparity >> 3;//in chroma resolution
+
+      if (disparity_int < 0)
+      {
+        if (min_relative_pos > disparity_int+xTxt)
+            min_relative_pos = disparity_int+xTxt;
+      }
+      else
+      {
+        if (max_relative_pos < disparity_int+xTxt)
+            max_relative_pos = disparity_int+xTxt;
+      }
+    }
+  }
+
+  depth_tmp = m_pDepth[0];
+  Int disparity_tmp = pShiftLUT[ depth_tmp ] << iShiftPrec;
+  if ( disparity_tmp < 0 )
+    max_relative_pos = min_relative_pos + range - 1;
+  else
+    min_relative_pos = max_relative_pos - range + 1;
+
+#endif
+#endif
+
     // (size_x, size_y) is Chroma block size
     for ( Int yTxt = 0, yDepth = 0; yTxt < size_y; yTxt += nTxtPerDepthY, yDepth += nDepthPerTxtY )
@@ -1843 +1998 @@
         Int refOffset = xTxt + (disparity >> 3); // in integer pixel in chroma image
         Int xFrac = disparity & 0x7;
+#if MERL_CVSP_D0165
+        if(refOffset < min_relative_pos || refOffset > max_relative_pos)
+          xFrac = 0;
+        refOffset = Clip3(min_relative_pos, max_relative_pos, refOffset);
+#endif
         Int absX  = posX + refOffset;
 

branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.h

@@ -84 +84 @@
 #if MERL_VSP_C0152
   Int*   m_pDepth; ///< Local variable, to store a depth block, just to prevent allocate memory every time
+
+#if MERL_CVSP_D0165
+  static Int m_iRangeLuma[12];
+  static Int m_iRangeChroma[12];
+#endif
 #endif
 

branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TypeDef.h

@@ -206 +206 @@
 
 
-#define MERL_VSP_BLOCKSIZE_C0152             4 // JCT3V-C0152: VSP block size, supported values: 1, 2 and 4.
+#define MERL_VSP_BLOCKSIZE_C0152             1 // JCT3V-C0152: VSP block size, supported values: 1, 2 and 4.
+#if MERL_VSP_BLOCKSIZE_C0152 == 1
+#define MERL_CVSP_D0165                      1 // JCT3V-D0165: 1:enable CVSP; 0: disable CVSP.
+#endif
+
 #define VSP_MERGE_POS                        5 // JCT3V-C0152: fixed position of VSP candidate in merge list, supported values: 5.
                                                //MTK_DVPREFINE_BVSP_BUG_FIX               1

branches/HTM-6.2-dev2-MERL/source/Lib/TLibDecoder/TDecCu.cpp

@@ -1086 +1086 @@
   // reconstruct residual based on mask + DC residuals
   Pel apDCResiValues[2];
-  Pel apDCRecoValues[2];
+  //Pel apDCRecoValues[2];
   for( UInt ui = 0; ui < uiNumSegments; ui++ )
   {
@@ -1093 +1093 @@
     Pel   pRecoValue  = GetIdx2DepthValue( pPredIdx + pResiIdx );
     
-    apDCRecoValues[ui]  = pRecoValue;
+    //apDCRecoValues[ui]  = pRecoValue;
     apDCResiValues[ui]  = pRecoValue - apDCPredValues[ui];
   }