Changeset 939 in 3DVCSoftware for branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

22 Apr 2014, 17:08:54 (10 years ago)

Author:

tech

Message:

Merged 10.2-dev3-HiSilicon@928.

File:

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

branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComPrediction.cpp

@@ -500 +500 @@
   Pel* pDst = piPred;
   xAssignBiSegDCs( pDst, uiStride, biSegPattern, patternStride, segDC1, segDC2 );
+#if HS_DMM_SDC_PREDICTOR_UNIFY_H0108
+  pcCU->setDmmPredictor(segDC1, 0);
+  pcCU->setDmmPredictor(segDC2, 1);
+#endif
 
 #if H_3D_DIM_DMM
@@ -2324 +2328 @@
   if (orgDC == false)
   {
+#if !HS_DMM_SDC_PREDICTOR_UNIFY_H0108
     if ( getDimType(uiIntraMode) == DMM1_IDX )
     {
@@ -2369 +2374 @@
     }
     else
+#endif
     {
       Pel* pLeftTop = pOrig;