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

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/TLibDecoder/TDecCu.cpp (modified) (6 diffs)

branches/HTM-9.3-dev3-Hisilicon/source/Lib/TLibDecoder/TDecCu.cpp

@@ -922 +922 @@
   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
@@ -1012 +1018 @@
 #endif
 #endif
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+  TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
+#endif
   //===== get prediction signal =====
 #if H_3D_DIM
@@ -1021 +1030 @@
 #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
@@ -1045 +1062 @@
     }
     uiAbsPartIdx += ( (uiWidth * uiWidth) >> 4 );
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+    dmm4Segmentation->destroy(); delete dmm4Segmentation;
+#endif
   }
   uiAbsPartIdx = 0;
@@ -1080 +1100 @@
   {
     uiNumSegments = 2;
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+    pbMask  = dmm4SegmentationOrg->getPattern();
+    uiMaskStride = dmm4SegmentationOrg->getStride();
+#else
     pbMask  = dmm4Segmentation->getPattern();
     uiMaskStride = dmm4Segmentation->getStride();
+#endif
   }
 #endif
@@ -1146 +1171 @@
   }
 #if QC_GENERIC_SDC_G0122
+#if HS_TSINGHUA_SDC_SPLIT_G0111
+  dmm4SegmentationOrg->destroy(); delete dmm4SegmentationOrg;
+#else
   dmm4Segmentation->destroy(); delete dmm4Segmentation;
+#endif
 #endif
 }