Changeset 416 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source


Ignore:
Timestamp:
18 May 2013, 16:21:18 (11 years ago)
Author:
mitsubishi-htm
Message:

-Update variable names.

Location:
branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon
Files:
3 edited

Legend:

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

    r412 r416  
    55225522{
    55235523  Bool isFound  = false;
    5524   RefPicList privateRefPicList = REF_PIC_LIST_0 ;
     5524  RefPicList privateRefPicList = REF_PIC_LIST_0;
    55255525
    55265526  refFrmIdx = 0;
     
    56485648            Int currPoc = getSlice()->getPOC();
    56495649            picDepth = getSlice()->getDepthRefPic(iTargetViewIdx, currPoc);
    5650             assert(picDepth!=NULL);
     5650            assert(picDepth != NULL);
    56515651#else
    56525652            picDepth = getSlice()->getRefPicBaseDepth();
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp

    r412 r416  
    882882    // Find the other interview reference in order to do VSP
    883883    RefPicList otherRefPicList = privateRefPicList == REF_PIC_LIST_0 ? REF_PIC_LIST_1 : REF_PIC_LIST_0;
    884     Bool IsFound = false;
    885     for (Int irefIdx = 0; irefIdx <pcCU->getSlice()->getNumRefIdx(otherRefPicList); irefIdx ++ )
    886     {
    887       Int refViewIdx  = pcCU->getSlice()->getRefViewId( otherRefPicList, irefIdx);
     884    Bool isFound = false;
     885    for (Int iRefIdx = 0; iRefIdx <pcCU->getSlice()->getNumRefIdx(otherRefPicList); iRefIdx ++ )
     886    {
     887      Int refViewIdx  = pcCU->getSlice()->getRefViewId( otherRefPicList, iRefIdx);
    888888      if ( (refViewIdx != pcCU->getSlice()->getViewId()) && (refViewIdx != viewId ) )
    889889      {
    890         refPic = pcCU->getSlice()->getRefPic(otherRefPicList, irefIdx);
    891         IsFound = true;
     890        refPic = pcCU->getSlice()->getRefPic(otherRefPicList, iRefIdx);
     891        isFound = true;
    892892        break;
    893893      }
    894894    }
    895895
    896     if (IsFound == false)
    897     {
    898       Int  refIdxtxt = -1-pcCU->getCUMvField( privateRefPicList )->getRefIdx( uiPartAddr );
    899       assert(refIdxtxt >= 0);
    900       refPic = pcCU->getSlice()->getRefPic(privateRefPicList, refIdxtxt);
    901     }
    902     assert(IsFound);
     896    if (isFound == false)
     897    {
     898      Int  refIdxTxt = -1-pcCU->getCUMvField( privateRefPicList )->getRefIdx( uiPartAddr );
     899      assert(refIdxTxt >= 0);
     900      refPic = pcCU->getSlice()->getRefPic(privateRefPicList, refIdxTxt);
     901    }
     902    assert(isFound);
    903903  }
    904904  assert(refPic != NULL);
     
    951951  if(
    952952#if MERL_VSP_C0152       
    953        vspIdx == 0 &&   // TODO: Maybe logically redundant, but easier to read
     953       vspIdx == 0 &&   // TODO: Maybe logically redundant, but easier to read. Need verification before being removed
    954954#endif
    955955       pcCU->getSlice()->getSPS()->isDepth() == false
     
    11691169  if (pcCU->getVSPIndex(uiPartAddr) != 0) // is VSP
    11701170  {
    1171     Int Bi_VSP_Avail = 0;
     1171    Int biVSPAvail = 0;
    11721172    //test whether VSP is Bi or Uni
    11731173    //Step1. Get derived DV view id
     
    11891189      (pcCU->getSlice()->getNumRefIdx(REF_PIC_LIST_0) > 0 ? 1 : 2));
    11901190    //Step 3.  Check the availability of Bi VSP by checking the interview reference availability in the other reference list
    1191     if(iInterDir==3)
    1192     {
    1193       for (Int irefIdx = 0; irefIdx <pcCU->getSlice()->getNumRefIdx(otherRefPicList); irefIdx ++ )
    1194       {
    1195         Int refViewIdx  = pcCU->getSlice()->getRefViewId( otherRefPicList, irefIdx);
     1191    if(iInterDir == 3)
     1192    {
     1193      for (Int iRefIdx = 0; iRefIdx <pcCU->getSlice()->getNumRefIdx(otherRefPicList); iRefIdx ++ )
     1194      {
     1195        Int refViewIdx  = pcCU->getSlice()->getRefViewId( otherRefPicList, iRefIdx);
    11961196        if ( (refViewIdx != pcCU->getSlice()->getViewId()) && (refViewIdx != viewId ) )
    11971197        {
    1198           Bi_VSP_Avail = 1;
     1198          biVSPAvail = 1;
    11991199          break;
    12001200        }
     
    12021202    }
    12031203    //Step 4. Update the Bi VSP prediction direction
    1204     if ( iInterDir == 3 && Bi_VSP_Avail == 1)
     1204    if ( iInterDir == 3 && biVSPAvail == 1)
    12051205    {
    12061206      biDecision   = 1;
     
    12421242
    12431243#if !MERL_Bi_VSP_D0166 //both lists should go
    1244       if ( iRefList== REF_PIC_LIST_1 && iRefIdx[iRefList] < 0 ) // iRefIdx[iRefList] ==NOT_VALID
     1244      if ( iRefList == REF_PIC_LIST_1 && iRefIdx[iRefList] < 0 ) // iRefIdx[iRefList] ==NOT_VALID
    12451245      {
    12461246        continue;
     
    12681268
    12691269#if MERL_Bi_VSP_D0166
    1270     if(biDecision==1)
     1270    if(biDecision == 1)
    12711271#else
    12721272    if( pcCU->getCUMvField( REF_PIC_LIST_0 )->getRefIdx( uiPartAddr ) >= 0 && pcCU->getCUMvField( REF_PIC_LIST_1 )->getRefIdx( uiPartAddr ) >= 0 )
     
    16811681// refPic: Ref picture. Full picture, with padding
    16821682// posX, posY:     PU position, texture
    1683 // size_x, size_y: PU size
     1683// sizeX, sizeY: PU size
    16841684// partAddr: z-order index
    16851685// mv: disparity vector. derived from neighboring blocks
    16861686//
    16871687// Output: dstPic, PU predictor 64x64
    1688 Void TComPrediction::xPredInterLumaBlkFromDM( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv* mv, UInt partAddr,Int posX, Int posY, Int size_x, Int size_y, Bool isDepth, TComYuv *&dstPic
     1688Void TComPrediction::xPredInterLumaBlkFromDM( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv* mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, TComYuv *&dstPic
    16891689#if MERL_Bi_VSP_D0166
    16901690                                            , Bool bi
     
    17221722  Int dstStride = dstPic->getStride();
    17231723  Int depStride =  pPicBaseDepth->getStride();
    1724   Int depthPosX = Clip3(0,   widthLuma - size_x,  (posX/nTxtPerDepthX) + (mv->getHor()>>2));
    1725   Int depthPosY = Clip3(0,   heightLuma- size_y,  (posY/nTxtPerDepthY) + (mv->getVer()>>2));
     1724  Int depthPosX = Clip3(0,   widthLuma - sizeX,  (posX/nTxtPerDepthX) + (mv->getHor()>>2));
     1725  Int depthPosY = Clip3(0,   heightLuma- sizeY,  (posY/nTxtPerDepthY) + (mv->getVer()>>2));
    17261726  Pel *ref    = refPic->getLumaAddr() + posX + posY * refStride;
    17271727  Pel *dst    = dstPic->getLumaAddr(partAddr);
     
    17301730#if MERL_VSP_BLOCKSIZE_C0152 != 1
    17311731#if MERL_VSP_BLOCKSIZE_C0152 == 2
    1732   Int  dW = size_x>>1;
    1733   Int  dH = size_y>>1;
     1732  Int  dW = sizeX>>1;
     1733  Int  dH = sizeY>>1;
    17341734#endif
    17351735#if MERL_VSP_BLOCKSIZE_C0152 == 4
    1736   Int  dW = size_x>>2;
    1737   Int  dH = size_y>>2;
     1736  Int  dW = sizeX>>2;
     1737  Int  dH = sizeY>>2;
    17381738#endif
    17391739  {
     
    18081808  //get LUT based horizontal reference range
    18091809  Int range = 0;
    1810   if( size_x == 4 && size_y == 8 )
     1810  if( sizeX == 4 && sizeY == 8 )
    18111811    range = m_iRangeLuma[0];
    1812   else if( size_x == 8 && size_y == 4 )
     1812  else if( sizeX == 8 && sizeY == 4 )
    18131813    range = m_iRangeLuma[1];
    1814   else if( size_x == 8 && size_y == 8 )
     1814  else if( sizeX == 8 && sizeY == 8 )
    18151815    range = m_iRangeLuma[2];
    1816   else if( size_x == 8 && size_y == 16 )
     1816  else if( sizeX == 8 && sizeY == 16 )
    18171817    range = m_iRangeLuma[3];
    1818   else if( size_x == 16 && size_y == 8 )
     1818  else if( sizeX == 16 && sizeY == 8 )
    18191819    range = m_iRangeLuma[4];
    1820   else if( size_x == 16 && size_y == 16 )
     1820  else if( sizeX == 16 && sizeY == 16 )
    18211821    range = m_iRangeLuma[5];
    1822   else if( size_x == 16 && size_y == 32 )
     1822  else if( sizeX == 16 && sizeY == 32 )
    18231823    range = m_iRangeLuma[6];
    1824   else if( size_x == 32 && size_y == 16 )
     1824  else if( sizeX == 32 && sizeY == 16 )
    18251825    range = m_iRangeLuma[7];
    1826   else if( size_x == 32 && size_y == 32 )
     1826  else if( sizeX == 32 && sizeY == 32 )
    18271827    range = m_iRangeLuma[8];
    1828   else if( size_x == 32 && size_y == 64 )
     1828  else if( sizeX == 32 && sizeY == 64 )
    18291829    range = m_iRangeLuma[9];
    1830   else if( size_x == 64 && size_y == 32 )
     1830  else if( sizeX == 64 && sizeY == 32 )
    18311831    range = m_iRangeLuma[10];
    1832   else if( size_x == 64 && size_y == 64 )
     1832  else if( sizeX == 64 && sizeY == 64 )
    18331833    range = m_iRangeLuma[11];
    18341834  else
     
    18361836
    18371837  // The minimum depth value
    1838   Int min_relative_pos = 5000;
    1839   Int max_relative_pos = -5000;
    1840 
    1841   Pel* depth_temp, *depth_initial=depth;
    1842   for (Int yTxt =0; yTxt<size_y; yTxt++)
    1843   {
    1844     for (Int xTxt =0; xTxt<size_x; xTxt++)
     1838  Int minRelativePos = 5000;
     1839  Int maxRelativePos = -5000;
     1840
     1841  Pel* depthTemp, *depthInitial=depth;
     1842  for (Int yTxt =0; yTxt<sizeY; yTxt++)
     1843  {
     1844    for (Int xTxt =0; xTxt<sizeX; xTxt++)
    18451845    {
    18461846      if (depthPosX+xTxt < widthDepth)
    1847         depth_temp = depth_initial + xTxt;
     1847        depthTemp = depthInitial + xTxt;
    18481848      else
    1849         depth_temp = depth_initial + (widthDepth - depthPosX - 1);
    1850 
    1851       Int disparity = pShiftLUT[ *depth_temp ] << iShiftPrec;
    1852       Int disparity_int = disparity >> 2;
     1849        depthTemp = depthInitial + (widthDepth - depthPosX - 1);
     1850
     1851      Int disparity = pShiftLUT[ *depthTemp ] << iShiftPrec;
     1852      Int disparityInt = disparity >> 2;
    18531853
    18541854      if( disparity <= 0)
    18551855      {
    1856         if (min_relative_pos > disparity_int+xTxt)
    1857             min_relative_pos = disparity_int+xTxt;
     1856        if (minRelativePos > disparityInt+xTxt)
     1857            minRelativePos = disparityInt+xTxt;
    18581858      }
    18591859      else
    18601860      {
    1861         if (max_relative_pos < disparity_int+xTxt)
    1862             max_relative_pos = disparity_int+xTxt;
     1861        if (maxRelativePos < disparityInt+xTxt)
     1862            maxRelativePos = disparityInt+xTxt;
    18631863      }
    18641864    }
    18651865    if (depthPosY+yTxt < heightDepth)
    1866       depth_initial = depth_initial + depStride;
     1866      depthInitial = depthInitial + depStride;
    18671867  }
    18681868
    18691869  Int disparity_tmp = pShiftLUT[ *depth ] << iShiftPrec;
    18701870  if (disparity_tmp <= 0)
    1871     max_relative_pos = min_relative_pos + range -1 ;
     1871    maxRelativePos = minRelativePos + range -1 ;
    18721872  else
    1873     min_relative_pos = max_relative_pos - range +1 ;
     1873    minRelativePos = maxRelativePos - range +1 ;
    18741874#endif
    18751875#endif
     
    18781878  Int yDepth = 0;
    18791879#endif
    1880   for ( Int yTxt = 0; yTxt < size_y; yTxt += nTxtPerDepthY )
    1881   {
    1882     for ( Int xTxt = 0, xDepth = 0; xTxt < size_x; xTxt += nTxtPerDepthX, xDepth++ )
    1883     {
    1884       Pel rep_depth = 0; // to store the depth value used for warping
     1880  for ( Int yTxt = 0; yTxt < sizeY; yTxt += nTxtPerDepthY )
     1881  {
     1882    for ( Int xTxt = 0, xDepth = 0; xTxt < sizeX; xTxt += nTxtPerDepthX, xDepth++ )
     1883    {
     1884      Pel repDepth = 0; // to store the depth value used for warping
    18851885#if MERL_VSP_BLOCKSIZE_C0152 == 1
    1886       rep_depth = depth[xDepth];
     1886      repDepth = depth[xDepth];
    18871887#endif
    18881888#if MERL_VSP_BLOCKSIZE_C0152 == 2
    1889       rep_depth = m_pDepth[(xTxt>>1) + (yTxt>>1)*dW];
     1889      repDepth = m_pDepth[(xTxt>>1) + (yTxt>>1)*dW];
    18901890#endif
    18911891#if MERL_VSP_BLOCKSIZE_C0152 == 4
    1892       rep_depth = m_pDepth[(xTxt>>2) + (yTxt>>2)*dW];
    1893 #endif
    1894 
    1895       assert( rep_depth >= 0 && rep_depth <= 255 );
    1896       Int disparity = pShiftLUT[ rep_depth ] << iShiftPrec;
     1892      repDepth = m_pDepth[(xTxt>>2) + (yTxt>>2)*dW];
     1893#endif
     1894
     1895      assert( repDepth >= 0 && repDepth <= 255 );
     1896      Int disparity = pShiftLUT[ repDepth ] << iShiftPrec;
    18971897      Int refOffset = xTxt + (disparity >> 2);
    18981898      Int xFrac = disparity & 0x3;
    18991899#if MERL_CVSP_D0165
    1900       if(refOffset<min_relative_pos || refOffset>max_relative_pos)
     1900      if(refOffset<minRelativePos || refOffset>maxRelativePos)
    19011901        xFrac = 0;
    1902       refOffset = Clip3(min_relative_pos, max_relative_pos, refOffset);
     1902      refOffset = Clip3(minRelativePos, maxRelativePos, refOffset);
    19031903#endif
    19041904      Int absX  = posX + refOffset;
     
    19291929}
    19301930
    1931 Void TComPrediction::xPredInterChromaBlkFromDM ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv*mv, UInt partAddr, Int posX, Int posY, Int size_x, Int size_y, Bool isDepth, TComYuv *&dstPic
     1931Void TComPrediction::xPredInterChromaBlkFromDM ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv*mv, UInt partAddr, Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, TComYuv *&dstPic
    19321932#if MERL_Bi_VSP_D0166
    19331933                                               , Bool bi
     
    19741974    depthPosX = posX * nDepthPerTxtX + (mv->getHor()>>2);        //mv denotes the disparity for VSP
    19751975  }
    1976   depthPosX = Clip3(0, widthDepth - (size_x<<1), depthPosX);
     1976  depthPosX = Clip3(0, widthDepth - (sizeX<<1), depthPosX);
    19771977  if ( heightChroma > heightDepth )
    19781978  {
     
    19871987    depthPosY = posY * nDepthPerTxtY + (mv->getVer()>>2);     //mv denotes the disparity for VSP
    19881988  }
    1989   depthPosY = Clip3(0, heightDepth - (size_y<<1), depthPosY);
     1989  depthPosY = Clip3(0, heightDepth - (sizeY<<1), depthPosY);
    19901990
    19911991  Pel *refCb  = refPic->getCbAddr() + posX + posY * refStride;
     
    20082008  {
    20092009#if MERL_VSP_BLOCKSIZE_C0152 == 1
    2010   Int  dW = size_x;
    2011   Int  dH = size_y;
     2010  Int  dW = sizeX;
     2011  Int  dH = sizeY;
    20122012  Int  sW = 2; // search window size
    20132013  Int  sH = 2;
    20142014#endif
    20152015#if MERL_VSP_BLOCKSIZE_C0152 == 2
    2016   Int  dW = size_x;
    2017   Int  dH = size_y;
     2016  Int  dW = sizeX;
     2017  Int  dH = sizeY;
    20182018  Int  sW = 2; // search window size
    20192019  Int  sH = 2;
    20202020#endif
    20212021#if MERL_VSP_BLOCKSIZE_C0152 == 4
    2022   Int  dW = size_x>>1;
    2023   Int  dH = size_y>>1;
     2022  Int  dW = sizeX>>1;
     2023  Int  dH = sizeY>>1;
    20242024  Int  sW = 4; // search window size
    20252025  Int  sH = 4;
     
    20902090  //get LUT based horizontal reference range
    20912091  Int range=0;
    2092   if( size_x == 2 && size_y == 4 )
     2092  if( sizeX == 2 && sizeY == 4 )
    20932093    range = m_iRangeChroma[0];
    2094   else if( size_x == 4 && size_y == 2 )
     2094  else if( sizeX == 4 && sizeY == 2 )
    20952095    range = m_iRangeChroma[1];
    2096   else if( size_x == 4 && size_y == 4 )
     2096  else if( sizeX == 4 && sizeY == 4 )
    20972097    range = m_iRangeChroma[2];
    2098   else if( size_x == 4 && size_y == 8 )
     2098  else if( sizeX == 4 && sizeY == 8 )
    20992099    range = m_iRangeChroma[3];
    2100   else if( size_x == 8 && size_y == 4 )
     2100  else if( sizeX == 8 && sizeY == 4 )
    21012101    range = m_iRangeChroma[4];
    2102   else if( size_x == 8 && size_y == 8 )
     2102  else if( sizeX == 8 && sizeY == 8 )
    21032103    range = m_iRangeChroma[5];
    2104   else if( size_x == 8 && size_y == 16 )
     2104  else if( sizeX == 8 && sizeY == 16 )
    21052105    range = m_iRangeChroma[6];
    2106   else if( size_x == 16 && size_y == 8 )
     2106  else if( sizeX == 16 && sizeY == 8 )
    21072107    range = m_iRangeChroma[7];
    2108   else if( size_x == 16 && size_y == 16 )
     2108  else if( sizeX == 16 && sizeY == 16 )
    21092109    range = m_iRangeChroma[8];
    2110   else if( size_x == 16 && size_y == 32 )
     2110  else if( sizeX == 16 && sizeY == 32 )
    21112111    range = m_iRangeChroma[9];
    2112   else if( size_x == 32 && size_y == 16 )
     2112  else if( sizeX == 32 && sizeY == 16 )
    21132113    range = m_iRangeChroma[10];
    2114   else if( size_x == 32 && size_y == 32 )
     2114  else if( sizeX == 32 && sizeY == 32 )
    21152115    range = m_iRangeChroma[11];
    21162116  else
     
    21182118 
    21192119  // The minimum depth value
    2120   Int min_relative_pos = 5000;
    2121   Int max_relative_pos = -5000;
    2122 
    2123   Int depth_tmp;
    2124   for (Int yTxt=0; yTxt<size_y; yTxt++)
    2125   {
    2126     for (Int xTxt=0; xTxt<size_x; xTxt++)
    2127     {
    2128       depth_tmp = m_pDepth[xTxt+yTxt*dW];
    2129       Int disparity = pShiftLUT[ depth_tmp ] << iShiftPrec;
    2130       Int disparity_int = disparity >> 3;//in chroma resolution
    2131 
    2132       if (disparity_int < 0)
    2133       {
    2134         if (min_relative_pos > disparity_int+xTxt)
    2135             min_relative_pos = disparity_int+xTxt;
     2120  Int minRelativePos = 5000;
     2121  Int maxRelativePos = -5000;
     2122
     2123  Int depthTmp;
     2124  for (Int yTxt=0; yTxt<sizeY; yTxt++)
     2125  {
     2126    for (Int xTxt=0; xTxt<sizeX; xTxt++)
     2127    {
     2128      depthTmp = m_pDepth[xTxt+yTxt*dW];
     2129      Int disparity = pShiftLUT[ depthTmp ] << iShiftPrec;
     2130      Int disparityInt = disparity >> 3;//in chroma resolution
     2131
     2132      if (disparityInt < 0)
     2133      {
     2134        if (minRelativePos > disparityInt+xTxt)
     2135            minRelativePos = disparityInt+xTxt;
    21362136      }
    21372137      else
    21382138      {
    2139         if (max_relative_pos < disparity_int+xTxt)
    2140             max_relative_pos = disparity_int+xTxt;
    2141       }
    2142     }
    2143   }
    2144 
    2145   depth_tmp = m_pDepth[0];
    2146   Int disparity_tmp = pShiftLUT[ depth_tmp ] << iShiftPrec;
     2139        if (maxRelativePos < disparityInt+xTxt)
     2140            maxRelativePos = disparityInt+xTxt;
     2141      }
     2142    }
     2143  }
     2144
     2145  depthTmp = m_pDepth[0];
     2146  Int disparity_tmp = pShiftLUT[ depthTmp ] << iShiftPrec;
    21472147  if ( disparity_tmp < 0 )
    2148     max_relative_pos = min_relative_pos + range - 1;
     2148    maxRelativePos = minRelativePos + range - 1;
    21492149  else
    2150     min_relative_pos = max_relative_pos - range + 1;
    2151 
    2152 #endif
    2153 #endif
    2154 
    2155     // (size_x, size_y) is Chroma block size
    2156     for ( Int yTxt = 0, yDepth = 0; yTxt < size_y; yTxt += nTxtPerDepthY, yDepth += nDepthPerTxtY )
    2157     {
    2158       for ( Int xTxt = 0, xDepth = 0; xTxt < size_x; xTxt += nTxtPerDepthX, xDepth += nDepthPerTxtX )
    2159       {
    2160         Pel rep_depth = 0; // to store the depth value used for warping
     2150    minRelativePos = maxRelativePos - range + 1;
     2151
     2152#endif
     2153#endif
     2154
     2155    // (sizeX, sizeY) is Chroma block size
     2156    for ( Int yTxt = 0, yDepth = 0; yTxt < sizeY; yTxt += nTxtPerDepthY, yDepth += nDepthPerTxtY )
     2157    {
     2158      for ( Int xTxt = 0, xDepth = 0; xTxt < sizeX; xTxt += nTxtPerDepthX, xDepth += nDepthPerTxtX )
     2159      {
     2160        Pel repDepth = 0; // to store the depth value used for warping
    21612161#if MERL_VSP_BLOCKSIZE_C0152 == 1
    2162         rep_depth = m_pDepth[(xTxt) + (yTxt)*dW];
     2162        repDepth = m_pDepth[(xTxt) + (yTxt)*dW];
    21632163#endif
    21642164#if MERL_VSP_BLOCKSIZE_C0152 == 2
    2165         rep_depth = m_pDepth[(xTxt) + (yTxt)*dW];
     2165        repDepth = m_pDepth[(xTxt) + (yTxt)*dW];
    21662166#endif
    21672167#if MERL_VSP_BLOCKSIZE_C0152 == 4
    2168         rep_depth = m_pDepth[(xTxt>>1) + (yTxt>>1)*dW];
     2168        repDepth = m_pDepth[(xTxt>>1) + (yTxt>>1)*dW];
    21692169#endif
    21702170
    21712171      // calculate the offset in the reference picture
    2172         Int disparity = pShiftLUT[ rep_depth ] << iShiftPrec;
     2172        Int disparity = pShiftLUT[ repDepth ] << iShiftPrec;
    21732173        Int refOffset = xTxt + (disparity >> 3); // in integer pixel in chroma image
    21742174        Int xFrac = disparity & 0x7;
    21752175#if MERL_CVSP_D0165
    2176         if(refOffset < min_relative_pos || refOffset > max_relative_pos)
     2176        if(refOffset < minRelativePos || refOffset > maxRelativePos)
    21772177          xFrac = 0;
    2178         refOffset = Clip3(min_relative_pos, max_relative_pos, refOffset);
     2178        refOffset = Clip3(minRelativePos, maxRelativePos, refOffset);
    21792179#endif
    21802180        Int absX  = posX + refOffset;
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.h

    r412 r416  
    156156#if MERL_Bi_VSP_D0166
    157157  TComPic*  xGetVspRefTxt(TComDataCU* pcCU, UInt uiPartAddr, RefPicList eRefPicList);
    158   Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int size_x, Int size_y, Bool isDepth,
     158  Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth,
    159159    TComYuv *&dstPic, Bool bi);
    160   Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int size_x, Int size_y, Bool isDepth,
     160  Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth,
    161161    TComYuv *&dstPic, Bool bi);
    162162#else
    163   Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int size_x, Int size_y, Bool isDepth,
     163  Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth,
    164164                                  TComYuv *&dstPic );
    165   Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int size_x, Int size_y, Bool isDepth,
     165  Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth,
    166166                                  TComYuv *&dstPic );
    167167#endif
Note: See TracChangeset for help on using the changeset viewer.