Ignore:
Timestamp:
31 Jan 2013, 07:39:49 (11 years ago)
Author:
mediatek-htm
Message:

Integration of JCT3V-C0135
The MACRO is MTK_SIMPLIFY_DVTC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp

    r245 r246  
    58085808    uiBRIdx = uiPartIdxLT;
    58095809    UInt uiAbsPartIdxTmp = g_auiZscanToRaster[uiPartIdxRB];
     5810#if MTK_SIMPLIFY_DVTC
     5811    if (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() )>= m_pcSlice->getSPS()->getPicWidthInLumaSamples() )
     5812    {
     5813      uiLCUnew = -1;
     5814    }
     5815    else if(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() )>= m_pcSlice->getSPS()->getPicHeightInLumaSamples() )
     5816    {
     5817      uiLCUnew = -1;
     5818    }
     5819    else
     5820#else
    58105821    if ( (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() ) < m_pcSlice->getSPS()->getPicWidthInLumaSamples() ) &&(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() ) < m_pcSlice->getSPS()->getPicHeightInLumaSamples() ))  // image boundary check
     5822#endif
    58115823    {
    58125824      if ( ( uiAbsPartIdxTmp % uiNumPartInCUWidth < uiNumPartInCUWidth - 1 ) &&           // is not at the last column of LCU
     
    58185830      {
    58195831        uiBRIdx = g_auiRasterToZscan[ (uiAbsPartIdxTmp + uiNumPartInCUWidth + 1) % m_pcPic->getNumPartInCU() ];
     5832#if MTK_SIMPLIFY_DVTC
     5833        uiLCUnew = -1;
     5834#else
    58205835        uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU();
     5836#endif
    58215837      }
    58225838      else if ( uiAbsPartIdxTmp / uiNumPartInCUWidth < m_pcPic->getNumPartInHeight() - 1 ) // is not at the last row of LCU But is last column of LCU
     
    58285844      {
    58295845        uiBRIdx = 0;
     5846#if MTK_SIMPLIFY_DVTC
     5847        uiLCUnew = -1;
     5848#else
    58305849        uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU() + 1;
     5850#endif
    58315851      }
    58325852    }
     
    58545874      if( m_pcSlice->getViewId() == getSlice()->getRefPic( eRefPicList, lpRef)->getViewId() )
    58555875      {
     5876#if !MTK_SIMPLIFY_DVTC
    58565877        if (uiViewIdxCurr > 1) 
    58575878        {
     5879#endif
    58585880          if( (uiLCUnew >= 0 && xGetColDisMV( eRefPicList, lpRef, uiLCUnew, uiBRIdx, cColMv, iTargetViewIdx, iTStartViewIdx)) )
    58595881          {
     
    58755897            return ;
    58765898          }
     5899#if !MTK_SIMPLIFY_DVTC
    58775900        }
    5878 
     5901#endif
    58795902        if(xGetColDisMV( eRefPicList, lpRef, uiLCUIdx, uiPartIdxCenter,  cColMv, iTargetViewIdx, iTStartViewIdx ))
    58805903        {
     
    58955918          return ;
    58965919        }
     5920#if !MTK_SIMPLIFY_DVTC
    58975921        if(uiViewIdxCurr == 1) 
    58985922        {
     
    59165940          }
    59175941        }
     5942#endif
    59185943      }
    59195944    }
     
    65026527    uiBRIdx = uiPartIdxLT;
    65036528    UInt uiAbsPartIdxTmp = g_auiZscanToRaster[uiPartIdxRB];
     6529#if MTK_SIMPLIFY_DVTC
     6530    if (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() )>= m_pcSlice->getSPS()->getPicWidthInLumaSamples() )
     6531    {
     6532      uiLCUnew = -1;
     6533    }
     6534    else if(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() )>= m_pcSlice->getSPS()->getPicHeightInLumaSamples() )
     6535    {
     6536      uiLCUnew = -1;
     6537    }
     6538    else
     6539#else
    65046540    if ( (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() ) < m_pcSlice->getSPS()->getPicWidthInLumaSamples() ) &&(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() ) < m_pcSlice->getSPS()->getPicHeightInLumaSamples() ))  // image boundary check
     6541#endif
    65056542    {
    65066543      if ( ( uiAbsPartIdxTmp % uiNumPartInCUWidth < uiNumPartInCUWidth - 1 ) &&           // is not at the last column of LCU
     
    65126549      {
    65136550        uiBRIdx = g_auiRasterToZscan[ (uiAbsPartIdxTmp + uiNumPartInCUWidth + 1) % m_pcPic->getNumPartInCU() ];
     6551#if MTK_SIMPLIFY_DVTC
     6552        uiLCUnew = -1;
     6553#else
    65146554        uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU();
     6555#endif
    65156556      }
    65166557      else if ( uiAbsPartIdxTmp / uiNumPartInCUWidth < m_pcPic->getNumPartInHeight() - 1 ) // is not at the last row of LCU But is last column of LCU
     
    65226563      {
    65236564        uiBRIdx = 0;
     6565#if MTK_SIMPLIFY_DVTC
     6566        uiLCUnew = -1;
     6567#else
    65246568        uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU() + 1;
     6569#endif
    65256570      }
    65266571    }
     
    65486593      if( m_pcSlice->getViewId() == getSlice()->getRefPic( eRefPicList, lpRef)->getViewId() )
    65496594      {
     6595#if !MTK_SIMPLIFY_DVTC
    65506596        if (uiViewIdxCurr > 1) 
    65516597        {
     6598#endif
    65526599          if( (uiLCUnew >= 0 && xGetColDisMV( eRefPicList, lpRef, uiLCUnew, uiBRIdx, cColMv, iTargetViewIdx, iTStartViewIdx)) )
    65536600          {
     
    65696616            return ;
    65706617          }
     6618#if !MTK_SIMPLIFY_DVTC
    65716619        }
    6572 
     6620#endif
    65736621        if(xGetColDisMV( eRefPicList, lpRef, uiLCUIdx, uiPartIdxCenter,  cColMv, iTargetViewIdx, iTStartViewIdx ))
    65746622        {
     
    65896637          return ;
    65906638        }
     6639#if !MTK_SIMPLIFY_DVTC
    65916640        if(uiViewIdxCurr == 1) 
    65926641        {
     
    66106659          }
    66116660        }
     6661#endif
    66126662      }
    66136663    }
Note: See TracChangeset for help on using the changeset viewer.