Changeset 183 in 3DVCSoftware for branches/HTM-4.1-dev2-RWTH-Fix/source/Lib

Timestamp:

14 Nov 2012, 18:24:30 (12 years ago)

Author:

rwth

Message:

• added bug fixes

Location:

branches/HTM-4.1-dev2-RWTH-Fix/source/Lib

Files:

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

branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibCommon/TComSlice.cpp

@@ -1591 +1591 @@
   {
     m_uiNumDepthmapValues = uiMaxDepthValue+1;
-    m_uiBitsPerDepthValue = (UInt)ceil(log2f(m_uiNumDepthmapValues));
+    m_uiBitsPerDepthValue = (UInt)ceil(Log2(m_uiNumDepthmapValues));
     
     m_uiDepthValue2Idx    = (UInt*) xMalloc(UInt, m_uiNumDepthmapValues);

branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibCommon/TypeDef.h

@@ -128 +128 @@
 #endif
 
-#define RWTH_SDC_DLT_B0036                0   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
+#define RWTH_SDC_DLT_B0036                1   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
 #if RWTH_SDC_DLT_B0036
 #define Log2( n ) ( log((double)n) / log(2.0) )

branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibDecoder/TDecCu.cpp

@@ -1013 +1013 @@
   UInt uiMaskStride = 0;
   
-  //if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
-  if( 0 )
+  if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
   {
     Int uiTabIdx = (uiLumaPredMode == DMM_WEDGE_FULL_IDX)?pcCU->getWedgeFullTabIdx(uiAbsPartIdx):pcCU->getWedgePredDirTabIdx(uiAbsPartIdx);
@@ -1356 +1355 @@
 Void TDecCu::xAnalyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride )
 {
-  Int iSumDepth[uiNumSegments];
-  memset(iSumDepth, 0, sizeof(Int)*uiNumSegments);
-  Int iSumPix[uiNumSegments];
-  memset(iSumPix, 0, sizeof(Int)*uiNumSegments);
+  Int iSumDepth[2];
+  memset(iSumDepth, 0, sizeof(Int)*2);
+  Int iSumPix[2];
+  memset(iSumPix, 0, sizeof(Int)*2);
   
   for (Int y=0; y<uiSize; y++)

branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1646 +1646 @@
   UInt uiMaskStride = 0;
   
-  //if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
-  if( 0 )
+  if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
   {
     Int uiTabIdx = (uiLumaPredMode == DMM_WEDGE_FULL_IDX)?pcCU->getWedgeFullTabIdx(uiAbsPartIdx):pcCU->getWedgePredDirTabIdx(uiAbsPartIdx);
@@ -8071 +8070 @@
 Void TEncSearch::xAnalyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride )
 {
-  Int iSumDepth[uiNumSegments];
-  memset(iSumDepth, 0, sizeof(Int)*uiNumSegments);
-  Int iSumPix[uiNumSegments];
-  memset(iSumPix, 0, sizeof(Int)*uiNumSegments);
+  Int iSumDepth[2];
+  memset(iSumDepth, 0, sizeof(Int)*2);
+  Int iSumPix[2];
+  memset(iSumPix, 0, sizeof(Int)*2);
   
   for (Int y=0; y<uiSize; y++)