Changeset 589 in 3DVCSoftware for branches/HTM-DEV-2.0-dev3-KWU

Timestamp:

22 Aug 2013, 13:02:16 (11 years ago)

Author:

kwu-htm

Message:

JCT3V-E0117, "CE6-related: Simplified DC calculation for SDC"

• a check list file (KWU_E0117.doc)
• a coding result file (E0117_vs_rev585.xls)

Location:

branches/HTM-DEV-2.0-dev3-KWU

Files:

• checklist/KWU_E0117.doc (added)
• codingresults/E0117_vs_rev585.xls (added)
• source/Lib/TLibCommon/TComPrediction.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/TComPrediction.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCu.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/HTM-DEV-2.0-dev3-KWU/source/Lib/TLibCommon/TComPrediction.cpp

@@ -2589 +2589 @@
 }
 #endif
+
 #if H_3D_DIM_SDC
-Void TComPrediction::analyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride )
+Void TComPrediction::analyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride
+#if KWU_SDC_SIMPLE_DC_E0117
+                                         ,UInt uiIntraMode
+                                         ,Bool orgDC
+#endif
+                                        )
 {
   Int iSumDepth[2];
@@ -2596 +2602 @@
   Int iSumPix[2];
   memset(iSumPix, 0, sizeof(Int)*2);
-  
+ 
+#if KWU_SDC_SIMPLE_DC_E0117
+  if (orgDC == false)
+  {
+    if ( getDimType(uiIntraMode) == DMM1_IDX )
+    {
+      UChar ucSegmentLT = pMask[0];
+      UChar ucSegmentRT = pMask[uiSize-1];
+      UChar ucSegmentLB = pMask[uiMaskStride * (uiSize-1)]; 
+      UChar ucSegmentRB = pMask[uiMaskStride * (uiSize-1) + (uiSize-1)]; 
+
+      rpSegMeans[ucSegmentLT] = pOrig[0];
+      rpSegMeans[ucSegmentRT] = pOrig[uiSize-1];
+      rpSegMeans[ucSegmentLB] = pOrig[uiStride * (uiSize-1) ];
+      rpSegMeans[ucSegmentRB] = pOrig[uiStride * (uiSize-1) + (uiSize-1) ];
+    }
+    else if (uiIntraMode == PLANAR_IDX)
+    {
+      Pel* pLeftTop = pOrig;
+      Pel* pRightTop = pOrig + (uiSize-1);
+      Pel* pLeftBottom = (pOrig+ (uiStride*(uiSize-1)));
+      Pel* pRightBottom = (pOrig+ (uiStride*(uiSize-1)) + (uiSize-1));
+
+      rpSegMeans[0] = (*pLeftTop + *pRightTop + *pLeftBottom + *pRightBottom + 2)>>2;
+    }
+    return;
+  }
+#endif
+
   Int subSamplePix;
   if ( uiSize == 64 || uiSize == 32 )

branches/HTM-DEV-2.0-dev3-KWU/source/Lib/TLibCommon/TComPrediction.h

@@ -174 +174 @@
   Void predIntraLumaDepth         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiIntraMode, Pel* piPred, UInt uiStride, Int iWidth, Int iHeight, Bool bFastEnc = false );
 #if H_3D_DIM_SDC
-  Void analyzeSegmentsSDC         ( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride );
+  Void analyzeSegmentsSDC         ( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride
+#if KWU_SDC_SIMPLE_DC_E0117
+                                    ,UInt uiIntraMode 
+                                    ,Bool orgDC=false
+#endif
+    );
 #endif
 #endif

branches/HTM-DEV-2.0-dev3-KWU/source/Lib/TLibCommon/TypeDef.h

@@ -180 +180 @@
                                               // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
                                               // LG_ZEROINTRADEPTHRESI_A0087
+#define KWU_SDC_SIMPLE_DC_E0117           1   // Simplified DC calculation for SDC
 #define SCU_HS_DMM4_REMOVE_DIV_E0242      1   // DMM4 Division Removal
 #define SCU_HS_FAST_DEPTH_INTRA_E0238     1   // Fast DMM and RBC Mode Selection

branches/HTM-DEV-2.0-dev3-KWU/source/Lib/TLibDecoder/TDecCu.cpp

@@ -794 +794 @@
   // get DC prediction for each segment
   Pel apDCPredValues[2];
+#if KWU_SDC_SIMPLE_DC_E0117
+  m_pcPrediction->analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode);
+#else
   m_pcPrediction->analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride);
+#endif
   
   // reconstruct residual based on mask + DC residuals

branches/HTM-DEV-2.0-dev3-KWU/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1891 +1891 @@
   // get DC prediction for each segment
   Pel apDCPredValues[2];
+#if KWU_SDC_SIMPLE_DC_E0117
+  analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode );
+#else
   analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride );
+#endif
   
   // get original DC for each segment
   Pel apDCOrigValues[2];
+#if KWU_SDC_SIMPLE_DC_E0117
+  analyzeSegmentsSDC(piOrg, uiStride, uiWidth, apDCOrigValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode, true );
+#else
   analyzeSegmentsSDC(piOrg, uiStride, uiWidth, apDCOrigValues, uiNumSegments, pbMask, uiMaskStride );
+#endif
   
   for( UInt uiSegment = 0; uiSegment < uiNumSegments; uiSegment++ )