Ignore:
Timestamp:
20 May 2013, 01:51:15 (11 years ago)
Author:
mitsubishi-htm
Message:

-macro updates.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp

    r420 r422  
    5050#endif
    5151
     52#if MERL_General_Fix
    5253#if MERL_VSP_C0152
    5354#if MERL_CVSP_D0165
    5455Int TComPrediction::m_iRangeLuma[12]   = {14, 34, 21, 15, 36, 26, 21, 49, 41, 36, 80, 72};
    5556Int TComPrediction::m_iRangeChroma[12] = { 2,  8,  5,  4, 11,  9,  8, 19, 17, 15, 34, 32};
     57#endif
    5658#endif
    5759#endif
     
    18641866#endif
    18651867 
     1868#if MERL_General_Fix
    18661869#if MERL_VSP_BLOCKSIZE_C0152 == 1
    18671870#if MERL_CVSP_D0165
     
    19341937#endif
    19351938#endif
     1939#endif
    19361940
    19371941#if MERL_VSP_BLOCKSIZE_C0152 != 1
     
    20622066  Int dstStrideBlock = dstStride * nTxtPerDepthY;
    20632067  Int depStrideBlock = depStride * nDepthPerTxtY;
     2068
     2069#if !MERL_Bi_VSP_D0166
     2070  if (isDepth)
     2071  {
     2072     // DT: Since the call for this function is redundant, ..
     2073     for (Int y = 0; y < sizeY; y++)
     2074     {
     2075       for (Int x = 0; x < sizeX; x++)
     2076       {
     2077         dstCb[x] = 128;
     2078         dstCr[x] = 128;
     2079       }
     2080       dstCb += dstStride;
     2081       dstCr += dstStride;
     2082     }
     2083     return;
     2084  }
     2085#endif
    20642086
    20652087  if ( widthChroma > widthDepth ) // We assume
     
    21502172
    21512173
     2174#if MERL_General_Fix
    21522175#if MERL_VSP_BLOCKSIZE_C0152 == 1
    21532176#if MERL_CVSP_D0165
     
    22162239#endif
    22172240#endif
     2241#endif
    22182242
    22192243    // (sizeX, sizeY) is Chroma block size
Note: See TracChangeset for help on using the changeset viewer.