Ignore:
Timestamp:
13 Nov 2013, 02:24:21 (11 years ago)
Author:
lg
Message:

Integration of "Removal of redundancy on VSP, ARP and IC"
FJCT3V-F0104
MACRO "LGE_SHARP_VSP_INHERIT_F0104"

By Taesup Kim (taesup.kim@…)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev2-LG/source/Lib/TLibCommon/TComDataCU.cpp

    r683 r690  
    35263526  Bool bDepthIPMCAvai = false;
    35273527#endif
     3528
     3529#if LGE_SHARP_VSP_INHERIT_F0104
     3530#if H_3D_IC
     3531  Bool bICFlag = getICFlag(uiAbsPartIdx);
     3532#endif
     3533#if H_3D_ARP
     3534  Bool bARPFlag = getARPW(uiAbsPartIdx)>0 ? true : false;
     3535#endif
     3536#endif
     3537
    35283538#if H_3D_IV_MERGE
    35293539 
     
    37473757#endif
    37483758#if H_3D_VSP
    3749       if (pcCULeft->getVSPFlag(uiLeftPartIdx) == 1)
     3759      if (pcCULeft->getVSPFlag(uiLeftPartIdx) == 1
     3760#if LGE_SHARP_VSP_INHERIT_F0104
     3761#if H_3D_IC
     3762          && !bICFlag
     3763#endif
     3764#if H_3D_ARP
     3765          && !bARPFlag
     3766#endif
     3767#endif
     3768          )
    37503769      {
    37513770        vspFlag[iCount] = 1;
     
    38353854#if H_3D_VSP
    38363855#if MTK_VSP_SIMPLIFICATION_F0111
    3837       if ( ( ( getAddr() - pcCUAbove->getAddr() ) == 0) && (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1) )
     3856      if ( ( ( getAddr() - pcCUAbove->getAddr() ) == 0) && (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1)
     3857#if LGE_SHARP_VSP_INHERIT_F0104
     3858#if H_3D_IC
     3859          && !bICFlag
     3860#endif
     3861#if H_3D_ARP
     3862          && !bARPFlag
     3863#endif
     3864#endif
     3865          )
    38383866#else
    3839       if (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1)
     3867      if (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1
     3868#if LGE_SHARP_VSP_INHERIT_F0104
     3869#if H_3D_IC
     3870          && !bICFlag
     3871#endif
     3872#if H_3D_ARP
     3873          && !bARPFlag
     3874#endif
     3875#endif
     3876          )
    38403877#endif
    38413878      {
     
    38973934#if H_3D_VSP
    38983935#if MTK_VSP_SIMPLIFICATION_F0111
    3899     if ( ( ( getAddr() - pcCUAboveRight->getAddr() ) == 0) && (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1) )
     3936    if ( ( ( getAddr() - pcCUAboveRight->getAddr() ) == 0) && (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1)
     3937#if LGE_SHARP_VSP_INHERIT_F0104
     3938#if H_3D_IC
     3939        && !bICFlag
     3940#endif
     3941#if H_3D_ARP
     3942        && !bARPFlag
     3943#endif
     3944#endif
     3945        )
    39003946#else
    3901     if (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1)
     3947    if (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1
     3948#if LGE_SHARP_VSP_INHERIT_F0104
     3949#if H_3D_IC
     3950        && !bICFlag
     3951#endif
     3952#if H_3D_ARP
     3953        && !bARPFlag
     3954#endif
     3955#endif
     3956        )
    39023957#endif
    39033958    {
     
    39834038  /////////////////////////////////////////////////
    39844039
    3985   if ( xAddVspCand( mrgCandIdx, &cDisInfo, iCount, abCandIsInter, pcMvFieldNeighbours, puhInterDirNeighbours, vspFlag ) )
     4040  if (
     4041#if LGE_SHARP_VSP_INHERIT_F0104
     4042#if H_3D_IC
     4043      !bICFlag &&
     4044#endif
     4045#if H_3D_ARP
     4046      !bARPFlag &&
     4047#endif
     4048#endif
     4049      xAddVspCand( mrgCandIdx, &cDisInfo, iCount, abCandIsInter, pcMvFieldNeighbours, puhInterDirNeighbours, vspFlag ) )
    39864050  {
    39874051    return;
     
    40234087#endif
    40244088#if H_3D_VSP
    4025     if (pcCULeftBottom->getVSPFlag(uiLeftBottomPartIdx) == 1)
     4089    if (pcCULeftBottom->getVSPFlag(uiLeftBottomPartIdx) == 1
     4090#if LGE_SHARP_VSP_INHERIT_F0104
     4091#if H_3D_IC
     4092        && !bICFlag
     4093#endif
     4094#if H_3D_ARP
     4095        && !bARPFlag
     4096#endif
     4097#endif
     4098        )
    40264099    {
    40274100      vspFlag[iCount] = 1;
     
    40754148#if H_3D_VSP
    40764149#if MTK_VSP_SIMPLIFICATION_F0111
    4077       if ( ( ( getAddr() - pcCUAboveLeft->getAddr() ) == 0) && (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1) )
     4150      if ( ( ( getAddr() - pcCUAboveLeft->getAddr() ) == 0) && (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1)
     4151#if LGE_SHARP_VSP_INHERIT_F0104
     4152#if H_3D_IC
     4153          && !bICFlag
     4154#endif
     4155#if H_3D_ARP
     4156          && !bARPFlag
     4157#endif
     4158#endif
     4159          )
    40784160#else
    4079       if (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1)
     4161      if (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1
     4162#if LGE_SHARP_VSP_INHERIT_F0104
     4163#if H_3D_IC
     4164          && !bICFlag
     4165#endif
     4166#if H_3D_ARP
     4167          && !bARPFlag
     4168#endif
     4169#endif
     4170          )
    40804171#endif
    40814172      {
Note: See TracChangeset for help on using the changeset viewer.