Changeset 332 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPrediction.cpp


Ignore:
Timestamp:
21 Apr 2013, 19:13:11 (11 years ago)
Author:
tech
Message:

Merged branch 6.1-Cleanup@329.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComPrediction.cpp

    r313 r332  
    636636#endif
    637637      {
    638 #if DEPTH_MAP_GENERATION
    639638#if MERL_VSP_C0152
    640639        xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
     
    642641        xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
    643642#endif
    644 #else
    645 #if MERL_VSP_C0152
    646         xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, true );
    647 #else
    648         xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, true );
    649 #endif
    650 #endif
    651643      }
    652644      else
    653645      {
    654 #if DEPTH_MAP_GENERATION
    655646#if MERL_VSP_C0152
    656647        xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
     
    658649        xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    659650#endif
    660 #else
    661 #if MERL_VSP_C0152
    662         xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, false );
    663 #else
    664         xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, false );
    665 #endif
    666 #endif
    667651      }
    668652#if LGE_ILLUCOMP_B0045
     
    677661    else
    678662    {
    679 #if DEPTH_MAP_GENERATION
    680663      if( xCheckIdenticalMotion( pcCU, uiPartAddr ) && !bPrdDepthMap )
    681 #else
    682       if ( xCheckIdenticalMotion( pcCU, uiPartAddr ) )
    683 #endif
    684       {
    685 #if DEPTH_MAP_GENERATION
     664      {
    686665#if MERL_VSP_C0152
    687666        xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
     
    689668        xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    690669#endif
    691 #else
    692 #if MERL_VSP_C0152
    693         xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, false );
    694 #else
    695         xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, false );
    696 #endif
    697 #endif
    698670      }
    699671      else
    700672      {
    701 #if DEPTH_MAP_GENERATION
    702673#if MERL_VSP_C0152
    703674        xPredInterBi  (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, uiSubSampExpX, uiSubSampExpY, pcYuvPred, iPartIdx, bPrdDepthMap );
     
    705676        xPredInterBi  (pcCU, uiPartAddr, iWidth, iHeight, uiSubSampExpX, uiSubSampExpY, pcYuvPred, iPartIdx, bPrdDepthMap );
    706677#endif
    707 #else
    708 #if MERL_VSP_C0152
    709         xPredInterBi  (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, pcYuvPred, iPartIdx );
    710 #else
    711         xPredInterBi  (pcCU, uiPartAddr, iWidth, iHeight, pcYuvPred, iPartIdx );
    712 #endif
    713 #endif
    714678      }
    715679    }
     
    721685    pcCU->getPartIndexAndSize( iPartIdx, uiPartAddr, iWidth, iHeight );
    722686
    723 #if DEPTH_MAP_GENERATION
    724687    if( bPrdDepthMap )
    725688    {
     
    727690      iHeight >>= uiSubSampExpY;
    728691    }
    729 #endif
    730692
    731693    if ( eRefPicList != REF_PIC_LIST_X )
     
    737699#endif
    738700      {
    739 #if DEPTH_MAP_GENERATION
    740701#if MERL_VSP_C0152
    741702        xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
     
    743704        xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
    744705#endif
    745 #else
    746 #if MERL_VSP_C0152
    747         xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, true );
    748 #else
    749         xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, true );
    750 #endif
    751 #endif
    752706  }
    753707  else
    754708  {
    755 #if DEPTH_MAP_GENERATION
    756709#if MERL_VSP_C0152
    757710        xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
     
    759712        xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    760713#endif
    761 #else
    762 #if MERL_VSP_C0152
    763         xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, false );
    764 #else
    765         xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, false );
    766 #endif
    767 #endif
    768       }
    769 #if DEPTH_MAP_GENERATION
     714      }
    770715#if MERL_VSP_C0152
    771716      xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
     
    773718      xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    774719#endif
    775 #else
    776 #if MERL_VSP_C0152
    777       xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, false );
    778 #else
    779       xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, iPartIdx, false );
    780 #endif
    781 #endif
     720
    782721#if LGE_ILLUCOMP_B0045
    783722      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
     
    793732      if ( xCheckIdenticalMotion( pcCU, uiPartAddr ) )
    794733      {
    795 #if DEPTH_MAP_GENERATION
    796734#if MERL_VSP_C0152
    797735        xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
     
    799737        xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    800738#endif
    801 #else
    802 #if MERL_VSP_C0152
    803         xPredInterUni (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, false );
    804 #else
    805         xPredInterUni (pcCU, uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, pcYuvPred, iPartIdx, false );
    806 #endif
    807 #endif   
    808739      }
    809740      else
    810741      {
    811 #if DEPTH_MAP_GENERATION
    812742#if MERL_VSP_C0152
    813743        xPredInterBi  (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, uiSubSampExpX, uiSubSampExpY, pcYuvPred, iPartIdx, bPrdDepthMap );
     
    815745        xPredInterBi  (pcCU, uiPartAddr, iWidth, iHeight, uiSubSampExpX, uiSubSampExpY, pcYuvPred, iPartIdx, bPrdDepthMap );
    816746#endif   
    817 #else
    818 #if MERL_VSP_C0152
    819         xPredInterBi  (pcCU, uiPartAddr, uiAbsPartIdx+uiPartAddr, iWidth, iHeight, pcYuvPred, iPartIdx );
    820 #else
    821         xPredInterBi  (pcCU, uiPartAddr, iWidth, iHeight, pcYuvPred, iPartIdx );
    822 #endif
    823 #endif
    824747      }
    825748    }
     
    828751}
    829752
    830 #if MTK_MDIVRP_C0138
     753#if H3D_IVRP
    831754Void TComPrediction::residualPrediction(TComDataCU* pcCU, TComYuv* pcYuvPred, TComYuv* pcYuvResPred)
    832755{
     
    847770#endif
    848771
    849 #if DEPTH_MAP_GENERATION
    850772#if MERL_VSP_C0152
    851773Void TComPrediction::xPredInterUni ( TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bPrdDepthMap, UInt uiSubSampExpX, UInt uiSubSampExpY, Bool bi )
    852774#else
    853775Void TComPrediction::xPredInterUni ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bPrdDepthMap, UInt uiSubSampExpX, UInt uiSubSampExpY, Bool bi )
    854 #endif
    855 #else
    856 #if MERL_VSP_C0152
    857 Void TComPrediction::xPredInterUni ( TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bi )
    858 #else
    859 Void TComPrediction::xPredInterUni ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bi )
    860 #endif
    861776#endif
    862777{
     
    887802  {
    888803    UInt uiRShift = 0;
    889 #if PDM_REMOVE_DEPENDENCE
    890804    if( pcCU->getPic()->getStoredPDMforV2() == 1 )
    891805      xPredInterPrdDepthMap( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPredDepthMapTemp(), uiPartAddr, &cMv, iWidth, iHeight, uiSubSampExpX, uiSubSampExpY, rpcYuvPred, uiRShift, 0 );
    892806    else
    893 #endif
    894807      xPredInterPrdDepthMap( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPredDepthMap(), uiPartAddr, &cMv, iWidth, iHeight, uiSubSampExpX, uiSubSampExpY, rpcYuvPred, uiRShift, 0 );
    895808
     
    1001914
    1002915
    1003 #if DEPTH_MAP_GENERATION
    1004916#if MERL_VSP_C0152
    1005917Void TComPrediction::xPredInterBi ( TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, UInt uiSubSampExpX, UInt uiSubSampExpY, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bPrdDepthMap )
     
    1007919Void TComPrediction::xPredInterBi ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, UInt uiSubSampExpX, UInt uiSubSampExpY, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bPrdDepthMap )
    1008920#endif
    1009 #else
    1010 #if MERL_VSP_C0152
    1011 Void TComPrediction::xPredInterBi ( TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, TComYuv*& rpcYuvPred, Int iPartIdx )
    1012 #else
    1013 Void TComPrediction::xPredInterBi ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, TComYuv*& rpcYuvPred, Int iPartIdx )
    1014 #endif
    1015 #endif
    1016921{
    1017922  TComYuv* pcMbYuv;
     
    1050955    if( pcCU->getCUMvField( REF_PIC_LIST_0 )->getRefIdx( uiPartAddr ) >= 0 && pcCU->getCUMvField( REF_PIC_LIST_1 )->getRefIdx( uiPartAddr ) >= 0 )
    1051956    {
    1052 #if DEPTH_MAP_GENERATION
    1053957#if MERL_VSP_C0152
    1054958      xPredInterUni ( pcCU, uiPartAddr, uiAbsPartIdx, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
    1055959#else
    1056960      xPredInterUni ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
    1057 #endif
    1058 #else
    1059 #if MERL_VSP_C0152
    1060       xPredInterUni ( pcCU, uiPartAddr, uiAbsPartIdx, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, true );
    1061 #else
    1062       xPredInterUni ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, true );
    1063 #endif
    1064961#endif
    1065962    }
     
    1073970#endif
    1074971      {
    1075 #if DEPTH_MAP_GENERATION
    1076972#if MERL_VSP_C0152
    1077973        xPredInterUni ( pcCU, uiPartAddr, uiAbsPartIdx, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
     
    1079975        xPredInterUni ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, true );
    1080976#endif
    1081 #else
    1082 #if MERL_VSP_C0152
    1083         xPredInterUni ( pcCU, uiPartAddr, uiAbsPartIdx, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, true );
    1084 #else
    1085         xPredInterUni ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, true );
    1086 #endif
    1087 #endif
    1088977      }
    1089978      else
    1090979      {
    1091 #if DEPTH_MAP_GENERATION
    1092980#if MERL_VSP_C0152
    1093981        xPredInterUni ( pcCU, uiPartAddr, uiAbsPartIdx, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    1094982#else
    1095983        xPredInterUni ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, bPrdDepthMap, uiSubSampExpX, uiSubSampExpY, false );
    1096 #endif
    1097 #else
    1098 #if MERL_VSP_C0152
    1099         xPredInterUni ( pcCU, uiPartAddr, uiAbsPartIdx, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, false );
    1100 #else
    1101         xPredInterUni ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, iPartIdx, false );
    1102 #endif
    1103984#endif
    1104985      }
     
    11321013  else
    11331014  {
    1134 #if DEPTH_MAP_GENERATION
    11351015    if ( bPrdDepthMap )
    11361016    {
     
    11461026      xWeightedAverage( pcCU, &m_acYuvPred[0], &m_acYuvPred[1], iRefIdx[0], iRefIdx[1], uiPartAddr, iWidth, iHeight, rpcYuvPred );
    11471027    }
    1148 #else
    1149     xWeightedAverage( pcCU, &m_acYuvPred[0], &m_acYuvPred[1], iRefIdx[0], iRefIdx[1], uiPartAddr, iWidth, iHeight, rpcYuvPred );
    1150 #endif
    11511028  }
    11521029}
     
    11551032
    11561033Void
    1157 #if DEPTH_MAP_GENERATION
    11581034TComPrediction::xPredInterPrdDepthMap( TComDataCU* pcCU, TComPicYuv* pcPicYuvRef, UInt uiPartAddr, TComMv* pcMv, Int iWidth, Int iHeight, UInt uiSubSampExpX, UInt uiSubSampExpY, TComYuv*& rpcYuv, UInt uiRShift, UInt uiOffset
    11591035#if LGE_ILLUCOMP_DEPTH_C0046
     
    11611037#endif
    11621038)
    1163 #else
    1164 TComPrediction::xPredInterPrdDepthMap( TComDataCU* pcCU, TComPicYuv* pcPicYuvRef, UInt uiPartAddr, TComMv* pcMv, Int iWidth, Int iHeight, TComYuv*& rpcYuv, UInt uiRShift, UInt uiOffset )
    1165 #endif
    1166 {
    1167 #if DEPTH_MAP_GENERATION
     1039{
    11681040  Int     iShiftX     = 2 + uiSubSampExpX;
    11691041  Int     iShiftY     = 2 + uiSubSampExpY;
     
    11821054  Int     iDstStride  = rpcYuv->getStride();
    11831055  Int     iRefOffset  = iHor + iVer * iRefStride;
    1184 #else
    1185   Int     iFPelMask   = ~3;
    1186   Int     iRefStride  = pcPicYuvRef->getStride();
    1187   Int     iDstStride  = rpcYuv->getStride();
    1188   Int     iHor        = ( pcMv->getHor() + 2 ) & iFPelMask;
    1189   Int     iVer        = ( pcMv->getVer() + 2 ) & iFPelMask;
    1190 #if HHI_FULL_PEL_DEPTH_MAP_MV_ACC
    1191   if( pcCU->getSlice()->getSPS()->isDepth() )
    1192   {
    1193     iHor = pcMv->getHor() * 4;
    1194     iVer = pcMv->getVer() * 4;
    1195 }
    1196 #endif
    1197 #if !QC_MVHEVC_B0046
    1198   Int     ixFrac      = iHor & 0x3;
    1199   Int     iyFrac      = iVer & 0x3;
    1200 #endif
    1201   Int     iRefOffset  = ( iHor >> 2 ) + ( iVer >> 2 ) * iRefStride;
    1202 #endif
    12031056
    12041057  Pel*    piRefY      = pcPicYuvRef->getLumaAddr( pcCU->getAddr(), pcCU->getZorderIdxInCU() + uiPartAddr ) + iRefOffset;
     
    14541307  Int dstStride = dstPic->getStride();
    14551308  Int depStride =  pPicBaseDepth->getStride();
    1456 #if MTK_DVPREFINE_BVSP_BUG_FIX
    14571309  Int depthPosX = Clip3(0,   widthLuma - size_x,  (posX/nTxtPerDepthX) + (mv->getHor()>>2));
    14581310  Int depthPosY = Clip3(0,   heightLuma- size_y,  (posY/nTxtPerDepthY) + (mv->getVer()>>2));
    1459 #else
    1460   Int depthPosX = Clip3(0,   widthLuma - size_x - 1,  (posX/nTxtPerDepthX) + (mv->getHor()>>2));
    1461   Int depthPosY = Clip3(0,   heightLuma- size_y - 1,  (posY/nTxtPerDepthY) + (mv->getVer()>>2));
    1462 #endif
    14631311  Pel *ref    = refPic->getLumaAddr() + posX + posY * refStride;
    14641312  Pel *dst    = dstPic->getLumaAddr(partAddr);
     
    16181466    depthPosX = posX * nDepthPerTxtX + (mv->getHor()>>2);        //mv denotes the disparity for VSP
    16191467  }
    1620 #if MTK_DVPREFINE_BVSP_BUG_FIX
    16211468  depthPosX = Clip3(0, widthDepth - (size_x<<1), depthPosX);
    1622 #else
    1623   depthPosX = Clip3(0, widthDepth - (size_x<<1) - 1, depthPosX);
    1624 #endif
    16251469  if ( heightChroma > heightDepth )
    16261470  {
     
    16351479    depthPosY = posY * nDepthPerTxtY + (mv->getVer()>>2);     //mv denotes the disparity for VSP
    16361480  }
    1637 #if MTK_DVPREFINE_BVSP_BUG_FIX
    16381481  depthPosY = Clip3(0, heightDepth - (size_y<<1), depthPosY);
    1639 #else
    1640   depthPosY = Clip3(0, heightDepth - (size_y<<1) - 1, depthPosY);
    1641 #endif
    16421482
    16431483  Pel *refCb  = refPic->getCbAddr() + posX + posY * refStride;
     
    23842224  iCUPelX = pcCU->getCUPelX() + g_auiRasterToPelX[g_auiZscanToRaster[pcCU->getZorderIdxInCU()]];
    23852225  iCUPelY = pcCU->getCUPelY() + g_auiRasterToPelY[g_auiZscanToRaster[pcCU->getZorderIdxInCU()]];
    2386 #if FIX_LGE_ILLUCOMP_B0045
    23872226  iRefX   = iCUPelX + (pMv->getHor() >> 2);
    23882227  iRefY   = iCUPelY + (pMv->getVer() >> 2);
    2389 #else
    2390   iRefX   = iCUPelX + (pMv->getHor() >> 3);
    2391   iRefY   = iCUPelY + (pMv->getVer() >> 3);
    2392 #endif
    23932228  uiWidth = pcCU->getWidth(0) >> 1;
    23942229  uiHeight = pcCU->getHeight(0) >> 1;
     
    30372872  getWedgePredDCs( pcWedgelet, piMask, iMaskStride, iPredDC1, iPredDC2, bAbove, bLeft );
    30382873
    3039 #if HHI_DMM_DELTADC_Q1_C0034
    3040 #else
    3041   if( bDelta )
    3042   {
    3043     xDeltaDCQuantScaleUp( pcCU, iDeltaDC1 );
    3044     xDeltaDCQuantScaleUp( pcCU, iDeltaDC2 );
    3045   }
    3046 #endif
    3047 
    30482874  // assign wedge pred DCs to prediction
    30492875  if( bDelta ) { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip ( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) ); }
     
    30642890  piMask += iMaskStride+1;
    30652891  getWedgePredDCs( pcContourWedge, piMask, iMaskStride, iPredDC1, iPredDC2, bAbove, bLeft );
    3066 
    3067 #if HHI_DMM_DELTADC_Q1_C0034
    3068 #else
    3069   if( bDelta )
    3070   {
    3071     xDeltaDCQuantScaleUp( pcCU, iDeltaDC1 );
    3072     xDeltaDCQuantScaleUp( pcCU, iDeltaDC2 );
    3073   }
    3074 #endif
    30752892
    30762893  // assign wedge pred DCs to prediction
     
    32493066  getWedgePredDCs( pcWedgelet, piMask, iMaskStride, iPredDC1, iPredDC2, bAbove, bLeft );
    32503067
    3251 #if HHI_DMM_DELTADC_Q1_C0034
    3252 #else
    3253   if( bDelta )
    3254   {
    3255     xDeltaDCQuantScaleUp( pcCU, iDeltaDC1 );
    3256     xDeltaDCQuantScaleUp( pcCU, iDeltaDC2 );
    3257   }
    3258 #endif
    3259 
    32603068  // assign wedge pred DCs to prediction
    32613069  if( bDelta ) { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) ); }
     
    32923100  piMask += iMaskStride+1;
    32933101  getWedgePredDCs( pcWedgelet, piMask, iMaskStride, iPredDC1, iPredDC2, bAbove, bLeft );
    3294 
    3295 #if HHI_DMM_DELTADC_Q1_C0034
    3296 #else
    3297   if( bDelta )
    3298   {
    3299     xDeltaDCQuantScaleUp( pcCU, iDeltaDC1 );
    3300     xDeltaDCQuantScaleUp( pcCU, iDeltaDC2 );
    3301   }
    3302 #endif
    33033102
    33043103  // assign wedge pred DCs to prediction
Note: See TracChangeset for help on using the changeset viewer.