Changeset 418 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source


Ignore:
Timestamp:
19 May 2013, 10:47:55 (11 years ago)
Author:
mitsubishi-htm
Message:

-Update variable names.
-Some format improvements.

Location:
branches/HTM-6.2-dev2-MERL/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp

    r416 r418  
    17471747  memcpy( rpcCU->getVSPIndex()          + m_uiAbsIdxInLCU, m_piVSPIndex,         iSizeInChar );
    17481748#if MERL_VSP_NBDV_RefVId_Fix_D0166
    1749   memcpy( rpcCU->getVSPDir  ()           + m_uiAbsIdxInLCU, m_piVSPDir  ,         iSizeInChar );
     1749  memcpy( rpcCU->getVSPDir  ()          + m_uiAbsIdxInLCU, m_piVSPDir  ,         iSizeInChar );
    17501750#endif
    17511751#endif
     
    18841884  memcpy( rpcCU->getVSPIndex()          + uiPartOffset, m_piVSPIndex,          iSizeInChar );
    18851885#if MERL_VSP_NBDV_RefVId_Fix_D0166
    1886   memcpy( rpcCU->getVSPDir  ()           + uiPartOffset, m_piVSPDir  ,         iSizeInChar );
     1886  memcpy( rpcCU->getVSPDir  ()          + uiPartOffset, m_piVSPDir  ,          iSizeInChar );
    18871887#endif
    18881888#endif
     
    38653865#if MERL_VSP_NBDV_RefVId_Fix_D0166
    38663866      cDisInfo.m_aListIdx[0] = getDvInfo(uiAbsPartIdx).m_aListIdx[0];
    3867       cDisInfo.m_aRefIdx[0] = getDvInfo(uiAbsPartIdx).m_aRefIdx[0];
     3867      cDisInfo.m_aRefIdx[0]  = getDvInfo(uiAbsPartIdx).m_aRefIdx[0];
    38683868#endif
    38693869#endif
     
    43804380#endif
    43814381#if MERL_VSP_C0152
    4382      xInheritVspMode( pcCULeftBottom, uiLeftBottomPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo
     4382    xInheritVspMode( pcCULeftBottom, uiLeftBottomPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo
    43834383#if MERL_VSP_NBDV_RefVId_Fix_D0166
    43844384       , iVSPDirTrue
     
    44384438#endif
    44394439#if MERL_VSP_C0152
    4440      xInheritVspMode( pcCUAboveLeft, uiAboveLeftPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo
     4440      xInheritVspMode( pcCUAboveLeft, uiAboveLeftPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo
    44414441#if MERL_VSP_NBDV_RefVId_Fix_D0166
    44424442       , iVSPDirTrue
     
    55215521Bool TComDataCU::getRefListAndRefFrmIdx(Int targetRefViewIdx, RefPicList& eRefPicList, Int& refFrmIdx)
    55225522{
    5523   Bool isFound  = false;
     5523  Bool isFound = false;
    55245524  RefPicList privateRefPicList = REF_PIC_LIST_0;
    55255525
     
    58945894    pDInfo->m_aRefIdx [ pDInfo->iN ]  = -1-refFrmIdx;
    58955895    assert(pDInfo->m_aRefIdx [ pDInfo->iN ] < 0);
    5896 
    58975896#endif
    58985897    pDInfo->m_acMvCand[pDInfo->iN] = defaultDV;
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.h

    r412 r418  
    290290  inline Void   xInheritVspMode       ( TComDataCU* pcCURef, UInt uiIdx, Bool* bVspMvZeroDone, Int iCount, Int* iVSPIndexTrue, TComMvField* pcMvFieldNeighbours, DisInfo* pDInfo
    291291#if MERL_VSP_NBDV_RefVId_Fix_D0166
    292     ,Int *iVSPDirTrue
     292                                      , Int *iVSPDirTrue
    293293#endif
    294294    ) ;
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp

    r417 r418  
    837837  assert(pcBaseViewTxtPicYuv != NULL);
    838838
    839   //initialize the LUT according to the reference view idx
     839  // initialize the LUT according to the reference view idx
    840840  pcCU->getSlice()->getBWVSPLUTParam(pShiftLUT, iShiftPrec, pRefPicBaseTxt->getViewId());
    841841
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TypeDef.h

    r413 r418  
    213213#define MERL_VSP_BLOCKSIZE_C0152             4 // JCT3V-C0152: VSP block size, supported values: 1, 2 and 4.
    214214#define MERL_VSP_C0152_BugFix_ForNoDepthCase 0 // MERL bugfix for test condition of no depth
    215 define MERL_CVSP_D0165                       0 // JCT3V-D0165: 1: enable CVSP; 0: disable CVSP.
     215#define MERL_CVSP_D0165                      0 // JCT3V-D0165: 1: enable CVSP; 0: disable CVSP.
    216216#define MERL_VSP_NBDV_RefVId_Fix_D0166       0 // JCT3V-D0166: 1: fix the NBDV with ref view selectioin; 0: always use base view with refViewIdx=0
    217217#define MERL_Bi_VSP_D0166                    0 // JCT3V-D0166: 1: add supporting for Bi-VSP, the code under the macro can also handle uni-direction VSP
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibEncoder/TEncSlice.cpp

    r412 r418  
    6262#if MERL_VSP_NBDV_RefVId_Fix_D0166
    6363  for(Int iNumCount = 0; iNumCount < MAX_VIEW_NUM; iNumCount++)
    64     m_pcListDepthPic[iNumCount] =NULL;
     64    m_pcListDepthPic[iNumCount] = NULL;
    6565#endif
    6666#if FCO_DVP_REFINE_C0132_C0170
     
    155155#if MERL_VSP_NBDV_RefVId_Fix_D0166
    156156  for(Int iNumCount = 0; iNumCount < MAX_VIEW_NUM; iNumCount++)
    157     m_pcListDepthPic[iNumCount] =NULL;
     157    m_pcListDepthPic[iNumCount] = NULL;
    158158#endif
    159159}
     
    834834  pcSlice->setRefPicBaseDepth(m_pPicBaseDepth);
    835835#if MERL_VSP_NBDV_RefVId_Fix_D0166
    836   for (Int refviewId=0; refviewId < pcSlice->getViewId(); refviewId++)
    837   {
    838     assert( m_pcListDepthPic[refviewId] );
    839     pcSlice->setListDepthPic(m_pcListDepthPic[refviewId], refviewId);
    840     pcSlice->setBWVSPLUTParam(m_aiShiftLUT[refviewId], m_iShiftPrec, refviewId);
     836  for (Int refViewId=0; refViewId < pcSlice->getViewId(); refViewId++)
     837  {
     838    assert( m_pcListDepthPic[refViewId] );
     839    pcSlice->setListDepthPic(m_pcListDepthPic[refViewId], refViewId);
     840    pcSlice->setBWVSPLUTParam(m_aiShiftLUT[refViewId], m_iShiftPrec, refViewId);
    841841  }
    842842#endif
Note: See TracChangeset for help on using the changeset viewer.