Changeset 187 in 3DVCSoftware for branches


Ignore:
Timestamp:
15 Nov 2012, 17:09:52 (12 years ago)
Author:
tech
Message:

Added document numbers to macro switches.

Location:
branches/HTM-4.1-dev0/source
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-4.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r185 r187  
    349349  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 1    , "Lambda Scaling for VSO")
    350350
    351 #if HHI_VSO_LS_TABLE
     351#if HHI_VSO_LS_TABLE_M23714
    352352  ("VSOLSTable",                      m_bVSOLSTable             , true          , "Depth QP dependent video/depth rate allocation by Lagrange multiplier" )   
    353353#endif
    … …  
    732732#if HHI_VSO
    733733
    734 #if HHI_VSO_LS_TABLE
     734#if HHI_VSO_LS_TABLE_M23714
    735735  // Q&D
    736736  Double adLambdaScaleTable[] =
    … …  
    16401640    printf("VSO Negative Distortion      : %d\n",    m_bAllowNegDist ? 1 : 0);
    16411641#endif
    1642 #if HHI_VSO_LS_TABLE
     1642#if HHI_VSO_LS_TABLE_M23714
    16431643    printf("VSO LS Table                 : %d\n",    m_bVSOLSTable ? 1 : 0);   
    16441644#endif

  • branches/HTM-4.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r185 r187  
    292292  Char*     m_pchVSOConfig;
    293293  Bool      m_bUseVSO;                                    ///< flag for using View Synthesis Optimization
    294 #if HHI_VSO_LS_TABLE
     294#if HHI_VSO_LS_TABLE_M23714
    295295  Bool      m_bVSOLSTable;                                ///< Depth QP dependent Lagrange parameter optimization (m23714)
    296296#endif

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/CommonDef.h

    r185 r187  
    148148#endif
    149149
    150 #if SAIT_IMPROV_MOTION_PRED_M24829&!QC_MULTI_DIS_CAN
     150#if SAIT_IMPROV_MOTION_PRED_M24829&!QC_MULTI_DIS_CAN_A0097
    151151#define PDM_AMVP_POS                      0         // position of pdm in amvp list  (0..3)
    152152#else

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/ContextTables.h

    r177 r187  
    156156#endif
    157157
    158 #if LGE_EDGE_INTRA
     158#if LGE_EDGE_INTRA_A0070
    159159#define NUM_EDGE_INTRA_CTX            1
    160160#if LGE_EDGE_INTRA_DELTA_DC
    … …  
    13031303};
    13041304
    1305 #if LGE_EDGE_INTRA
     1305#if LGE_EDGE_INTRA_A0070
    13061306static const Short
    13071307INIT_EDGE_INTRA[3][NUM_EDGE_INTRA_CTX] =

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r185 r187  
    147147  m_pbResPredFlag      = NULL;
    148148#endif
    149 #if LGE_EDGE_INTRA
     149#if LGE_EDGE_INTRA_A0070
    150150  m_pucEdgeCode         = NULL;
    151151  m_pucEdgeNumber       = NULL;
    … …  
    293293    m_piContourPredTexDeltaDC2 = (Int* )xMalloc(Int,  uiNumPartition);
    294294#endif
    295 #if LGE_EDGE_INTRA
     295#if LGE_EDGE_INTRA_A0070
    296296    m_pucEdgeCode       = (UChar*)xMalloc(UChar, uiNumPartition * LGE_EDGE_INTRA_MAX_EDGE_NUM_PER_4x4);
    297297    m_pucEdgeNumber     = (UChar*)xMalloc(UChar, uiNumPartition);
    … …  
    420420    if ( m_piContourPredTexDeltaDC2 ) { xFree(m_piContourPredTexDeltaDC2); m_piContourPredTexDeltaDC2 = NULL; }
    421421#endif   
    422 #if LGE_EDGE_INTRA
     422#if LGE_EDGE_INTRA_A0070
    423423  if ( m_pbEdgeLeftFirst  ) { xFree(m_pbEdgeLeftFirst);   m_pbEdgeLeftFirst = NULL; }
    424424  if ( m_pucEdgeStartPos  ) { xFree(m_pucEdgeStartPos);   m_pucEdgeStartPos = NULL; }
    … …  
    12051205  m_piContourPredTexDeltaDC2 = pcCU->getContourPredTexDeltaDC2() + uiPart;   
    12061206#endif
    1207 #if LGE_EDGE_INTRA
     1207#if LGE_EDGE_INTRA_A0070
    12081208  if( pcCU->getSlice()->getSPS()->isDepth() )
    12091209  {
    … …  
    13881388#endif
    13891389
    1390 #if LGE_EDGE_INTRA
     1390#if LGE_EDGE_INTRA_A0070
    13911391  if( getSlice()->getSPS()->isDepth() )
    13921392  {
    … …  
    15141514#endif
    15151515
    1516 #if LGE_EDGE_INTRA
     1516#if LGE_EDGE_INTRA_A0070
    15171517  if( rpcCU->getSlice()->getSPS()->isDepth() )
    15181518  {
    … …  
    16411641#endif
    16421642
    1643 #if LGE_EDGE_INTRA
     1643#if LGE_EDGE_INTRA_A0070
    16441644  if( rpcCU->getSlice()->getSPS()->isDepth() )
    16451645  {
    … …  
    25422542  mapDMMtoIntraMode( iLeftIntraDir );
    25432543#endif
    2544 #if LGE_EDGE_INTRA
     2544#if LGE_EDGE_INTRA_A0070
    25452545  mapEdgeIntratoDC( iLeftIntraDir );
    25462546#endif
    … …  
    25572557  mapDMMtoIntraMode( iAboveIntraDir );
    25582558#endif
    2559 #if LGE_EDGE_INTRA
     2559#if LGE_EDGE_INTRA_A0070
    25602560  mapEdgeIntratoDC( iAboveIntraDir );
    25612561#endif
    … …  
    26432643}
    26442644
    2645 #if LGE_EDGE_INTRA
     2645#if LGE_EDGE_INTRA_A0070
    26462646UInt TComDataCU::getCtxEdgeIntra( UInt uiAbsPartIdx )
    26472647{
    … …  
    36763676#endif
    36773677
    3678 #if LGE_DVMCP
     3678#if LGE_DVMCP_A0126
    36793679#if QC_MRG_CANS_B0048
    36803680  acPdmMv[0].m_bDvMcp = acPdmMv[1].m_bDvMcp = acPdmMv[2].m_bDvMcp = acPdmMv[3].m_bDvMcp = false;
    … …  
    36843684#endif
    36853685
    3686 #if QC_MULTI_DIS_CAN
     3686#if QC_MULTI_DIS_CAN_A0097
    36873687  DisInfo cDisInfo;
    36883688  cDisInfo.iN = 0;
    36893689  if(!bNoPdmMerge)
    36903690  {
    3691 #if LGE_DVMCP
     3691#if LGE_DVMCP_A0126
    36923692#if LGE_IVMP_PARALLEL_MERGE_B0136 && !QC_SIMPLE_NBDV_B0047
    36933693    getDisMvpCand2(uiPUIdx, uiAbsPartIdx, &cDisInfo, true, REF_PIC_LIST_X, -1, true );
    … …  
    37813781        pcMvFieldNeighbours[(iCount<<1)+1 ].setMvField( acPdmMv[ 3 ], aiPdmRefIdx[ 3 ] );
    37823782      }
    3783 #if LGE_DVMCP
     3783#if LGE_DVMCP_A0126
    37843784      pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    37853785      pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    38483848#endif
    38493849#endif
    3850 #if LGE_DVMCP
     3850#if LGE_DVMCP_A0126
    38513851    pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    38523852    pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    39663966#endif
    39673967#endif
    3968 #if LGE_DVMCP
     3968#if LGE_DVMCP_A0126
    39693969    pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    39703970    pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    40624062    }
    40634063#endif
    4064 #if LGE_DVMCP
     4064#if LGE_DVMCP_A0126
    40654065    pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    40664066    pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    41444144      if(!bRemoveSpa)
    41454145      {
    4146 #if LGE_DVMCP
     4146#if LGE_DVMCP_A0126
    41474147        pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    41484148        pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    41954195    }
    41964196#endif
    4197 #if LGE_DVMCP
     4197#if LGE_DVMCP_A0126
    41984198    pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    41994199    pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    42944294      }
    42954295#endif
    4296 #if LGE_DVMCP
     4296#if LGE_DVMCP_A0126
    42974297      pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
    42984298      pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
    … …  
    44244424#endif
    44254425      }
    4426 #if LGE_DVMCP
     4426#if LGE_DVMCP_A0126
    44274427      pcMvFieldNeighbours[uiArrayAddr<<1    ].getMv().m_bDvMcp = false;
    44284428      pcMvFieldNeighbours[(uiArrayAddr<<1)+1].getMv().m_bDvMcp = false;
    … …  
    49034903  return m_pcSlice->getSPS()->getAMVPMode(m_puhDepth[uiIdx]);
    49044904}
    4905 #if QC_MULTI_DIS_CAN
     4905#if QC_MULTI_DIS_CAN_A0097
    49064906/** construct a list of disparity motion vectors from the neighbouring PUs **/
    49074907Void TComDataCU::getDisMvpCand ( UInt uiPartIdx, UInt uiPartAddr,DisInfo* pDInfo )
    … …  
    52295229}
    52305230
    5231 #if LGE_DVMCP
     5231#if LGE_DVMCP_A0126
    52325232#if QC_SIMPLE_NBDV_B0047
    52335233Void TComDataCU::getDisMvpCand2( UInt uiPartIdx, UInt uiPartAddr,DisInfo* pDInfo
    … …  
    58735873      DisInfo cDisInfo;
    58745874      cDisInfo.iN = 0;
    5875 #if LGE_DVMCP
     5875#if LGE_DVMCP_A0126
    58765876#if QC_SIMPLE_NBDV_B0047
    58775877#if FIX_LGE_IVMP_PARALLEL_MERGE_B0136
    … …  
    58945894      }
    58955895      TComMv  cPdmMvPred;
    5896 #if QC_MULTI_DIS_CAN
     5896#if QC_MULTI_DIS_CAN_A0097
    58975897      if( getPdmMvPredDisCan( uiPartIdx, eRefPicList, iRefIdx, cPdmMvPred, &cDisInfo ) )
    58985898#else
    … …  
    59285928  }
    59295929 
    5930 #if QC_MULTI_DIS_CAN && !SHARP_INTERVIEW_DECOUPLE_B0111
     5930#if QC_MULTI_DIS_CAN_A0097 && !SHARP_INTERVIEW_DECOUPLE_B0111
    59315931  DisInfo cDisInfo;
    59325932  cDisInfo.iN = 0;
    59335933  if(m_pcSlice->getSPS()->getViewId() && m_pcSlice->getSPS()->getMultiviewMvPredMode())
    59345934  {
    5935 #if LGE_DVMCP
     5935#if LGE_DVMCP_A0126
    59365936#if QC_SIMPLE_NBDV_B0047
    59375937#if FIX_LGE_IVMP_PARALLEL_MERGE_B0136
    … …  
    59595959  // get inter-view mv predictor (at position 0)
    59605960  TComMv  cPdmMvPred;
    5961 #if QC_MULTI_DIS_CAN
     5961#if QC_MULTI_DIS_CAN_A0097
    59625962  if( getPdmMvPredDisCan( uiPartIdx, eRefPicList, iRefIdx, cPdmMvPred, &cDisInfo ) )
    59635963#else
    … …  
    60186018  // get inter-view mv predictor (at position 1)
    60196019  TComMv  cPdmMvPred;
    6020 #if QC_MULTI_DIS_CAN
     6020#if QC_MULTI_DIS_CAN_A0097
    60216021  if( getPdmMvPredDisCan( uiPartIdx, eRefPicList, iRefIdx, cPdmMvPred, &cDisInfo ) )
    60226022#else
    … …  
    60706070  // get inter-view mv predictor (at position 2)
    60716071  TComMv  cPdmMvPred;
    6072 #if QC_MULTI_DIS_CAN
     6072#if QC_MULTI_DIS_CAN_A0097
    60736073  if( getPdmMvPredDisCan( uiPartIdx, eRefPicList, iRefIdx, cPdmMvPred, &cDisInfo ) )
    60746074#else
    … …  
    60906090    }
    60916091  }
    6092 #if QC_MULTI_DIS_CAN && !SHARP_INTERVIEW_DECOUPLE_B0111
     6092#if QC_MULTI_DIS_CAN_A0097 && !SHARP_INTERVIEW_DECOUPLE_B0111
    60936093  if ( getSlice()->getViewId()!=0 && pInfo->iN == 3 )
    60946094  {
    … …  
    61896189  // get inter-view mv predictor (at position 3)
    61906190  TComMv  cPdmMvPred;
    6191 #if QC_MULTI_DIS_CAN
     6191#if QC_MULTI_DIS_CAN_A0097
    61926192  if( getPdmMvPredDisCan( uiPartIdx, eRefPicList, iRefIdx, cPdmMvPred, &cDisInfo ) )
    61936193#else
    … …  
    63796379  {
    63806380    TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
    6381 #if LGE_DVMCP
     6381#if LGE_DVMCP_A0126
    63826382    cMvPred.m_bDvMcp = false;
    63836383#endif
    … …  
    64166416    {
    64176417      TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList2nd)->getMv(uiIdx);
    6418 #if LGE_DVMCP
     6418#if LGE_DVMCP_A0126
    64196419      cMvPred.m_bDvMcp = false;
    64206420#endif
    … …  
    65586558    {
    65596559      TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList2nd)->getMv(uiIdx);
    6560 #if LGE_DVMCP
     6560#if LGE_DVMCP_A0126
    65616561      cMvPred.m_bDvMcp = false;
    65626562#endif
    … …  
    65886588      rcMv = cMvPred.scaleMv( iScale );
    65896589    }
    6590 #if LGE_DVMCP
     6590#if LGE_DVMCP_A0126
    65916591    rcMv.m_bDvMcp = false;
    65926592#endif
    … …  
    66156615      rcMv = cMvPred.scaleMv( iScale );
    66166616    }
    6617 #if LGE_DVMCP
     6617#if LGE_DVMCP_A0126
    66186618    rcMv.m_bDvMcp = false;
    66196619#endif
    … …  
    66256625}
    66266626
    6627 #if QC_MULTI_DIS_CAN
     6627#if QC_MULTI_DIS_CAN_A0097
    66286628Bool TComDataCU::xGetColDisMV( RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv , Int & iTargetViewIdx, Int & iStartViewIdx )
    66296629{
    6630 #if LGE_DVMCP && !QC_SIMPLE_NBDV_B0047
     6630#if LGE_DVMCP_A0126 && !QC_SIMPLE_NBDV_B0047
    66316631  Int  iDvMcpDispX[2] = {-1,};
    66326632  Bool bDvMcpFlag [2] = { false, };
    … …  
    66476647    return false;
    66486648  }
    6649 #if LGE_DVMCP && !QC_SIMPLE_NBDV_B0047
     6649#if LGE_DVMCP_A0126 && !QC_SIMPLE_NBDV_B0047
    66506650  Bool bColIsSkipped = pColCU->isSkipped( uiAbsPartAddr );
    66516651#endif
    … …  
    66716671    if ( iColViewIdx    == iColRefViewIdx ) // temporal vector
    66726672    {
    6673 #if LGE_DVMCP && !QC_SIMPLE_NBDV_B0047
     6673#if LGE_DVMCP_A0126 && !QC_SIMPLE_NBDV_B0047
    66746674      if( iColViewIdx >0 )
    66756675      {
    … …  
    66896689    {
    66906690      rcMv = pColCU->getCUMvField(eColRefPicList)->getMv(uiAbsPartAddr);
    6691 #if LGE_DVMCP
     6691#if LGE_DVMCP_A0126
    66926692      rcMv.m_bDvMcp = false;
    66936693#endif
    … …  
    66986698  }
    66996699
    6700 #if LGE_DVMCP && !QC_SIMPLE_NBDV_B0047
     6700#if LGE_DVMCP_A0126 && !QC_SIMPLE_NBDV_B0047
    67016701  for( Int ilist=0 ; ilist<2 ; ilist++ )
    67026702  {
    … …  
    77357735  memcpy( m_puhInterDir + uiAbsPartIdxDst, pcCU->getInterDir() + uiAbsPartIdxSrc,       sizeof( m_puhInterDir[0] ) * uiNumPartition );
    77367736
    7737 #if !MTK_UNCONSTRAINED_MVI
     7737#if !MTK_UNCONSTRAINED_MVI_B0083
    77387738  memcpy( m_apiMVPIdx[0] + uiAbsPartIdxDst, pcCU->getMVPIdx(REF_PIC_LIST_0) + uiAbsPartIdxSrc, sizeof(*m_apiMVPIdx[0]) * uiNumPartition );
    77397739  memcpy( m_apiMVPIdx[1] + uiAbsPartIdxDst, pcCU->getMVPIdx(REF_PIC_LIST_1) + uiAbsPartIdxSrc, sizeof(*m_apiMVPIdx[0]) * uiNumPartition );
    … …  
    77457745  pcCU->getCUMvField( REF_PIC_LIST_1 )->copyTo( &m_acCUMvField[1], -Int(uiAbsPartIdxSrc) + uiAbsPartIdxDst, uiAbsPartIdxSrc, uiNumPartition );
    77467746
    7747 #if MTK_UNCONSTRAINED_MVI
     7747#if MTK_UNCONSTRAINED_MVI_B0083
    77487748  if( pcCU->getSlice()->getSliceType() == P_SLICE)
    77497749  {
    … …  
    77707770// -------------------------------------------------------------------------------------------------------------------
    77717771#if HHI_INTER_VIEW_MOTION_PRED
    7772 #if !QC_MULTI_DIS_CAN
     7772#if !QC_MULTI_DIS_CAN_A0097
    77737773Int
    77747774TComDataCU::getPdmMergeCandidate( UInt uiPartIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv )
    … …  
    78347834  TComResidualGenerator*  pcResidualGenerator = m_pcSlice->getSPS()->getResidualGenerator();
    78357835  ROFRS( pcResidualGenerator, false );
    7836 #if QC_MULTI_DIS_CAN
     7836#if QC_MULTI_DIS_CAN_A0097
    78377837  DisInfo cDisInfo;
    78387838  cDisInfo.iN = 0;
    78397839  PartSize m_peSaved =  getPartitionSize( 0 );
    78407840  m_pePartSize[0] =  SIZE_2Nx2N;
    7841 #if LGE_DVMCP
     7841#if LGE_DVMCP_A0126
    78427842#if QC_SIMPLE_NBDV_B0047
    78437843#if FIX_LGE_IVMP_PARALLEL_MERGE_B0136
    … …  
    78777877#endif
    78787878
    7879 #if LGE_EDGE_INTRA
     7879#if LGE_EDGE_INTRA_A0070
    78807880Void TComDataCU::reconPartition( UInt uiAbsPartIdx, UInt uiDepth, Bool bLeft, UChar ucStartPos, UChar ucNumEdge, UChar* pucEdgeCode, Bool* pbRegion )
    78817881{

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComDataCU.h

    r185 r187  
    221221#endif
    222222
    223 #if LGE_EDGE_INTRA
     223#if LGE_EDGE_INTRA_A0070
    224224  UChar*        m_pucEdgeCode;          ///< array of edge code
    225225  UChar*        m_pucEdgeNumber;        ///< total number of edge
    … …  
    284284  Void          deriveRightBottomIdx        ( PartSize eCUMode, UInt uiPartIdx, UInt& ruiPartIdxRB );
    285285  Bool          xGetColMVP( RefPicList eRefPicList, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int& riRefIdx );
    286 #if QC_MULTI_DIS_CAN
     286#if QC_MULTI_DIS_CAN_A0097
    287287  Bool          xGetColDisMV( RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int & iTargetViewIdx, Int & iStartViewIdx );
    288288#endif
    … …  
    542542
    543543#if HHI_INTER_VIEW_MOTION_PRED
    544 #if !QC_MULTI_DIS_CAN
     544#if !QC_MULTI_DIS_CAN_A0097
    545545  Int           getPdmMergeCandidate( UInt uiPartIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv );
    546546  Bool          getPdmMvPred( UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMv, Bool bMerge = false );
    … …  
    553553  );
    554554  Void          getDisMvpCand        ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* pDInfo );
    555 #if LGE_DVMCP
     555#if LGE_DVMCP_A0126
    556556#if QC_SIMPLE_NBDV_B0047
    557557  Void          getDisMvpCand2( UInt uiPartIdx, UInt uiPartAddr, DisInfo* pDInfo
    … …  
    733733  UInt&         getTotalBins            ()                            { return m_uiTotalBins;                                                                                                  }
    734734
    735 #if LGE_EDGE_INTRA
     735#if LGE_EDGE_INTRA_A0070
    736736  UInt          getCtxEdgeIntra ( UInt uiAbsPartIdx );
    737737#endif
    … …  
    817817#endif
    818818
    819 #if LGE_EDGE_INTRA
     819#if LGE_EDGE_INTRA_A0070
    820820  UChar*        getEdgeCode( UInt uiIdx )                 { return &m_pucEdgeCode[uiIdx * LGE_EDGE_INTRA_MAX_EDGE_NUM_PER_4x4]; }
    821821  UChar*        getEdgeNumber( )                          { return m_pucEdgeNumber;           }

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComDepthMapGenerator.cpp

    r185 r187  
    7878  m_uiSubSampExpX       = uiSubSampExpX;
    7979  m_uiSubSampExpY       = uiSubSampExpY;
    80 #if !QC_MULTI_DIS_CAN
     80#if !QC_MULTI_DIS_CAN_A0097
    8181  m_ppcYuv              = new TComYuv*    [ m_uiMaxDepth ];
    8282  m_ppcCU               = new TComDataCU* [ m_uiMaxDepth ];
    … …  
    102102  {
    103103    m_bCreated    = false;
    104 #if !QC_MULTI_DIS_CAN
     104#if !QC_MULTI_DIS_CAN_A0097
    105105    for( UInt uiDepth = 0; uiDepth < m_uiMaxDepth; uiDepth++ )
    106106    {
    … …  
    377377}
    378378
    379 #if !QC_MULTI_DIS_CAN
     379#if !QC_MULTI_DIS_CAN_A0097
    380380Bool
    381381TComDepthMapGenerator::predictDepthMap( TComPic* pcPic )
    … …  
    605605
    606606#if HHI_INTER_VIEW_MOTION_PRED
    607 #if QC_MULTI_DIS_CAN
     607#if QC_MULTI_DIS_CAN_A0097
    608608Int
    609609TComDepthMapGenerator::getPdmMergeCandidate( TComDataCU* pcCU, UInt uiPartIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo
    … …  
    620620  AOF  ( m_bCreated && m_bInit );
    621621
    622 #if !QC_MULTI_DIS_CAN
     622#if !QC_MULTI_DIS_CAN_A0097
    623623  ROFRS( m_bPDMAvailable, 0 );
    624624#endif
    … …  
    665665  TComPicYuv* pcBaseRec   = pcBasePic->getPicYuvRec   ();
    666666
    667 #if QC_MULTI_DIS_CAN
     667#if QC_MULTI_DIS_CAN_A0097
    668668  Int  iCurrPosX, iCurrPosY;
    669669  UInt          uiPartAddr;
    … …  
    719719              paiPdmRefIdx  [ uiBaseRefListId ] = iPdmRefIdx;
    720720              TComMv cMv(cBaseMvField.getHor(), cBaseMvField.getVer());
    721 #if LGE_DVMCP
     721#if LGE_DVMCP_A0126
    722722              cMv.m_bDvMcp = true;
    723723              cMv.m_iDvMcpDispX = pDInfo->m_acMvCand[0].getHor();
    … …  
    754754          paiPdmRefIdx  [ iRefListId ] = iPdmRefIdx;
    755755#endif
    756 #if QC_MULTI_DIS_CAN
     756#if QC_MULTI_DIS_CAN_A0097
    757757          TComMv cMv = pDInfo->m_acMvCand[0];
    758758          cMv.setVer(0);
    … …  
    795795      if( pcCU->getSlice()->getRefPOC( eRefPicList, iPdmRefIdx ) != pcCU->getSlice()->getPOC() )
    796796      {
    797 #if QC_MULTI_DIS_CAN
     797#if QC_MULTI_DIS_CAN_A0097
    798798        if( getDisCanPdmMvPred (pcCU, uiPartIdx, eRefPicList, iPdmRefIdx, cMv, pDInfo, true ) )       
    799799#else
    … …  
    821821      for( Int iPdmRefIdx = 0; iPdmRefIdx < iNumRefPics; iPdmRefIdx++ )
    822822      {
    823 #if QC_MULTI_DIS_CAN
     823#if QC_MULTI_DIS_CAN_A0097
    824824        if ( getDisCanPdmMvPred (pcCU, uiPartIdx, eRefPicList, iPdmRefIdx, cMv, pDInfo, true ) )
    825825#else
    … …  
    841841}
    842842
    843 #if QC_MULTI_DIS_CAN
     843#if QC_MULTI_DIS_CAN_A0097
    844844Bool
    845845TComDepthMapGenerator::getDisCanPdmMvPred    ( TComDataCU*   pcCU, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMv, DisInfo* pDInfo, Bool bMerge )
    846846{
    847 #if LGE_DVMCP
     847#if LGE_DVMCP_A0126
    848848  rcMv.m_bDvMcp = false;
    849849#endif
    … …  
    913913      {
    914914        rcMv.set( cBaseMvField.getHor(), cBaseMvField.getVer() );
    915 #if LGE_DVMCP
     915#if LGE_DVMCP_A0126
    916916        // save disparity vector when a merge candidate for IVMP is set as DV-MCP
    917917        if( bMerge )
    … …  
    10621062
    10631063
    1064 #if !QC_MULTI_DIS_CAN
     1064#if !QC_MULTI_DIS_CAN_A0097
    10651065/*=======================================================*
    10661066 *=====                                             =====*

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComDepthMapGenerator.h

    r185 r187  
    136136
    137137  Void  initViewComponent     ( TComPic*      pcPic );
    138 #if !QC_MULTI_DIS_CAN
     138#if !QC_MULTI_DIS_CAN_A0097
    139139  Bool  predictDepthMap       ( TComPic*      pcPic );
    140140  Void  updateDepthMap        ( TComPic*      pcPic );
    … …  
    151151  Int   getDisparity          ( TComPic*      pcPic, Int iPosX, Int iPosY, UInt uiRefViewId );
    152152#if HHI_INTER_VIEW_MOTION_PRED
    153 #if QC_MULTI_DIS_CAN
     153#if QC_MULTI_DIS_CAN_A0097
    154154  Int   getPdmMergeCandidate ( TComDataCU*   pcCU, UInt uiPartIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo
    155155#if QC_MRG_CANS_B0048
    … …  
    176176private:
    177177  // picture operations
    178 #if !QC_MULTI_DIS_CAN
     178#if !QC_MULTI_DIS_CAN_A0097
    179179  Bool  xConvertDepthMapCurr2Ref  ( TComPic*    pcRef, TComPic* pcCur );
    180180  Bool  xConvertDepthMapRef2Curr  ( TComPic*    pcCur, TComPic* pcRef );

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComMotionInfo.cpp

    r161 r187  
    377377
    378378
    379 #if MTK_UNCONSTRAINED_MVI
     379#if MTK_UNCONSTRAINED_MVI_B0083
    380380Void TComCUMvField::setUndefinedMv( Int iPartAddr, Int iNumPart, Char* pePredMode, UChar* puhInterDir, Int refIdx, Int InterDir )
    381381{

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComMotionInfo.h

    r185 r187  
    5959
    6060// ====================================================================================================================
    61 #if QC_MULTI_DIS_CAN
     61#if QC_MULTI_DIS_CAN_A0097
    6262typedef struct _DisCand
    6363{
    … …  
    176176#endif
    177177
    178 #if MTK_UNCONSTRAINED_MVI
     178#if MTK_UNCONSTRAINED_MVI_B0083
    179179  Void setUndefinedMv( Int iPartAddr, Int iNumPart, Char* pePredMode, UChar* puhInterDir, Int refIdx, Int InterDir );
    180180#endif

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComMv.h

    r100 r187  
    5757public:
    5858 
    59 #if LGE_DVMCP
     59#if LGE_DVMCP_A0126
    6060  Bool  m_bDvMcp;       // is dv-mcp ?
    6161  Int   m_iDvMcpDispX;  // disparity for dv-mcp
    … …  
    6969  m_iHor(0),
    7070  m_iVer(0)
    71 #if LGE_DVMCP
     71#if LGE_DVMCP_A0126
    7272  , m_bDvMcp(false)
    7373  , m_iDvMcpDispX(0)
    … …  
    7979  m_iHor(iHor),
    8080  m_iVer(iVer)
    81 #if LGE_DVMCP
     81#if LGE_DVMCP_A0126
    8282  , m_bDvMcp(false)
    8383  , m_iDvMcpDispX(0)

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComPattern.cpp

    r100 r187  
    675675{
    676676  Int* piSrc;
    677 #if LGE_EDGE_INTRA
     677#if LGE_EDGE_INTRA_A0070
    678678  mapEdgeIntratoDC( uiDirMode );
    679679#endif

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComPic.h

    r185 r187  
    7373#endif
    7474
    75 #if LG_ZEROINTRADEPTHRESI_M26039
     75#if LG_ZEROINTRADEPTHRESI_A0087
    7676  Int                   m_uiIntraPeriod;
    7777#endif
    … …  
    7979#if HHI_INTER_VIEW_MOTION_PRED
    8080  TComPicYuv*           m_pcOrgDepthMap;          //  original depth map
    81 #if QC_MULTI_DIS_CAN
     81#if QC_MULTI_DIS_CAN_A0097
    8282  Bool          m_checked;
    8383#endif
    … …  
    143143  TComVPS*      getVPS()              { return  m_apcPicSym->getSlice(m_uiCurrSliceIdx)->getVPS();  }
    144144#endif
    145 #if LG_ZEROINTRADEPTHRESI_M26039
     145#if LG_ZEROINTRADEPTHRESI_A0087
    146146  Int           getIntraPeriod()                           { return  m_uiIntraPeriod; }
    147147  Void          setIntraPeriod(Int uiIntraPeriod)          { m_uiIntraPeriod = uiIntraPeriod; }
    … …  
    169169#if HHI_INTER_VIEW_MOTION_PRED
    170170  TComPicYuv*   getOrgDepthMap()      { return  m_pcOrgDepthMap; }
    171 #if QC_MULTI_DIS_CAN
     171#if QC_MULTI_DIS_CAN_A0097
    172172  Void          setCandPicCheckedFlag (Bool bchecked)   { m_checked = bchecked; }
    173173  Bool          getCandPicCheckedFlag ()                { return m_checked;}

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComPrediction.cpp

    r158 r187  
    4646// ====================================================================================================================
    4747
    48 #if LGE_EDGE_INTRA
     48#if LGE_EDGE_INTRA_A0070
    4949#define MAX_DISTANCE_EDGEINTRA 255
    5050#endif
    … …  
    423423}
    424424
    425 #if LGE_EDGE_INTRA
     425#if LGE_EDGE_INTRA_A0070
    426426Void TComPrediction::predIntraLumaEdge ( TComDataCU* pcCU, TComPattern* pcTComPattern, UInt uiAbsPartIdx, Int iWidth, Int iHeight, Pel* piPred, UInt uiStride, Bool bDelta )
    427427{

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComPrediction.h

    r152 r187  
    133133#endif
    134134
    135 #if LGE_EDGE_INTRA
     135#if LGE_EDGE_INTRA_A0070
    136136  Pel  xGetNearestNeighbor  ( Int x, Int y, Int* pSrc, Int srcStride, Int iWidth, Int iHeight, Bool* bpRegion );
    137137  Void xPredIntraEdge       ( TComDataCU* pcCU, UInt uiAbsPartIdx, Int iWidth, Int iHeight, Int* pSrc, Int srcStride, Pel*& rpDst, Int dstStride, Bool bDelta = false );
    … …  
    183183  Bool  getWedgePatternIdx      ( WedgeRefList* pcWedgeRefList, UInt& ruiTabIdx, UChar uhXs, UChar uhYs, UChar uhXe, UChar uhYe );
    184184#endif
    185 #if LGE_EDGE_INTRA
     185#if LGE_EDGE_INTRA_A0070
    186186  Void predIntraLumaEdge          ( TComDataCU* pcCU, TComPattern* pcTComPattern, UInt uiAbsPartIdx, Int iWidth, Int iHeight, Pel* piPred, UInt uiStride, Bool bDelta = false );
    187187#endif

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp

    r100 r187  
    219219}
    220220
    221 #if QC_MULTI_DIS_CAN
     221#if QC_MULTI_DIS_CAN_A0097
    222222Bool
    223223TComResidualGenerator::getResidualSamples( TComDataCU* pcCU, UInt uiPUIdx, TComYuv* pcYuv, Int iDisp
    … …  
    243243  iBlkHeight  = pcCU->getHeight ( 0 );
    244244  pcCU->getPic()->getPicYuvRec()->getTopLeftSamplePos( pcCU->getAddr(), pcCU->getZorderIdxInCU() + uiPartAddr, iXPos, iYPos );
    245 #if QC_MULTI_DIS_CAN
     245#if QC_MULTI_DIS_CAN_A0097
    246246  return getResidualSamples( pcCU->getPic(), (UInt)iXPos, (UInt)iYPos, (UInt)iBlkWidth, (UInt)iBlkHeight, pcYuv, iDisp
    247247#if QC_SIMPLIFIEDIVRP_M24938
    … …  
    258258}
    259259 
    260 #if QC_MULTI_DIS_CAN
     260#if QC_MULTI_DIS_CAN_A0097
    261261Bool
    262262TComResidualGenerator::getResidualSamples( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp
    … …  
    283283  UInt uiXPosInRefView = uiXPos , uiYPosInRefView = uiYPos;
    284284#endif
    285 #if QC_MULTI_DIS_CAN
     285#if QC_MULTI_DIS_CAN_A0097
    286286  xSetPredResidualBlock( pcPic, uiBaseViewId, uiXPos, uiYPos, uiBlkWidth, uiBlkHeight, pcYuv, iDisp
    287287#if QC_SIMPLIFIEDIVRP_M24938
    … …  
    517517
    518518
    519 #if QC_MULTI_DIS_CAN
     519#if QC_MULTI_DIS_CAN_A0097
    520520Void 
    521521TComResidualGenerator::xSetPredResidualBlock( TComPic* pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp
    … …  
    548548
    549549  //===== get disparity =====
    550 #if QC_MULTI_DIS_CAN
     550#if QC_MULTI_DIS_CAN_A0097
    551551  Int iDisparity = iDisp;
    552552#else

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.h

    r100 r187  
    6969  Void  setRecResidualPic     ( TComPic*      pcPic );
    7070
    71 #if QC_MULTI_DIS_CAN
     71#if QC_MULTI_DIS_CAN_A0097
    7272  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Int iDisp
    7373#if QC_SIMPLIFIEDIVRP_M24938
    … …  
    100100  Void  xClearIntViewResidual ( TComDataCU*   pcCU,  TComYuv* pcCUResidual, UInt uiPartIdx    );
    101101  Void  xClearResidual        (                      TComYuv* pcCUResidual, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight );
    102 #if QC_MULTI_DIS_CAN
     102#if QC_MULTI_DIS_CAN_A0097
    103103  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp
    104104#if QC_SIMPLIFIEDIVRP_M24938

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TComRom.h

    r177 r187  
    216216#endif
    217217
    218 #if LGE_EDGE_INTRA
     218#if LGE_EDGE_INTRA_A0070
    219219__inline Void mapEdgeIntratoDC( UChar& curDir ) { curDir = (curDir >= EDGE_INTRA_IDX) ? DC_IDX : curDir; }
    220220__inline Void mapEdgeIntratoDC(  UInt& curDir ) { curDir = (curDir >= EDGE_INTRA_IDX) ? DC_IDX : curDir; }

  • branches/HTM-4.1-dev0/source/Lib/TLibCommon/TypeDef.h

    r186 r187  
    4242//! \{
    4343
    44 #define OL_QTLIMIT_PREDCODING_B0068       1    //JCT3V-B0068
    45 
    46 #define MTK_UNCONSTRAINED_MVI             1    //JCT3V-B0083
    47 
    48 
    4944///// ***** FIXES *********
    5045// A
    … …  
    7570#define HHI_DMM_WEDGE_INTRA               1   // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction)
    7671#define HHI_DMM_PRED_TEX                  1   // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction )
    77 #define LGE_EDGE_INTRA                    1   // JCT2-A0070
     72#define LGE_EDGE_INTRA_A0070              1   // JCT2-A0070
    7873#define RWTH_SDC_DLT_B0036                1   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
    7974#define HHIQC_DMMFASTSEARCH_B0039         1   // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3
    … …  
    8277#define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction
    8378#define SHARP_INTERVIEW_DECOUPLE_B0111    1   // JCT3V-B0111 decoupling inter-view candidate
    84 #define QC_MRG_CANS_B0048                 1   // JCT2-B0048, B0086, B0069
     79#define QC_MRG_CANS_B0048                 1   // JCT3V-B0048, B0086, B0069
    8580#if     QC_MRG_CANS_B0048
    8681#define OL_DISMV_POS_B0069                1   // different pos for dispairty MV candidate, B0069
    … …  
    10499
    105100///// ***** DISPARITY VECTOR DERIVATION *********
    106 #define QC_MULTI_DIS_CAN                  1   // JCT2-A0097
    107 #define LGE_DVMCP                         1   // JCT2-A0126     
    108 #define LGE_DVMCP_MEM_REDUCTION_B0135     1
     101#define QC_MULTI_DIS_CAN_A0097            1   // JCT3V-A0097
     102#define LGE_DVMCP_A0126                   1   // JCT3V-A0126     
     103#define LGE_DVMCP_MEM_REDUCTION_B0135     1   // JCT3V-B0135     
    109104#define DV_DERIVATION_PARALLEL_B0096      1   // JCT3V-B0096, enable parallel derivation of disparity vector
    110 #define QC_SIMPLE_NBDV_B0047              1   // JCT2-B0047
     105#define QC_SIMPLE_NBDV_B0047              1   // JCT3V-B0047
    111106
    112107///// ***** MOTION PARAMETER INHERITANCE  *********
    … …  
    115110#define FIX_MPI_B0065                     1   // JCT3V-B0065, fix the MPI bug when RQT is off
    116111#endif
     112#define MTK_UNCONSTRAINED_MVI_B0083       1    //JCT3V-B0083
    117113
    118114///// ***** VIEW SYNTHESIS OPTIMIZAION *********
    119115#define HHI_VSO                           1
    120 #define HHI_VSO_LS_TABLE                  1   // m23714, enable table base Lagrange multiplier optimization
     116#define HHI_VSO_LS_TABLE_M23714           1   // m23714, enable table base Lagrange multiplier optimization
    121117#define HHI_VSO_DIST_INT                  1   // Allow negative synthesized view distortion change
    122118#define HHI_VSO_SYNTH_DIST_OUT            0   // Output of synthesized view distortion instead of depth distortion in encoder output
    … …  
    140136#define HHI_INTERVIEW_SKIP                1
    141137
     138///// ***** QUADTREE LIMITATION *********
     139#define OL_QTLIMIT_PREDCODING_B0068       1    //JCT3V-B0068
     140
    142141///// ***** OTHERS *********
    143 #define LG_ZEROINTRADEPTHRESI_M26039      1   // JCT2-A0087
     142#define LG_ZEROINTRADEPTHRESI_A0087       1   // JCT2-A0087
    144143#define SONY_COLPIC_AVAILABILITY          1
    145144#define HHI_FULL_PEL_DEPTH_MAP_MV_ACC     1   // full-pel mv accuracy for depth maps
    … …  
    149148
    150149///// ***** DEFINED PARAMETERS *********
    151 #if QC_MULTI_DIS_CAN                   
     150#if QC_MULTI_DIS_CAN_A0097                   
    152151#define DIS_CANS                          1
    153152#endif                                 
    … …  
    161160#endif
    162161
    163 #if LGE_EDGE_INTRA
     162#if LGE_EDGE_INTRA_A0070
    164163#define LGE_EDGE_INTRA_MIN_SIZE           4
    165164#define LGE_EDGE_INTRA_MAX_SIZE           32
    … …  
    171170
    172171
    173 #if LGE_DVMCP                           
     172#if LGE_DVMCP_A0126                           
    174173#define DVFROM_LEFTBELOW                  1
    175174#define DVFROM_LEFT                       2
    … …  
    336335#define LOG2_SCAN_SET_SIZE                4
    337336
    338 #if LGE_EDGE_INTRA
     337#if LGE_EDGE_INTRA_A0070
    339338#if LGE_EDGE_INTRA_DELTA_DC
    340339#define FAST_UDI_MAX_RDMODE_NUM               37          ///< maximum number of RD comparison in fast-UDI estimation loop
    … …  
    384383#endif
    385384
    386 #if LGE_EDGE_INTRA
     385#if LGE_EDGE_INTRA_A0070
    387386#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
    388387#define EDGE_INTRA_IDX  (NUM_INTRA_MODE+NUM_DMM_MODE)

  • branches/HTM-4.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r185 r187  
    738738                                     m_pcPrediction->getPredicBufHeight (),
    739739                                     bAboveAvail, bLeftAvail );
    740 #if LGE_EDGE_INTRA
     740#if LGE_EDGE_INTRA_A0070
    741741  if( uiLumaPredMode >= EDGE_INTRA_IDX )
    742742  {

  • branches/HTM-4.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

    r185 r187  
    303303    {
    304304      m_pcDepthMapGenerator->initViewComponent( rpcPic );
    305 #if !QC_MULTI_DIS_CAN
     305#if !QC_MULTI_DIS_CAN_A0097
    306306      m_pcDepthMapGenerator->predictDepthMap  ( rpcPic );
    307307#endif
    … …  
    348348#endif
    349349#if DEPTH_MAP_GENERATION
    350 #if !QC_MULTI_DIS_CAN
     350#if !QC_MULTI_DIS_CAN_A0097
    351351    // update virtual depth map
    352352    m_pcDepthMapGenerator->updateDepthMap( rpcPic );

  • branches/HTM-4.1-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

    r181 r187  
    106106, m_cDmmDataSCModel           ( 1,             1,               NUM_DMM_DATA_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
    107107#endif
    108 #if LGE_EDGE_INTRA
     108#if LGE_EDGE_INTRA_A0070
    109109, m_cEdgeIntraSCModel         ( 1,             1,               NUM_EDGE_INTRA_CTX            , m_contextModels + m_numContextModels, m_numContextModels)
    110110#if LGE_EDGE_INTRA_DELTA_DC
    … …  
    206206
    207207  m_cCUTransSubdivFlagSCModel.initBuffer ( sliceType, qp, (UChar*)INIT_TRANS_SUBDIV_FLAG );
    208 #if LGE_EDGE_INTRA
     208#if LGE_EDGE_INTRA_A0070
    209209  m_cEdgeIntraSCModel.initBuffer         ( sliceType, qp, (UChar*)INIT_EDGE_INTRA );
    210210#if LGE_EDGE_INTRA_DELTA_DC
    … …  
    980980#endif
    981981
    982 #if LGE_EDGE_INTRA
     982#if LGE_EDGE_INTRA_A0070
    983983    Bool bCodeEdgeIntra = false;
    984984    if( pcCU->getSlice()->getSPS()->isDepth() )
    … …  
    996996#endif
    997997    Int uiPredNum = pcCU->getIntraDirLumaPredictor(uiAbsPartIdx, uiPreds); 
    998 #if LGE_EDGE_INTRA
     998#if LGE_EDGE_INTRA_A0070
    999999    UInt uiCheckBit = 0;
    10001000#endif
    … …  
    10211021
    10221022      m_pcTDecBinIf->decodeBinsEP( uiSymbol, 5 );
    1023 #if LGE_EDGE_INTRA
     1023#if LGE_EDGE_INTRA_A0070
    10241024      if (bCodeEdgeIntra)
    10251025      {
    … …  
    10571057      }
    10581058#endif
    1059 #if LGE_EDGE_INTRA
     1059#if LGE_EDGE_INTRA_A0070
    10601060      if ( intraPredMode != EDGE_INTRA_IDX)
    10611061      {
    … …  
    10651065          intraPredMode += ( intraPredMode >= uiPreds[i] );
    10661066        }
    1067 #if LGE_EDGE_INTRA
    1068       }
    1069 #endif
    1070     }
    1071 
    1072 #if LGE_EDGE_INTRA
     1067#if LGE_EDGE_INTRA_A0070
     1068      }
     1069#endif
     1070    }
     1071
     1072#if LGE_EDGE_INTRA_A0070
    10731073    if( intraPredMode == EDGE_INTRA_IDX )
    10741074    {
    … …  
    22142214#endif
    22152215
    2216 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA && LGE_EDGE_INTRA_DELTA_DC)
     2216#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA_A0070 && LGE_EDGE_INTRA_DELTA_DC)
    22172217Void TDecSbac::xReadExGolombLevel( UInt& ruiSymbol, ContextModel& rcSCModel  )
    22182218{
    … …  
    24732473#endif
    24742474
    2475 #if LGE_EDGE_INTRA
     2475#if LGE_EDGE_INTRA_A0070
    24762476Void TDecSbac::xParseEdgeIntraInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    24772477{

  • branches/HTM-4.1-dev0/source/Lib/TLibDecoder/TDecSbac.h

    r177 r187  
    152152#endif
    153153 
    154 #if LGE_EDGE_INTRA
     154#if LGE_EDGE_INTRA_A0070
    155155  Void xParseEdgeIntraInfo ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    156156#endif
    … …  
    269269  ContextModel3DBuffer m_cDmmDataSCModel;
    270270#endif
    271 #if LGE_EDGE_INTRA
     271#if LGE_EDGE_INTRA_A0070
    272272  ContextModel3DBuffer m_cEdgeIntraSCModel;
    273273#if LGE_EDGE_INTRA_DELTA_DC

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r185 r187  
    26632663  assert( bRecursiveCall == ( uhDepth != uhTextureModeDepth ) );
    26642664
    2665 #if !MTK_UNCONSTRAINED_MVI
     2665#if !MTK_UNCONSTRAINED_MVI_B0083
    26662666  if( uhDepth == uhTextureModeDepth )
    26672667  {

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

    r185 r187  
    708708      // init view component and predict virtual depth map
    709709      m_pcDepthMapGenerator->initViewComponent( pcPic );
    710 #if !QC_MULTI_DIS_CAN
     710#if !QC_MULTI_DIS_CAN_A0097
    711711      m_pcDepthMapGenerator->predictDepthMap  ( pcPic );
    712712#endif
    … …  
    784784#endif
    785785#if DEPTH_MAP_GENERATION
    786 #if !QC_MULTI_DIS_CAN
     786#if !QC_MULTI_DIS_CAN_A0097
    787787      // update virtual depth map
    788788      m_pcDepthMapGenerator->updateDepthMap( pcPic );

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSbac.cpp

    r181 r187  
    114114, m_cDmmDataSCModel           ( 1,             1,               NUM_DMM_DATA_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
    115115#endif
    116 #if LGE_EDGE_INTRA
     116#if LGE_EDGE_INTRA_A0070
    117117, m_cEdgeIntraSCModel         ( 1,             1,               NUM_EDGE_INTRA_CTX            , m_contextModels + m_numContextModels, m_numContextModels)
    118118#if LGE_EDGE_INTRA_DELTA_DC
    … …  
    205205  m_cDmmDataSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_DMM_DATA );
    206206#endif
    207 #if LGE_EDGE_INTRA
     207#if LGE_EDGE_INTRA_A0070
    208208  m_cEdgeIntraSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_EDGE_INTRA );
    209209#if LGE_EDGE_INTRA_DELTA_DC
    … …  
    957957}
    958958
    959 #if LGE_EDGE_INTRA
     959#if LGE_EDGE_INTRA_A0070
    960960Void TEncSbac::xCodeEdgeIntraInfo( TComDataCU* pcCU, UInt uiPartIdx )
    961961{
    … …  
    10381038  if( pcCU->getSlice()->getSPS()->getUseDMM() && pcCU->getWidth( uiAbsPartIdx ) <= DMM_WEDGEMODEL_MAX_SIZE )
    10391039  {
    1040 #if LGE_EDGE_INTRA
     1040#if LGE_EDGE_INTRA_A0070
    10411041    m_pcBinIf->encodeBin( uiDir >= NUM_INTRA_MODE && uiDir < EDGE_INTRA_IDX, m_cDmmFlagSCModel.get(0, 0, 0) );
    10421042#else
    … …  
    10441044#endif
    10451045  }
    1046 #if LGE_EDGE_INTRA
     1046#if LGE_EDGE_INTRA_A0070
    10471047  if( uiDir >= NUM_INTRA_MODE && uiDir < EDGE_INTRA_IDX )
    10481048#else
    … …  
    10811081  }
    10821082  else
    1083 #if LGE_EDGE_INTRA
     1083#if LGE_EDGE_INTRA_A0070
    10841084    if ( uiDir >= EDGE_INTRA_IDX)
    10851085    {
    … …  
    11161116  Int iIntraIdx = pcCU->getIntraSizeIdx(uiAbsPartIdx);
    11171117#endif
    1118 #if LGE_EDGE_INTRA
     1118#if LGE_EDGE_INTRA_A0070
    11191119  Bool bCodeEdgeIntra = false;
    11201120  if( pcCU->getSlice()->getSPS()->isDepth() )
    … …  
    11821182#if LOGI_INTRA_NAME_3MPM
    11831183    m_pcBinIf->encodeBinsEP( uiDir, 5 );
    1184 #if LGE_EDGE_INTRA
     1184#if LGE_EDGE_INTRA_A0070
    11851185  if (bCodeEdgeIntra)
    11861186    if (uiDir == 31) m_pcBinIf->encodeBinsEP(0,1);
    … …  
    25242524}
    25252525
    2526 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA && LGE_EDGE_INTRA_DELTA_DC)
     2526#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA_A0070 && LGE_EDGE_INTRA_DELTA_DC)
    25272527Void TEncSbac::xWriteExGolombLevel( UInt uiSymbol, ContextModel& rcSCModel  )
    25282528{

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSbac.h

    r177 r187  
    181181  Void  xCodeContourPredTexDeltaInfo( TComDataCU* pcCU, UInt uiAbsPartIdx );
    182182#endif
    183 #if LGE_EDGE_INTRA
     183#if LGE_EDGE_INTRA_A0070
    184184  Void  xCodeEdgeIntraInfo( TComDataCU* pcCU, UInt uiPartIdx );
    185185#endif
    … …  
    322322  ContextModel3DBuffer m_cDmmDataSCModel;
    323323#endif
    324 #if LGE_EDGE_INTRA
     324#if LGE_EDGE_INTRA_A0070
    325325  ContextModel3DBuffer m_cEdgeIntraSCModel;
    326326#if LGE_EDGE_INTRA_DELTA_DC

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r185 r187  
    965965                                TComYuv*    pcResiYuv,
    966966                                Dist&       ruiDist
    967 #if LG_ZEROINTRADEPTHRESI_M26039
     967#if LG_ZEROINTRADEPTHRESI_A0087
    968968                                ,Bool        bZeroResi
    969969#endif
    … …  
    10001000  pcCU->getPattern()->initAdiPattern( pcCU, uiAbsPartIdx, uiTrDepth, m_piYuvExt, m_iYuvExtStride, m_iYuvExtHeight, bAboveAvail, bLeftAvail );
    10011001 
    1002 #if LGE_EDGE_INTRA
     1002#if LGE_EDGE_INTRA_A0070
    10031003  if( uiLumaPredMode >= EDGE_INTRA_IDX )
    10041004  {
    … …  
    10481048    }
    10491049  }
    1050 #if LG_ZEROINTRADEPTHRESI_M26039
     1050#if LG_ZEROINTRADEPTHRESI_A0087
    10511051  if(bZeroResi)
    10521052  {
    … …  
    13651365#endif
    13661366                                Double&      dRDCost
    1367 #if LG_ZEROINTRADEPTHRESI_M26039
     1367#if LG_ZEROINTRADEPTHRESI_A0087
    13681368                               ,Bool         bZeroResi
    13691369#endif
    … …  
    13871387  }
    13881388#endif
    1389 #if LGE_EDGE_INTRA
     1389#if LGE_EDGE_INTRA_A0070
    13901390  if( pcCU->getLumaIntraDir( uiAbsPartIdx ) >= EDGE_INTRA_IDX )
    13911391  {
    … …  
    14091409    //----- code luma block with given intra prediction mode and store Cbf-----
    14101410    dSingleCost   = 0.0;
    1411 #if LG_ZEROINTRADEPTHRESI_M26039
     1411#if LG_ZEROINTRADEPTHRESI_A0087
    14121412    xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, uiSingleDistY, bZeroResi );
    14131413#else
    … …  
    20482048    Int numModesForFullRD = g_aucIntraModeNumFast[ uiWidthBit ];
    20492049   
    2050 #if LGE_EDGE_INTRA
     2050#if LGE_EDGE_INTRA_A0070
    20512051  Bool bTestEdgeIntra = false;
    20522052  if ( m_pcEncCfg->isDepthCoder() && uiWidth >= LGE_EDGE_INTRA_MIN_SIZE && uiWidth <= LGE_EDGE_INTRA_MAX_SIZE && uiWidth == uiHeight )
    … …  
    21522152        if( bTestDmm ) bTestDmm = uiSad ? true : false;
    21532153#endif
    2154 #if LGE_EDGE_INTRA
     2154#if LGE_EDGE_INTRA_A0070
    21552155        if ( bTestEdgeIntra ) bTestEdgeIntra = uiSad ? true : false;
    21562156#endif
    … …  
    22622262    }
    22632263#endif
    2264 #if LGE_EDGE_INTRA
     2264#if LGE_EDGE_INTRA_A0070
    22652265  if( bTestEdgeIntra )
    22662266  {
    … …  
    22932293    for( UInt uiMode = 0; uiMode < numModesForFullRD; uiMode++ )
    22942294    {
    2295 #if LG_ZEROINTRADEPTHRESI_M26039
     2295#if LG_ZEROINTRADEPTHRESI_A0087
    22962296    Bool bAllowZeroResi = pcCU->getSlice()->getIsDepth() && (pcCU->getSlice()->getPOC()%pcCU->getPic()->getIntraPeriod());// && (uiMode < NUM_INTRA_MODE);
    22972297    for(UInt uiCnt = 0; uiCnt < (bAllowZeroResi ? 2 : 1); uiCnt++)
    … …  
    23042304#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    23052305      if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight )
    2306 #if LGE_EDGE_INTRA
     2306#if LGE_EDGE_INTRA_A0070
    23072307        && uiOrgMode < EDGE_INTRA_IDX
    23082308#endif
    … …  
    23622362#endif
    23632363#if HHI_RQT_INTRA_SPEEDUP
    2364 #if LG_ZEROINTRADEPTHRESI_M26039
     2364#if LG_ZEROINTRADEPTHRESI_A0087
    23652365      xRecurIntraCodingQT( pcCU, uiInitTrDepth, uiPartOffset, bLumaOnly, pcOrgYuv, pcPredYuv, pcResiYuv, uiPUDistY, uiPUDistC, true, dPUCost, bZeroResi );
    23662366#else
    … …  
    24212421      }
    24222422#endif
    2423 #if LG_ZEROINTRADEPTHRESI_M26039
     2423#if LG_ZEROINTRADEPTHRESI_A0087
    24242424    }
    24252425#endif
    … …  
    69916991#endif
    69926992
    6993 #if LGE_EDGE_INTRA
     6993#if LGE_EDGE_INTRA_A0070
    69946994Bool TEncSearch::xCheckTerminatedEdge( Bool* pbEdge, Int iX, Int iY, Int iWidth, Int iHeight )
    69956995{

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSearch.h

    r177 r187  
    260260                                    TComYuv*     pcResiYuv,
    261261                                    Dist&        ruiDist
    262 #if LG_ZEROINTRADEPTHRESI_M26039
     262#if LG_ZEROINTRADEPTHRESI_A0087
    263263                                   ,Bool        bZeroResi = false
    264264#endif
    … …  
    285285#endif
    286286                                    Double&      dRDCost
    287 #if LG_ZEROINTRADEPTHRESI_M26039
     287#if LG_ZEROINTRADEPTHRESI_A0087
    288288                                   ,Bool         bZeroResi = false
    289289#endif
    … …  
    342342#endif
    343343
    344 #if LGE_EDGE_INTRA
     344#if LGE_EDGE_INTRA_A0070
    345345  Bool  xEdgePartition       ( TComDataCU* pcCU, UInt uiPartIdx, Bool bPU4x4 );
    346346  Bool  xCheckTerminatedEdge ( Bool* pbEdge, Int iX, Int iY, Int iWidth, Int iHeight );

  • branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

    r181 r187  
    650650  TComSlice* pcSlice            = rpcPic->getSlice(getSliceIdx());
    651651  xDetermineStartAndBoundingCUAddr ( uiStartCUAddr, uiBoundingCUAddr, rpcPic, false );
    652 #if LG_ZEROINTRADEPTHRESI_M26039
     652#if LG_ZEROINTRADEPTHRESI_A0087
    653653  rpcPic->setIntraPeriod(this->m_pcCfg->getIntraPeriod());
    654654#endif
Note: See TracChangeset for help on using the changeset viewer.