Changeset 242 in 3DVCSoftware for branches/HTM-5.1-dev1-Hisilicon/source/Lib

Timestamp:

31 Jan 2013, 01:11:02 (12 years ago)

Author:

hisilicon-htm

Message:

Bug fix for the integration of C0154

Location:

branches/HTM-5.1-dev1-Hisilicon/source/Lib

Files:

• TLibCommon/TComPrediction.cpp (modified) (3 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1919 +1919 @@
   UInt  uiWedgeStride   = pcWedgelet->getStride();
 
-#if HS_REFERENCE_SUBSAMPLE
+#if HS_REFERENCE_SUBSAMPLE_C0154
   Int subSamplePix;
   if ( pcWedgelet->getWidth() == 32 )
@@ -1933 +1933 @@
   if( bAbove )
   {
-#if HS_REFERENCE_SUBSAMPLE
+#if HS_REFERENCE_SUBSAMPLE_C0154
     for( Int k = 0; k < pcWedgelet->getWidth(); k+=subSamplePix )
 #else
@@ -1953 +1953 @@
   if( bLeft )
   {
-#if HS_REFERENCE_SUBSAMPLE
+#if HS_REFERENCE_SUBSAMPLE_C0154
     for( Int k = 0; k < pcWedgelet->getHeight(); k+=subSamplePix )
 #else

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibCommon/TypeDef.h

@@ -195 +195 @@
 #if RWTH_SDC_DLT_B0036
 #define Log2( n ) ( log((double)n) / log(2.0) )
+#define HS_REFERENCE_SUBSAMPLE_C0154      1
 #endif
 

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibDecoder/TDecCu.cpp

@@ -1375 +1375 @@
   Int iSumPix[2];
   memset(iSumPix, 0, sizeof(Int)*2);
-#if HS_REFERENCE_SUBSAMPLE
+#if HS_REFERENCE_SUBSAMPLE_C0154
   Int subSamplePix;
   if ( uiSize == 64 || uiSize == 32 )

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -8311 +8311 @@
   Int iSumPix[2];
   memset(iSumPix, 0, sizeof(Int)*2);
-#if HS_REFERENCE_SUBSAMPLE
+#if HS_REFERENCE_SUBSAMPLE_C0154
   Int subSamplePix;
   if ( uiSize == 64 || uiSize == 32 )