Changeset 615 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib/TLibEncoder


Ignore:
Timestamp:
6 Sep 2013, 00:42:44 (12 years ago)
Author:
tech
Message:

Cleanups and macro removals related to merge and vsp

  • MTK_VSP_FIX_ALIGN_WD_E0172
  • H_3D_FIX_BVSP
  • QC_INRIA_MTK_MRG_E0126
  • MTK_DVMCP_FIX_E0172
  • TComDataCU::xAddVspCand
  • TComDataCU::xAddIvMRGCand
  • TComDataCU::getInterMergeCandidates
Location:
branches/HTM-8.0-dev0/source/Lib/TLibEncoder
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.0-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r608 r615  
    848848    } 
    849849  }
    850 #if H_3D_TMVP
    851850  WRITE_FLAG( pcVPS->getIvMvScalingFlag( ) ? 1 : 0 ,          "iv_mv_scaling_flag" );
    852 #endif
    853851#else
    854852  WRITE_FLAG( 0,                                             "vps_extension2_flag" );

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

    r608 r615  
    416416
    417417  Bool    bTrySplitDQP  = true;
    418 #if MTK_VSP_FIX_ALIGN_WD_E0172
     418#if H_3D_VSP
    419419  DisInfo DvInfo;
    420420  DvInfo.bDV = false;
    … …  
    530530
    531531#if H_3D_NBDV
    532 #if !MTK_VSP_FIX_ALIGN_WD_E0172
    533       DisInfo DvInfo;
    534       DvInfo.bDV = false;
    535       DvInfo.m_acNBDV.setZero();
    536       DvInfo.m_aVIdxCan = 0;
    537 #if H_3D_NBDV_REF
    538       DvInfo.m_acDoNBDV.setZero();
    539 #endif
    540 #endif
    541532      if( rpcTempCU->getSlice()->getSliceType() != I_SLICE )
    542533      {
    … …  
    598589          xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N );  rpcTempCU->initEstData( uiDepth, iQP );//by Competition for inter_2Nx2N
    599590#endif
    600 #if MTK_VSP_FIX_ALIGN_WD_E0172
     591#if H_3D_VSP
    601592          rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    602593#endif
    … …  
    611602#endif
    612603        rpcTempCU->initEstData( uiDepth, iQP );
    613 #if MTK_VSP_FIX_ALIGN_WD_E0172
     604#if H_3D_VSP
    614605        rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    615606#endif
    … …  
    638629            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N );  rpcTempCU->initEstData( uiDepth, iQP );
    639630#endif
    640 #if MTK_VSP_FIX_ALIGN_WD_E0172
     631#if H_3D_VSP
    641632            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    642633#endif
    … …  
    725716#endif
    726717                rpcTempCU->initEstData( uiDepth, iQP );
    727 #if MTK_VSP_FIX_ALIGN_WD_E0172
     718#if H_3D_VSP
    728719                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    729720#endif
    … …  
    745736#endif
    746737            rpcTempCU->initEstData( uiDepth, iQP );
    747 #if MTK_VSP_FIX_ALIGN_WD_E0172
     738#if H_3D_VSP
    748739            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    749740#endif
    … …  
    765756#endif
    766757            rpcTempCU->initEstData( uiDepth, iQP );
    767 #if MTK_VSP_FIX_ALIGN_WD_E0172
     758#if H_3D_VSP
    768759            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    769760#endif
    … …  
    804795#endif
    805796                rpcTempCU->initEstData( uiDepth, iQP );
    806 #if MTK_VSP_FIX_ALIGN_WD_E0172
     797#if H_3D_VSP
    807798                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    808799#endif
    … …  
    824815#endif
    825816                rpcTempCU->initEstData( uiDepth, iQP );
    826 #if MTK_VSP_FIX_ALIGN_WD_E0172
     817#if H_3D_VSP
    827818                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    828819#endif
    … …  
    848839#endif
    849840                rpcTempCU->initEstData( uiDepth, iQP );
    850 #if MTK_VSP_FIX_ALIGN_WD_E0172
     841#if H_3D_VSP
    851842                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    852843#endif
    … …  
    868859#endif
    869860                rpcTempCU->initEstData( uiDepth, iQP );
    870 #if MTK_VSP_FIX_ALIGN_WD_E0172
     861#if H_3D_VSP
    871862                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    872863#endif
    … …  
    894885#endif
    895886                rpcTempCU->initEstData( uiDepth, iQP );
    896 #if MTK_VSP_FIX_ALIGN_WD_E0172
     887#if H_3D_VSP
    897888                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    898889#endif
    … …  
    914905#endif
    915906                rpcTempCU->initEstData( uiDepth, iQP );
    916 #if MTK_VSP_FIX_ALIGN_WD_E0172
     907#if H_3D_VSP
    917908                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    918909#endif
    … …  
    934925#endif
    935926                rpcTempCU->initEstData( uiDepth, iQP );
    936 #if MTK_VSP_FIX_ALIGN_WD_E0172
     927#if H_3D_VSP
    937928                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    938929#endif
    … …  
    954945#endif
    955946                rpcTempCU->initEstData( uiDepth, iQP );
    956 #if MTK_VSP_FIX_ALIGN_WD_E0172
     947#if H_3D_VSP
    957948                rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    958949#endif
    … …  
    968959              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU );
    969960              rpcTempCU->initEstData( uiDepth, iQP );
    970 #if MTK_VSP_FIX_ALIGN_WD_E0172
     961#if H_3D_VSP
    971962              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    972963#endif
    973964              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD );
    974965              rpcTempCU->initEstData( uiDepth, iQP );
    975 #if MTK_VSP_FIX_ALIGN_WD_E0172
     966#if H_3D_VSP
    976967              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    977968#endif
    … …  
    983974              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N );
    984975              rpcTempCU->initEstData( uiDepth, iQP );
    985 #if MTK_VSP_FIX_ALIGN_WD_E0172
     976#if H_3D_VSP
    986977              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    987978#endif
    988979              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N );
    989980              rpcTempCU->initEstData( uiDepth, iQP );
    990 #if MTK_VSP_FIX_ALIGN_WD_E0172
     981#if H_3D_VSP
    991982              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
    992983#endif
    … …  
    17611752  Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    17621753  memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    1763 #if MTK_VSP_FIX_ALIGN_WD_E0172
    17641754  InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    17651755  rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, vspFlag,inheritedVSPDisInfo, numValidMergeCand );
    1766 #else
    1767 #if MTK_VSP_FIX_E0172
    1768   Int vspDir[MRG_MAX_NUM_CANDS_MEM];
    1769   memset(vspDir, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    1770   rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, vspFlag,vspDir, numValidMergeCand );
    1771 #else
    1772   rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, vspFlag, numValidMergeCand );
    1773 #endif
    1774 #endif//end of MTK_VSP_FIX_ALIGN_WD_E0172
    17751756#else
    17761757  rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
    … …  
    18401821#if H_3D_VSP
    18411822          rpcTempCU->setVSPFlagSubParts( vspFlag[uiMergeCand], 0, 0, uhDepth );
    1842 #if MTK_VSP_FIX_ALIGN_WD_E0172
    18431823          rpcTempCU->setDvInfoSubParts(inheritedVSPDisInfo[uiMergeCand].m_acDvInfo, 0, 0, uhDepth );
    1844 #endif
    1845 #if MTK_VSP_FIX_E0172
    1846           rpcTempCU->setVSPDirSubParts( vspDir[uiMergeCand], 0, 0, uhDepth );
    1847 #endif
    18481824#endif
    18491825          rpcTempCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeCand], 0, 0, uhDepth ); // interprets depth relative to LCU level

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

    r614 r615  
    36033603#if H_3D_VSP
    36043604                                 , Int* vspFlag
    3605 #if MTK_VSP_FIX_ALIGN_WD_E0172
    36063605                                 , InheritedVSPDisInfo*  inheritedVSPDisInfo
    3607 #endif
    3608 #if MTK_VSP_FIX_E0172
    3609                                  , Int* vspDir
    3610 #endif
    36113606#endif
    36123607                                 , Int& numValidMergeCand
    … …  
    36283623#if H_3D_VSP
    36293624                                   , vspFlag
    3630 #if MTK_VSP_FIX_ALIGN_WD_E0172
    36313625                                   , inheritedVSPDisInfo
    3632 #endif
    3633 #if MTK_VSP_FIX_E0172
    3634                                    , vspDir
    3635 #endif
    36363626#endif
    36373627                                   , numValidMergeCand
    … …  
    36453635#if H_3D_VSP
    36463636                                 , vspFlag
    3647 #if MTK_VSP_FIX_ALIGN_WD_E0172
    36483637                                 , inheritedVSPDisInfo
    3649 #endif
    3650 #if MTK_VSP_FIX_E0172
    3651                                  , vspDir
    3652 #endif
    36533638#endif
    36543639                                 , numValidMergeCand
    36553640                                 );
    36563641  }
    3657 #if MTK_VSP_FIX_E0172 || MTK_VSP_FIX_ALIGN_WD_E0172
     3642#if H_3D_VSP
    36583643  xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours,vspFlag, numValidMergeCand );
    3659 #else
    3660   xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
    36613644#endif
    36623645
    … …  
    36753658#if H_3D_VSP
    36763659      pcCU->setVSPFlagSubParts( vspFlag[uiMergeCand], uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
    3677 #if MTK_VSP_FIX_ALIGN_WD_E0172
    36783660      pcCU->setDvInfoSubParts(inheritedVSPDisInfo[uiMergeCand].m_acDvInfo, uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
    3679 #endif
    3680 #if MTK_VSP_FIX_E0172
    3681       pcCU->setVSPDirSubParts( vspDir[uiMergeCand], uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
    3682 #endif
    36833661#endif
    36843662
    … …  
    37103688 * \returns Void
    37113689 */
    3712 #if MTK_VSP_FIX_E0172 || MTK_VSP_FIX_ALIGN_WD_E0172
     3690#if H_3D_VSP
    37133691Void TEncSearch::xRestrictBipredMergeCand( TComDataCU* pcCU, UInt puIdx, TComMvField* mvFieldNeighbours, UChar* interDirNeighbours, Int* vspFlag, Int numValidMergeCand )
    37143692#else
    … …  
    37203698    for( UInt mergeCand = 0; mergeCand < numValidMergeCand; ++mergeCand )
    37213699    {
    3722 #if MTK_VSP_FIX_E0172 || MTK_VSP_FIX_ALIGN_WD_E0172
     3700#if H_3D_VSP
    37233701      if ( (interDirNeighbours[mergeCand] == 3) && (vspFlag[mergeCand] == false) )
    37243702#else
    … …  
    38513829#if H_3D_VSP
    38523830    pcCU->setVSPFlagSubParts( 0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr) );
    3853 #if MTK_VSP_FIX_E0172
    3854     pcCU->setVSPDirSubParts( 0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr) );
    3855 #endif
    38563831#endif
    38573832   
    … …  
    43494324      Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    43504325      memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    4351 #if MTK_VSP_FIX_ALIGN_WD_E0172
    43524326      InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    43534327      UInt uiAbsPartIdx = 0;
    … …  
    43574331      DisInfo OriginalDvInfo = pcCU->getDvInfo(uiAbsPartIdx);
    43584332#endif
    4359 #if MTK_VSP_FIX_E0172
    4360       Int vspDir[MRG_MAX_NUM_CANDS_MEM];
    4361       memset(vspDir, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    4362 #endif
    4363 #endif
    43644333
    43654334      xMergeEstimation( pcCU, pcOrgYuv, iPartIdx, uiMRGInterDir, cMRGMvField, uiMRGIndex, uiMRGCost, cMvFieldNeighbours, uhInterDirNeighbours
    43664335#if H_3D_VSP
    43674336                      , vspFlag
    4368 #if MTK_VSP_FIX_ALIGN_WD_E0172
    43694337                      , inheritedVSPDisInfo
    4370 #endif
    4371 #if MTK_VSP_FIX_E0172
    4372                       , vspDir
    4373 #endif
    43744338#endif
    43754339                      , numValidMergeCand
    … …  
    43824346#if H_3D_VSP
    43834347        pcCU->setVSPFlagSubParts( vspFlag[uiMRGIndex], uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    4384 #if MTK_VSP_FIX_ALIGN_WD_E0172
    43854348        pcCU->setDvInfoSubParts(inheritedVSPDisInfo[uiMRGIndex].m_acDvInfo, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    4386 #endif
    4387 #if MTK_VSP_FIX_E0172
    4388         pcCU->setVSPDirSubParts( vspDir[uiMRGIndex], uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    4389 #endif
    43904349#endif
    43914350        pcCU->setInterDirSubParts  ( uiMRGInterDir, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    … …  
    44104369#if H_3D_VSP
    44114370        pcCU->setVSPFlagSubParts ( 0,             uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    4412 #if MTK_VSP_FIX_ALIGN_WD_E0172
    44134371        pcCU->setDvInfoSubParts(OriginalDvInfo, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    4414 #endif
    4415 #if MTK_VSP_FIX_E0172
    4416         pcCU->setVSPDirSubParts ( 0,             uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    4417 #endif
    44184372#endif
    44194373        {

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

    r613 r615  
    431431#if H_3D_VSP
    432432                                  , Int* vspFlag
    433 #if MTK_VSP_FIX_ALIGN_WD_E0172
    434433                                  , InheritedVSPDisInfo*  inheritedVSPDisInfo
    435 #endif
    436 #if MTK_VSP_FIX_E0172
    437                                   , Int* vspDir
    438 #endif
    439434#endif
    440435                                  , Int& numValidMergeCand
    … …  
    445440                                    TComMvField*    mvFieldNeighbours,
    446441                                    UChar*          interDirNeighbours,
    447 #if MTK_VSP_FIX_E0172 || MTK_VSP_FIX_ALIGN_WD_E0172
    448442                                    Int* vspFlag,
    449 #endif
    450443                                    Int             numValidMergeCand );
    451444
Note: See TracChangeset for help on using the changeset viewer.