Ignore:
Timestamp:
29 Jun 2015, 19:43:32 (10 years ago)
Author:
qualcomm
Message:
  1. enable ARP by NH_3D_ARP with simulation results included; 2. address Gerhard's comments on setBaseViewRefPicList; 3. align the software with the specification of checking the correct reference picture list proposed in JCT3V-F105
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev4-Qualcomm/source/Lib/TLibCommon/TComPrediction.cpp

    r1222 r1262  
    123123  m_cYuvPredTemp.destroy();
    124124
    125 #if H_3D_ARP
     125#if NH_3D_ARP
    126126  m_acYuvPredBase[0].destroy();
    127127  m_acYuvPredBase[1].destroy();
    … …  
    182182
    183183    m_cYuvPredTemp.create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC );
    184 #if H_3D_ARP
    185     m_acYuvPredBase[0] .create( g_uiMaxCUWidth, g_uiMaxCUHeight );
    186     m_acYuvPredBase[1] .create( g_uiMaxCUWidth, g_uiMaxCUHeight );
     184#if NH_3D_ARP
     185    m_acYuvPredBase[0] .create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC );
     186    m_acYuvPredBase[1] .create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC );
    187187#endif
    188188#if H_3D_VSP
    … …  
    648648      Int RefPOCL0 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_0, pcCU->getCUMvField(REF_PIC_LIST_0)->getRefIdx(PartAddr))->getPOC();
    649649      Int RefPOCL1 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_1, pcCU->getCUMvField(REF_PIC_LIST_1)->getRefIdx(PartAddr))->getPOC();
    650 #if H_3D_ARP
     650#if NH_3D_ARP
    651651      if(!pcCU->getARPW(PartAddr) && RefPOCL0 == RefPOCL1 && pcCU->getCUMvField(REF_PIC_LIST_0)->getMv(PartAddr) == pcCU->getCUMvField(REF_PIC_LIST_1)->getMv(PartAddr))
    652652#else
    … …  
    13891389  pcCU->checkMvVertRest(cMv, eRefPicList, iRefIdx );
    13901390#endif
    1391 #if H_3D_ARP
    1392   if(pcCU->getARPW( uiPartAddr ) > 0  && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC())
    1393   {
    1394     xPredInterUniARPviewRef( pcCU , uiPartAddr , iWidth , iHeight , eRefPicList , rpcYuvPred , bi );
     1391#if NH_3D_ARP
     1392  if(  pcCU->getARPW( uiPartAddr ) > 0 )
     1393  {
     1394    if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC() )
     1395    {
     1396      xPredInterUniARPviewRef( pcCU , uiPartAddr , iWidth , iHeight , eRefPicList , pcYuvPred , bi );
     1397    }
     1398    else
     1399    {
     1400      xPredInterUniARP( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, bi );
     1401    }     
    13951402  }
    13961403  else
    13971404  {
    1398     if(  pcCU->getARPW( uiPartAddr ) > 0
    1399       && pcCU->getPartitionSize(uiPartAddr)==SIZE_2Nx2N
    1400       && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()!= pcCU->getSlice()->getPOC()
    1401       )
    1402     {
    1403       xPredInterUniARP( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, rpcYuvPred, bi );
    1404     }
    1405     else
    1406     {
    14071405#endif
    14081406#if H_3D_IC
    14091407      Bool bICFlag = pcCU->getICFlag( uiPartAddr ) && ( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getViewIndex() != pcCU->getSlice()->getViewIndex() );
    14101408      xPredInterLumaBlk  ( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi
    1411 #if H_3D_ARP
     1409#if NH_3D_ARP
    14121410        , false
    14131411#endif
    … …  
    14151413      bICFlag = bICFlag && (iWidth > 8);
    14161414      xPredInterChromaBlk( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi
    1417 #if H_3D_ARP
     1415#if NH_3D_ARP
    14181416        , false
    14191417#endif
    … …  
    14271425  }
    14281426#endif
    1429 #if H_3D_ARP
    1430     }
     1427#if NH_3D_ARP
    14311428  }
    14321429#endif
    … …  
    14791476#endif
    14801477
    1481 #if H_3D_ARP
    1482 Void TComPrediction::xPredInterUniARP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled )
    1483 {
    1484   Int         iRefIdx      = pNewMvFiled ? pNewMvFiled->getRefIdx() : pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );           
    1485   TComMv      cMv          = pNewMvFiled ? pNewMvFiled->getMv()     : pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr );
     1478#if NH_3D_ARP
     1479//temporal ARP
     1480Void TComPrediction::xPredInterUniARP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi )
     1481{
     1482  Int         iRefIdx      = pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );           
     1483  TComMv      cMv          = pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr );
    14861484  Bool        bTobeScaled  = false;
    14871485  TComPic* pcPicYuvBaseCol = NULL;
    … …  
    14971495  UChar dW = pcCU->getARPW ( uiPartAddr );
    14981496
    1499   {
    1500     Int arpRefIdx = pcCU->getSlice()->getFirstTRefIdx(eRefPicList);
    1501     if( dW > 0 && pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC()!= pcCU->getSlice()->getPOC() )
     1497  Int arpRefIdx = pcCU->getSlice()->getFirstTRefIdx(eRefPicList);
     1498  if (arpRefIdx < 0 || !pcCU->getSlice()->getArpRefPicAvailable( eRefPicList, cDistparity.m_aVIdxCan))
     1499  {
     1500    dW = 0;
     1501    bTobeScaled = false;
     1502  }
     1503  else
     1504  {
     1505    if( arpRefIdx != iRefIdx )
    15021506    {
    15031507      bTobeScaled = true;
    15041508    }
    1505 
    15061509    pcPicYuvBaseCol =  pcCU->getSlice()->getBaseViewRefPic( pcCU->getSlice()->getPOC(),                              cDistparity.m_aVIdxCan );
    1507 
    15081510    pcPicYuvBaseRef =  pcCU->getSlice()->getBaseViewRefPic( pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC(), cDistparity.m_aVIdxCan );
    1509 
    1510     if (!pcCU->getSlice()->getArpRefPicAvailable( eRefPicList, cDistparity.m_aVIdxCan))
    1511     {
    1512       dW = 0;
    1513       bTobeScaled = false;
    1514     }
    1515     else
    1516     {
    1517       assert( pcPicYuvBaseCol->getPOC() == pcCU->getSlice()->getPOC() && pcPicYuvBaseRef->getPOC() == pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC() );
    1518     }
    1519 
    1520     if(bTobeScaled)
    1521     {     
    1522       Int iCurrPOC    = pcCU->getSlice()->getPOC();
    1523       Int iColRefPOC  = pcCU->getSlice()->getRefPOC( eRefPicList, iRefIdx );
    1524       Int iCurrRefPOC = pcCU->getSlice()->getRefPOC( eRefPicList,  0);
    1525       Int iScale = pcCU-> xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iCurrPOC, iColRefPOC);
    1526       if ( iScale != 4096 )
    1527       {
    1528         cMv = cMv.scaleMv( iScale );
    1529       }
    1530       iRefIdx = 0;
    1531     }
     1511  } 
     1512  if(bTobeScaled)
     1513  {     
     1514    Int iCurrPOC    = pcCU->getSlice()->getPOC();
     1515    Int iColRefPOC  = pcCU->getSlice()->getRefPOC( eRefPicList, iRefIdx   );
     1516    Int iCurrRefPOC = pcCU->getSlice()->getRefPOC( eRefPicList, arpRefIdx );
     1517    Int iScale = pcCU-> xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iCurrPOC, iColRefPOC);
     1518    if ( iScale != 4096 )
     1519    {
     1520      cMv = cMv.scaleMv( iScale );
     1521    }
     1522    iRefIdx = arpRefIdx;
    15321523  }
    15331524
    15341525  pcCU->clipMv(cMv);
    15351526  TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec();
    1536   xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), true );
    1537   xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), true );
     1527
     1528  for (UInt comp=COMPONENT_Y; comp< rpcYuvPred->getNumberValidComponents(); comp++)
     1529  {
     1530    const ComponentID compID=ComponentID(comp);
     1531    xPredInterBlk  ( compID,  pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1532  }
    15381533
    15391534  if( dW > 0 )
    … …  
    15511546    pcCU->clipMv( cNBDV );
    15521547   
    1553     pcPicYuvRef = pcPicYuvBaseCol->getPicYuvRec();
    1554     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
    1555     if (iWidth > 8)
    1556       xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
    1557    
    1558     pcPicYuvRef = pcPicYuvBaseRef->getPicYuvRec();
    1559     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
    1560  
    1561     if (iWidth > 8)
    1562       xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
    1563    
     1548    TComPicYuv* pcPicYuvBaseColRec = pcPicYuvBaseCol->getPicYuvRec();
     1549    TComPicYuv* pcPicYuvBaseRefRec = pcPicYuvBaseRef->getPicYuvRec();
     1550
     1551    UInt uiCompNum = ( iWidth > 8 ) ? 3: 1;
     1552    for (UInt comp=COMPONENT_Y; comp< uiCompNum; comp++)
     1553    {
     1554      const ComponentID compID=ComponentID(comp);
     1555      xPredInterBlk  ( compID,  pcCU, pcPicYuvBaseColRec, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1556      xPredInterBlk  ( compID,  pcCU, pcPicYuvBaseRefRec, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1557    }   
     1558
    15641559    pYuvB0->subtractARP( pYuvB0 , pYuvB1 , uiPartAddr , iWidth , iHeight );
    1565 
    15661560    if( 2 == dW )
    15671561    {
    15681562      pYuvB0->multiplyARP( uiPartAddr , iWidth , iHeight , dW );
    15691563    }
    1570     rpcYuvPred->addARP( rpcYuvPred , pYuvB0 , uiPartAddr , iWidth , iHeight , !bi );
    1571   }
    1572 }
    1573 
     1564    rpcYuvPred->addARP( rpcYuvPred , pYuvB0 , uiPartAddr , iWidth , iHeight , !bi, pcCU->getSlice()->getSPS()->getBitDepths() );
     1565  }
     1566}
    15741567Bool TComPrediction::xCheckBiInterviewARP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eBaseRefPicList, TComPic*& pcPicYuvCurrTRef, TComMv& cBaseTMV, Int& iCurrTRefPoc )
    15751568{
    … …  
    15771570  TComMv      cDMv          = pcCU->getCUMvField( eBaseRefPicList )->getMv( uiPartAddr );
    15781571  TComPic* pcPicYuvBaseCol  = pcCU->getSlice()->getRefPic( eBaseRefPicList, iRefIdx ); 
    1579   TComPicYuv* pcYuvBaseCol  = pcPicYuvBaseCol->getPicYuvRec();
    1580   Int uiLCUAddr,uiAbsPartAddr;
    15811572  Int irefPUX = pcCU->getCUPelX() + g_auiRasterToPelX[g_auiZscanToRaster[uiPartAddr]] + iWidth/2  + ((cDMv.getHor() + 2)>>2);
    15821573  Int irefPUY = pcCU->getCUPelY() + g_auiRasterToPelY[g_auiZscanToRaster[uiPartAddr]] + iHeight/2 + ((cDMv.getVer() + 2)>>2);
    … …  
    15841575  irefPUX = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()-> getPicWidthInLumaSamples()-1, irefPUX);
    15851576  irefPUY = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples()-1, irefPUY); 
    1586   pcYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
    1587   TComDataCU *pColCU = pcPicYuvBaseCol->getCU( uiLCUAddr );
     1577
     1578  Int uiLCUAddr,uiAbsPartAddr;
     1579  pcPicYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
     1580  TComDataCU *pColCU = pcPicYuvBaseCol->getCtu( uiLCUAddr );
    15881581
    15891582  TComPic* pcPicYuvBaseTRef = NULL;
    … …  
    16361629  return false;
    16371630}
    1638 
    1639 Void TComPrediction::xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled )
     1631//inter-view ARP
     1632Void TComPrediction::xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi )
    16401633{
    16411634  Int         iRefIdx       = pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );           
    … …  
    16501643  Bool bTMVAvai = false;     
    16511644  TComMv cBaseTMV;
    1652   if( pNewMvFiled )
    1653   {
    1654     iRefIdx = pNewMvFiled->getRefIdx();
    1655     cDMv = pNewMvFiled->getMv();
    1656   }
     1645
    16571646  pcCU->clipMv(cTempDMv);
    16581647
    1659   assert(dW > 0);
    1660   if (!pcCU->getSlice()->getArpRefPicAvailable( eRefPicList, pcPicYuvBaseCol->getViewIndex()))
    1661   {
    1662     dW = 0;
    1663   }
    1664   Int uiLCUAddr,uiAbsPartAddr;
    16651648  Int irefPUX = pcCU->getCUPelX() + g_auiRasterToPelX[g_auiZscanToRaster[uiPartAddr]] + iWidth/2  + ((cDMv.getHor() + 2)>>2);
    16661649  Int irefPUY = pcCU->getCUPelY() + g_auiRasterToPelY[g_auiZscanToRaster[uiPartAddr]] + iHeight/2 + ((cDMv.getVer() + 2)>>2);
    … …  
    16681651  irefPUX = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()-> getPicWidthInLumaSamples()-1, irefPUX);
    16691652  irefPUY = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples()-1, irefPUY); 
    1670   pcYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
    1671   TComDataCU *pColCU = pcPicYuvBaseCol->getCU( uiLCUAddr );
     1653 
     1654  Int uiLCUAddr,uiAbsPartAddr;
     1655  pcPicYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
     1656  TComDataCU *pColCU = pcPicYuvBaseCol->getCtu( uiLCUAddr );
    16721657  if( pcCU->getSlice()->isInterB() && !pcCU->getSlice()->getIsDepth() )
    16731658  {
    … …  
    17141699      Int iCurrTRefPoc;
    17151700      bTMVAvai = ( eBaseList != eRefPicList ) && ( pcCU->getSlice()->getViewIndex() != pcCU->getSlice()->getRefPic( eOtherRefList, iOtherRefIdx )->getViewIndex() );
    1716 
    17171701      if ( bTMVAvai )
    17181702      {
    1719         if( xCheckBiInterviewARP( pcCU, uiPartAddr, iWidth, iHeight, eBaseList, pcPicYuvCurrTRef, cBaseTMV, iCurrTRefPoc ) )
     1703        if( xCheckBiInterviewARP( pcCU, uiPartAddr, iWidth, iHeight, eBaseList, pcPicYuvCurrTRef, cBaseTMV, iCurrTRefPoc ) ) 
    17201704        {
    17211705          pcPicYuvBaseTRef = pcCU->getSlice()->getBaseViewRefPic( iCurrTRefPoc,  pcPicYuvBaseCol->getViewIndex() );
    … …  
    17401724      RefPicList eRefPicListCurr = RefPicList(iList);
    17411725      Int iRef = pColCU->getCUMvField(eRefPicListCurr)->getRefIdx(uiAbsPartAddr);
    1742       if( iRef != -1)
     1726      if( iRef != -1 && pcCU->getSlice()->getArpRefPicAvailable( eRefPicListCurr, pcPicYuvBaseCol->getViewIndex()))
    17431727      {
    17441728        pcPicYuvBaseTRef = pColCU->getSlice()->getRefPic(eRefPicListCurr, iRef); 
    … …  
    17741758  }
    17751759
    1776   xPredInterLumaBlk  ( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ),        bTMVAvai);
    1777   xPredInterChromaBlk( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ),        bTMVAvai);
    1778 
    1779   if( dW > 0 && bTMVAvai )
    1780   {
     1760  for (UInt comp=COMPONENT_Y; comp< rpcYuvPred->getNumberValidComponents(); comp++)
     1761  {
     1762    const ComponentID compID=ComponentID(comp);
     1763    xPredInterBlk  ( compID,  pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ), pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), bTMVAvai );
     1764  }
     1765
     1766  if( dW > 0 )
     1767  {
     1768    assert ( bTMVAvai );
    17811769    TComYuv*    pYuvCurrTRef    = &m_acYuvPredBase[0];
    17821770    TComYuv*    pYuvBaseTRef    = &m_acYuvPredBase[1];
    … …  
    17921780      pYuvCurrTRef->clear(); pYuvBaseTRef->clear();
    17931781    }
    1794     xPredInterLumaBlk  ( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
    1795 
    1796     if (iWidth > 8)
    1797       xPredInterChromaBlk( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
    1798 
    1799     xPredInterLumaBlk  ( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true);
    1800 
    1801     if (iWidth > 8)
    1802       xPredInterChromaBlk( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true);
     1782
     1783    UInt uiCompNum = ( iWidth > 8 ) ? 3: 1;
     1784    for (UInt comp=COMPONENT_Y; comp< uiCompNum; comp++)
     1785    {
     1786      const ComponentID compID=ComponentID(comp);
     1787      xPredInterBlk  ( compID,  pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1788      xPredInterBlk  ( compID,  pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv, iWidth, iHeight, pYuvBaseTRef, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1789    }
    18031790
    18041791    pYuvCurrTRef->subtractARP( pYuvCurrTRef , pYuvBaseTRef , uiPartAddr , iWidth , iHeight ); 
    … …  
    18071794      pYuvCurrTRef->multiplyARP( uiPartAddr , iWidth , iHeight , dW );
    18081795    }
    1809     rpcYuvPred->addARP( rpcYuvPred , pYuvCurrTRef , uiPartAddr , iWidth , iHeight , !bi );
     1796    rpcYuvPred->addARP( rpcYuvPred , pYuvCurrTRef , uiPartAddr , iWidth , iHeight , !bi, pcCU->getSlice()->getSPS()->getBitDepths() );
    18101797  }
    18111798}
    … …  
    19071894
    19081895Void TComPrediction::xPredInterBlk(const ComponentID compID, TComDataCU *cu, TComPicYuv *refPic, UInt partAddr, TComMv *mv, Int width, Int height, TComYuv *dstPic, Bool bi, const Int bitDepth
    1909 #if H_3D_ARP
     1896#if NH_3D_ARP
    19101897    , Bool filterType
    19111898#endif
    … …  
    19511938    m_if.filterHor(compID, ref, refStride, dst,  dstStride, cxWidth, cxHeight, xFrac, !bi, chFmt, bitDepth
    19521939#endif
    1953 #if H_3D_ARP
     1940#if NH_3D_ARP
    19541941    , filterType
    19551942#endif
    1956 );
     1943     );
    19571944  }
    19581945  else if ( xFrac == 0 )
    … …  
    19631950    m_if.filterVer(compID, ref, refStride, dst, dstStride, cxWidth, cxHeight, yFrac, true, !bi, chFmt, bitDepth
    19641951#endif
    1965 #if H_3D_ARP
     1952#if NH_3D_ARP
    19661953    , filterType
    19671954#endif
    1968 );
     1955    );
    19691956  }
    19701957  else
    … …  
    19761963
    19771964    m_if.filterHor(compID, ref - ((vFilterSize>>1) -1)*refStride, refStride, tmp, tmpStride, cxWidth, cxHeight+vFilterSize-1, xFrac, false,      chFmt, bitDepth
    1978 #if H_3D_ARP
     1965#if N_3D_ARP
    19791966    , filterType
    19801967#endif
    1981 );
     1968    );
    19821969#if H_3D_IC
    19831970    m_if.filterVerLuma(tmp + (halfFilterSize-1)*tmpStride, tmpStride, dst, dstStride, width, height,              yFrac, false, !bi || bICFlag
    … …  
    19851972    m_if.filterVer(compID, tmp + ((vFilterSize>>1) -1)*tmpStride, tmpStride, dst, dstStride, cxWidth, cxHeight,               yFrac, false, !bi, chFmt, bitDepth
    19861973#endif
    1987 #if H_3D_ARP
     1974#if NH_3D_ARP
    19881975    , filterType
    19891976#endif
    1990 );
     1977    );
    19911978  }
    19921979
    … …  
    20282015}
    20292016
    2030 
    2031 #if H_3D_ARP
    2032     , Bool filterType
    2033 #endif
    20342017#if H_3D_IC
    20352018    , Bool bICFlag
    … …  
    20392022#else
    20402023#endif
    2041 #if H_3D_ARP
    2042     , filterType
    2043 #endif
    20442024#if H_3D_IC
    20452025    m_if.filterHorChroma(refCr, refStride, dstCr,  dstStride, cxWidth, cxHeight, xFrac, !bi || bICFlag
    20462026#else
    20472027#endif
    2048 #if H_3D_ARP
    2049     , filterType
    2050 #endif
    20512028#if H_3D_IC
    20522029    m_if.filterVerChroma(refCb, refStride, dstCb, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag
    20532030#else
    20542031#endif
    2055 #if H_3D_ARP
    2056     , filterType
    2057 #endif
    20582032#if H_3D_IC
    20592033    m_if.filterVerChroma(refCr, refStride, dstCr, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag
    20602034#else
    2061 #endif
    2062 #if H_3D_ARP
    2063     , filterType
    2064 #endif
    2065 #if H_3D_ARP
    2066     , filterType
    2067 #endif 
     2035#endif
    20682036#if H_3D_IC
    20692037    m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCb, dstStride, cxWidth, cxHeight  , yFrac, false, !bi || bICFlag
    20702038#else
    20712039#endif
    2072 #if H_3D_ARP
    2073     , filterType
    2074 #endif
    2075 #if H_3D_ARP
    2076     , filterType
    2077 #endif
    20782040#if H_3D_IC
    20792041    m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCr, dstStride, cxWidth, cxHeight  , yFrac, false, !bi || bICFlag
    20802042#else
    20812043#endif
    2082 #if H_3D_ARP
    2083     , filterType
    2084 #endif
    20852044#if H_3D_IC
    20862045  if( bICFlag )
Note: See TracChangeset for help on using the changeset viewer.