Changeset 348 in 3DVCSoftware for branches/HTM-6.2-dev1-Samsung


Ignore:
Timestamp:
30 Apr 2013, 03:53:05 (11 years ago)
Author:
samsung-htm
Message:

D0122 Integration (Reupload)

Location:
branches/HTM-6.2-dev1-Samsung/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

    r332 r348  
    53225322 */
    53235323#if H3D_IVMP
     5324#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
    53245325Void TComDataCU::fillMvpCand ( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo, Int iMVPIdx)
    53255326{
     5327    fillMvpCandBase(uiPartIdx, uiPartAddr, eRefPicList, iRefIdx, pInfo);
     5328}
     5329#else
     5330Void TComDataCU::fillMvpCand ( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo, Int iMVPIdx)
     5331{
     5332
    53265333  if (!m_pcSlice->getSPS()->getViewId() || !m_pcSlice->getSPS()->getMultiviewMvPredMode())
    53275334  {
     
    54025409  }
    54035410}
     5411#endif
    54045412
    54055413
  • branches/HTM-6.2-dev1-Samsung/source/Lib/TLibCommon/TypeDef.h

    r332 r348  
    8484                                              // QC_C0051_FIXED_BY_MTK             1   // Bug fix for C0051 implementation
    8585                                              // QC_AMVP_MRG_UNIFY_IVCAN_C0051     1
     86#define SEC_TWO_CANDIDATES_FOR_AMVP_D0122 1   // SEC_TWO_CANDIDATES_FOR_AMVP_D0122, fixing # of AMVP candidates 3 to 2
    8687
    8788
  • branches/HTM-6.2-dev1-Samsung/source/Lib/TLibDecoder/TDecEntropy.cpp

    r332 r348  
    479479  {
    480480#if H3D_IVMP
     481#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     482    const Int iNumAMVPCands = AMVP_MAX_NUM_CANDS;
     483#else
    481484    const Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + ( pcSubCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     485#endif
    482486    m_pcEntropyDecoderIf->parseMVPIdx( iMVPIdx, iNumAMVPCands );
    483487#else
  • branches/HTM-6.2-dev1-Samsung/source/Lib/TLibEncoder/TEncEntropy.cpp

    r332 r348  
    13511351  {
    13521352#if H3D_IVMP
     1353#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     1354    const Int iNumCands = AMVP_MAX_NUM_CANDS;
     1355#else
    13531356    const Int iNumCands = AMVP_MAX_NUM_CANDS + ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     1357#endif
    13541358    m_pcEntropyCoderIf->codeMVPIdx( pcCU, uiAbsPartIdx, eRefList, iNumCands );
    13551359#else
  • branches/HTM-6.2-dev1-Samsung/source/Lib/TLibEncoder/TEncSearch.cpp

    r332 r348  
    206206 
    207207#if H3D_IVMP
     208#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     209  const Int iNumAMVPCands = AMVP_MAX_NUM_CANDS;
     210#else
    208211  const Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + 1;
     212#endif
    209213  for( Int iNum = 0; iNum < iNumAMVPCands+1; iNum++)
    210214    for( Int iIdx = 0; iIdx < iNumAMVPCands; iIdx++)
     
    31093113
    31103114#if H3D_IVMP
     3115#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     3116  Int iNumAMVPCands = AMVP_MAX_NUM_CANDS;
     3117#else
    31113118  Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     3119#endif
    31123120#endif
    31133121
     
    37993807    {
    38003808#if H3D_IVMP
     3809#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     3810      Int iNumAMVPCands = AMVP_MAX_NUM_CANDS;
     3811#else
    38013812      Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     3813#endif
    38023814#if ZERO_MVD_EST
    38033815      (*puiDistBiP) = xGetTemplateCost( pcCU, uiPartIdx, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, rcMvPred, 0, iNumAMVPCands, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight, uiDist );
     
    38343846      UInt uiTmpCost;
    38353847#if H3D_IVMP
     3848#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     3849      Int iNumAMVPCands = AMVP_MAX_NUM_CANDS;
     3850#else
    38363851      Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     3852#endif
    38373853#if ZERO_MVD_EST
    38383854      uiTmpCost = xGetTemplateCost( pcCU, uiPartIdx, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, pcAMVPInfo->m_acMvCand[i], i, iNumAMVPCands, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight, uiDist );
     
    39673983 
    39683984#if H3D_IVMP
     3985#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
     3986  Int iNumAMVPCands = AMVP_MAX_NUM_CANDS;
     3987#else
    39693988  Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     3989#endif
    39703990#endif
    39713991 
Note: See TracChangeset for help on using the changeset viewer.