Changeset 344 in 3DVCSoftware for branches/HTM-6.2-dev3-HHI

Timestamp:

29 Apr 2013, 13:17:05 (12 years ago)

Author:

hhi

Message:

JCT3V-D0036: Fix for aligning SW and spec - Wedgelet segmentation line generation without float (FIX_WEDGE_NOFLOAT_D0036).

Location:

branches/HTM-6.2-dev3-HHI

Files:

• CommonTestConditionsResults/6.2_vs_6.1.xls (deleted)
• source/Lib/TLibCommon/TComWedgelet.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-6.2-dev3-HHI/source/Lib/TLibCommon/TComWedgelet.cpp

@@ -783 +783 @@
   Int deltax = x1 - x0;
   Int deltay = abs(y1 - y0);
+#if FIX_WEDGE_NOFLOAT_D0036
+  Int error = 0;
+  Int deltaerr = (deltay<<1);
+#else
   double error = 0.0;
   double deltaerr = (double)deltay / (double)deltax;
+#endif
 
   Int ystep;
@@ -797 +802 @@
 
     error += deltaerr;
+#if FIX_WEDGE_NOFLOAT_D0036
+    if( error >= deltax )
+#else
     if( error >= 0.5)
+#endif    
     {
       y += ystep;
+#if FIX_WEDGE_NOFLOAT_D0036
+      error = error - (deltax<<1);
+#else
       error = error - 1.0;
+#endif    
     }
   }

branches/HTM-6.2-dev3-HHI/source/Lib/TLibCommon/TypeDef.h

@@ -59 +59 @@
                                               // HHI_DMM_DELTADC_Q1_C0034   JCT3V-C0034: no quantization and fast encoder search for DMM delta DC values
                                               // FIX_DMM_CTX_INIT_C0034 JCT3V-C0034 fix for wrong init type of DMM contexts (UChar instead of Short)
+#define FIX_WEDGE_NOFLOAT_D0036           1   // JCT3V-D0036: Fix for aligning SW and spec (Wedgelet segmentation line generation without float) 
 
 #define LGE_EDGE_INTRA_A0070              1   // JCT3V-A0070