Changeset 179 in 3DVCSoftware for branches/HTM-4.1-dev2-RWTH/source

Timestamp:

12 Nov 2012, 12:20:21 (12 years ago)

Author:

rwth

Message:

• bug fix of B0036 implementation

Location:

branches/HTM-4.1-dev2-RWTH/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecCu.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-4.1-dev2-RWTH/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1446 +1446 @@
   UInt uiMaxDepthValue = g_uiIBDI_MAX;
   
-  Bool abValidDepths[uiMaxDepthValue+1];
+  Bool abValidDepths[256];
   
   depthVideoFile->open( m_pchDepthInputFileList[iViewIdx], false, m_uiInputBitDepth, m_uiInternalBitDepth );  // read  mode

branches/HTM-4.1-dev2-RWTH/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/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++)