Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComRom.cpp

Timestamp:

8 Nov 2014, 21:07:36 (9 years ago)

Author:

tech

Message:

Merged 12.2-dev1-Hisilicon@1116.

File:

• branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComRom.cpp (modified) (3 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -362 +362 @@
 const UChar g_dmm1TabIdxBits[6] =
 { //2x2   4x4   8x8 16x16 32x32 64x64
+#if MTK_DMM_SIM_J0035 
+     0,    7,   10,   9,    9,   13 };
+#else
      0,    7,   10,   11,   11,   13 };
+#endif
 
 const UChar g_dmm3IntraTabIdxBits[6] =
@@ -763 +767 @@
     }
 
+#if MTK_DMM_SIM_J0035
+    for( Int iK = 0; iK < uiBlockSize; iK += (uiWidth>=16 ?2:1))
+    {
+      for( Int iL = 0; iL < uiBlockSize; iL += ((uiWidth>=16 && uiOri<4)?2:1) )
+      {
+        cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes, ((iL%2)==0 && (iK%2)==0) );
+        addWedgeletToList( cTempWedgelet, racWedgeList, racWedgeRefList );
+      }
+    }
+#else
     for( Int iK = 0; iK < uiBlockSize; iK++ )
     {
@@ -771 +785 @@
       }
     }
+#endif
   }