Changeset 813 in 3DVCSoftware for branches/HTM-9.3-dev3-Hisilicon/source/Lib/TLibEncoder

Timestamp:

29 Jan 2014, 13:20:27 (11 years ago)

Author:

hisilicon-htm

Message:

Harmonization between G0111 and G0122

File:

• branches/HTM-9.3-dev3-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (7 diffs)

branches/HTM-9.3-dev3-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1891 +1891 @@
   UInt    uiHeight          = pcCU     ->getHeight  ( 0 );
 #if QC_PKU_SDC_SPLIT_G0123
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+#if QC_GENERIC_SDC_G0122
+  TComWedgelet* dmm4SegmentationOrg = new TComWedgelet( uiWidth, uiHeight );
+#endif
+#else
 #if QC_GENERIC_SDC_G0122
   TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
+#endif
 #endif
 #endif
@@ -1911 +1917 @@
   if ( ( uiWidth >> pcCU->getSlice()->getSPS()->getQuadtreeTULog2MaxSize() ) > 1 )
   {
-    if ( getDimType( uiLumaPredMode ) == DMM4_IDX )
-    {
-      dmm4Segmentation->destroy(); delete dmm4Segmentation;
-      ruiDist = MAX_INT;
-      return;
-    }
     numParts = uiWidth * uiWidth >> ( 2 * pcCU->getSlice()->getSPS()->getQuadtreeTULog2MaxSize() );
     sdcDepth = g_aucConvertToBit[uiWidth] + 2 - pcCU->getSlice()->getSPS()->getQuadtreeTULog2MaxSize();
@@ -1977 +1977 @@
 #endif
 #endif
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+#if QC_GENERIC_SDC_G0122
+  TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
+#endif
+#endif
   //===== get prediction signal =====
 #if H_3D_DIM
@@ -1998 +2003 @@
 #endif
       );
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+    Bool* dmm4PatternSplit = dmm4Segmentation->getPattern();
+    Bool* dmm4PatternOrg = dmm4SegmentationOrg->getPattern();
+    for( UInt k = 0; k < (uiWidth*uiHeight); k++ ) 
+    { 
+      dmm4PatternOrg[k+(uiAbsPartIdx<<4)] = dmm4PatternSplit[k];
+    }
+#endif
   }
   else
@@ -2021 +2034 @@
     }
     uiAbsPartIdx += ( ( uiWidth * uiWidth ) >> 4 );
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+    dmm4Segmentation->destroy(); delete dmm4Segmentation;
+#endif
   }
   uiAbsPartIdx = 0;
@@ -2058 +2074 @@
   {
     uiNumSegments = 2;
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+    pbMask  = dmm4SegmentationOrg->getPattern();
+    uiMaskStride = dmm4SegmentationOrg->getStride();
+#else
     pbMask  = dmm4Segmentation->getPattern();
     uiMaskStride = dmm4Segmentation->getStride();
+#endif
   }
 #endif
@@ -2200 +2221 @@
     dRDCost = m_pcRdCost->calcRdCost( uiBits, ruiDist );
 #if QC_GENERIC_SDC_G0122
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+  dmm4SegmentationOrg->destroy(); delete dmm4SegmentationOrg;
+#else
   dmm4Segmentation->destroy(); delete dmm4Segmentation;
+#endif
 #endif
 }