Changeset 1213 in 3DVCSoftware


Ignore:
Timestamp:
16 May 2015, 02:53:38 (10 years ago)
Author:
qualcomm
Message:

TMVP for 3D-HEVC. Ying Chen

Location:
branches/HTM-14.1-update-dev2-Qualcomm/source/Lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibCommon/TComDataCU.cpp

    r1200 r1213  
    35203520    if ( getSlice()->isInterB() )
    35213521    {
    3522 #if H_3D_TMVP
     3522#if NH_3D_TMVP //to be changed to NH_3D_TMVP in future migration
    35233523      iRefIdx = 0;
    35243524#endif
    … …  
    47674767    if ( getSlice()->isInterB() )
    47684768    {
     4769#if NH_3D_TMVP
     4770      iRefIdx =0;
     4771#endif
    47694772      bExistMV = ctuRsAddr >= 0 && xGetColMVP( REF_PIC_LIST_1, ctuRsAddr, uiAbsPartAddr, cColMv, iRefIdx);
    47704773      if( bExistMV == false )
    … …  
    50835086    }
    50845087    if ( ctuRsAddr >= 0 && xGetColMVP( eRefPicList, ctuRsAddr, uiAbsPartAddr, cColMv, iRefIdx_Col
    5085 #if H_3D_TMVP
     5088#if NH_3D_TMVP
    50865089         , 0
    50875090#endif
    … …  
    50955098      xDeriveCenterIdx( uiPartIdx, uiPartIdxCenter );
    50965099      if (xGetColMVP( eRefPicList, getCtuRsAddr(), uiPartIdxCenter,  cColMv, iRefIdx_Col
    5097 #if H_3D_TMVP
     5100#if NH_3D_TMVP
    50985101         , 0
    50995102#endif
    … …  
    54475450
    54485451Bool TComDataCU::xGetColMVP( RefPicList eRefPicList, Int ctuRsAddr, Int uiPartUnitIdx, TComMv& rcMv, Int& riRefIdx
    5449 #if H_3D_TMVP
     5452#if NH_3D_TMVP
    54505453  , Bool bMRG
    54515454#endif
    … …  
    54995502  if ( bIsCurrRefLongTerm != bIsColRefLongTerm )
    55005503  {
    5501 #if H_3D_TMVP
     5504#if NH_3D_TMVP
    55025505    Int iAlterRefIdx  = m_pcSlice->getAlterRefIdx(eRefPicList);
    55035506    if(bMRG && iAlterRefIdx > 0)
    … …  
    55125515#endif
    55135516    return false;
    5514 #if H_3D_TMVP
     5517#if NH_3D_TMVP
    55155518    }
    55165519#endif
    … …  
    55195522  if ( bIsCurrRefLongTerm || bIsColRefLongTerm )
    55205523  {
    5521 #if H_3D_TMVP
     5524#if NH_3D_TMVP
    55225525    Int iCurrViewId    = m_pcSlice->getViewId ();
    55235526    Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewId ();
    5524     Int iColViewId     = pColCU->getSlice()->getViewId();
    5525     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewId();
     5527    Int iColViewId     = pColCtu->getSlice()->getViewId();
     5528    Int iColRefViewId  = pColCtu->getSlice()->getRefPic( eColRefPicList, pColCtu->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewId();
    55265529    iScale = 4096;
    55275530    if ( iCurrRefViewId != iCurrViewId && iColViewId != iColRefViewId )
    … …  
    55375540#endif
    55385541    rcMv = cColMv;
    5539 #if H_3D_TMVP
     5542#if NH_3D_TMVP
    55405543    }
    55415544#endif

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibCommon/TComDataCU.h

    r1200 r1213  
    244244  Void          deriveRightBottomIdx        ( UInt uiPartIdx, UInt& ruiPartIdxRB );
    245245  Bool          xGetColMVP( RefPicList eRefPicList, Int ctuRsAddr, Int uiPartUnitIdx, TComMv& rcMv, Int& riRefIdx
    246 #if H_3D_TMVP
     246#if NH_3D_TMVP
    247247  ,  Bool bMRG = true
    248248#endif

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibCommon/TComSlice.cpp

    r1200 r1213  
    224224    m_aaiCodedScale [i].resize(MAX_NUM_LAYERS);
    225225  }
    226  
     226#if 0 //NH_3D_TMVP
     227  m_aiAlterRefIdx[0]                  = -1;
     228  m_aiAlterRefIdx[1]                  = -1; 
     229#endif
    227230#endif
    228231
    … …  
    289292  m_cabacInitFlag        = false;
    290293  m_enableTMVPFlag = true;
    291 #if H_3D_TMVP
     294#if NH_3D_TMVP
    292295  m_aiAlterRefIdx[0]                  = -1;
    293296  m_aiAlterRefIdx[1]                  = -1;
    … …  
    824827  }
    825828}
    826 #if H_3D
    827 #if H_3D_TMVP
     829#if NH_3D
     830#if NH_3D_TMVP
    828831Void TComSlice::generateAlterRefforTMVP()
    829832{

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibCommon/TComSlice.h

    r1200 r1213  
    25912591  IntAry2d   m_aaiCodedOffset;
    25922592#endif
    2593 #if H_3D_TMVP
     2593#if NH_3D_TMVP
    25942594  Int        m_aiAlterRefIdx   [2];
    25952595#endif
    … …  
    29202920  Int                         getViewIndex   ()                 const                { return m_viewIndex;                                           }
    29212921#if NH_3D
    2922 #if H_3D_TMVP
     2922#if NH_3D_TMVP
    29232923  Void                        generateAlterRefforTMVP ();   
    29242924  Void                        setAlterRefIdx          ( RefPicList e, Int i )        { m_aiAlterRefIdx[e]    = i;                                    }

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibCommon/TypeDef.h

    r1201 r1213  
    6969#if NH_3D
    7070#define NH_3D_VSO                         1
     71#define NH_3D_TMVP                        1   // QC_TMVP_C0047
     72                                              // Sony_M23639
     73                                              // H_3D_TMVP_SCALING_FIX_K0053       1   // QC/CY for K0053
    7174#endif
    7275

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibDecoder/TDecTop.cpp

    r1200 r1213  
    12261226    //---------------
    12271227    pcSlice->setRefPOCList();
    1228 #if  H_3D_TMVP
     1228#if  NH_3D_TMVP
    12291229    if(pcSlice->getLayerId())
    12301230    {

  • branches/HTM-14.1-update-dev2-Qualcomm/source/Lib/TLibEncoder/TEncGOP.cpp

    r1200 r1213  
    15471547
    15481548    pcSlice->setList1IdxToList0Idx();
    1549 #if H_3D_TMVP
     1549#if NH_3D_TMVP
    15501550    if(pcSlice->getLayerId())
    15511551      pcSlice->generateAlterRefforTMVP();
Note: See TracChangeset for help on using the changeset viewer.