Changeset 422 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

20 May 2013, 01:51:15 (12 years ago)

Author:

mitsubishi-htm

Message:

-macro updates.

File:

• branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp (modified) (6 diffs)

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

@@ -50 +50 @@
 #endif
 
+#if MERL_General_Fix
 #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
 #endif
@@ -1864 +1866 @@
 #endif
   
+#if MERL_General_Fix
 #if MERL_VSP_BLOCKSIZE_C0152 == 1
 #if MERL_CVSP_D0165
@@ -1934 +1937 @@
 #endif
 #endif
+#endif
 
 #if MERL_VSP_BLOCKSIZE_C0152 != 1
@@ -2062 +2066 @@
   Int dstStrideBlock = dstStride * nTxtPerDepthY;
   Int depStrideBlock = depStride * nDepthPerTxtY;
+
+#if !MERL_Bi_VSP_D0166
+  if (isDepth)
+  {
+     // DT: Since the call for this function is redundant, ..
+     for (Int y = 0; y < sizeY; y++)
+     {
+       for (Int x = 0; x < sizeX; x++)
+       {
+         dstCb[x] = 128;
+         dstCr[x] = 128;
+       }
+       dstCb += dstStride;
+       dstCr += dstStride;
+     }
+     return;
+  }
+#endif
 
   if ( widthChroma > widthDepth ) // We assume
@@ -2150 +2172 @@
 
 
+#if MERL_General_Fix
 #if MERL_VSP_BLOCKSIZE_C0152 == 1
 #if MERL_CVSP_D0165
@@ -2216 +2239 @@
 #endif
 #endif
+#endif
 
     // (sizeX, sizeY) is Chroma block size