Changeset 458 in 3DVCSoftware for branches/HTM-7.0-Fix/source/Lib/TLibCommon


Ignore:
Timestamp:
5 Jun 2013, 17:29:37 (11 years ago)
Author:
tech
Message:

Added NCKU_BUG_FIX related to disparity derivation.

Location:
branches/HTM-7.0-Fix/source/Lib/TLibCommon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-7.0-Fix/source/Lib/TLibCommon/TComPrediction.cpp

    r443 r458  
    19101910            if (depthPosX + (i<<2) + blocki < widthDepth - 1)
    19111911#endif
    1912               iX++;
     1912
     1913#if NCKU_BUG_FIX
     1914    iX = (MERL_VSP_BLOCKSIZE_C0152-1);
     1915#else
     1916    iX++;
     1917#endif
    19131918          }
    19141919#if MERL_VSP_BLOCKSIZE_C0152 == 2
     
    19171922          if (depthPosY + (j<<2) + blockj < heightDepth - 1)
    19181923#endif
    1919             depthTmp += depStride;
     1924#if NCKU_BUG_FIX
     1925    depthTmp += depStride * (MERL_VSP_BLOCKSIZE_C0152-1);
     1926#else
     1927    depthTmp += depStride;
     1928#endif
    19201929        }
    19211930        m_pDepth[i+j*dW] = maxV;
     
    22222231#endif
    22232232        Int maxV = 0;
     2233#if NCKU_BUG_FIX
     2234        for (Int blockj = 0; blockj < sH; blockj+=(sH-1))
     2235#else
    22242236        for (Int blockj = 0; blockj < sH; blockj++)
     2237#endif
    22252238        {
    22262239          Int iX = 0;
     2240#if NCKU_BUG_FIX
     2241          for (Int blocki = 0; blocki < sW; blocki+=(sW-1))
     2242#else
    22272243          for (Int blocki = 0; blocki < sW; blocki++)
     2244#endif
    22282245          {
    22292246            if (maxV < depthTmp[iX])
    22302247              maxV = depthTmp[iX];
    22312248            if (depthPosX + i*sW + blocki < widthDepth - 1)
    2232               iX++;
     2249#if NCKU_BUG_FIX
     2250                iX = (sW-1);
     2251#else
     2252                iX++;
     2253#endif
    22332254          }
    22342255          if (depthPosY + j*sH + blockj < heightDepth - 1)
    2235             depthTmp += depStride;
     2256#if NCKU_BUG_FIX
     2257                depthTmp += depStride * (sH-1);
     2258#else
     2259                depthTmp += depStride;
     2260#endif
    22362261        }
    22372262        m_pDepth[i+j*dW] = maxV;
  • branches/HTM-7.0-Fix/source/Lib/TLibCommon/TypeDef.h

    r443 r458  
    242242#endif                                               // MTK_DVPREFINE_BVSP_BUG_FIX               1
    243243#define MTK_DEPTH_TO_DISP_D0138              1 // JCT3V-D0138: Use max among four corners for DoNBDV and BVSP
     244#define NCKU_BUG_FIX                         1 // NCKU bug fix on MTK_DEPTH_TO_DISP_D0138
    244245
    245246#if MERL_General_Fix
Note: See TracChangeset for help on using the changeset viewer.