Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPic.cpp


Ignore:
Timestamp:
23 Oct 2013, 23:01:30 (10 years ago)
Author:
tech
Message:

Merged 8.1-Cleanup@654

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComPic.cpp

    r608 r655  
    5050, m_bUsedByCurr                           (false)
    5151, m_bIsLongTerm                           (false)
    52 , m_bIsUsedAsLongTerm                     (false)
    5352, m_apcPicSym                             (NULL)
    5453, m_pcPicYuvPred                          (NULL)
     
    118117  memcpy(m_numReorderPics, numReorderPics, MAX_TLAYER*sizeof(Int));
    119118
     119  /* initialize the texture to depth reference status */
     120#if H_3D_FCO
     121  for (int j=0; j<2; j++)
     122  {
     123      for (int i=0; i<MAX_NUM_REF; i++)
     124      {
     125          m_aiTexToDepRef[j][i] = -1;
     126      }
     127  }
     128#endif
     129
    120130  return;
    121131}
     
    146156  deleteSEIs(m_SEIs);
    147157}
    148 #if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
    149 Void TComPic::compressMotion(int scale)
     158#if H_3D
     159Void TComPic::compressMotion(Int scale)
    150160#else
    151161Void TComPic::compressMotion()
     
    156166  {
    157167    TComDataCU* pcCU = pPicSym->getCU(uiCUAddr);
    158 #if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
     168#if H_3D
    159169    pcCU->compressMV(scale);
    160170#else
     
    661671  return numDdvCandPics;
    662672}
    663 #endif
    664 #if MTK_NBDV_TN_FIX_E0172
     673
    665674Void TComPic::checkTemporalIVRef()
    666675{
     
    716725  return m_abTIVRINCurrRL[currCandPic][iColRefDir][iColRefIdx];
    717726}
    718 #endif
    719 #if MTK_TEXTURE_MRGCAND_BUGFIX_E0182
     727
    720728Void TComPic::checkTextureRef(  )
    721729{
    722730  TComSlice* pcCurrSlice = getSlice(getCurrSliceIdx());
    723731  TComPic* pcTextPic = pcCurrSlice->getTexturePic();
     732#if H_3D_FCO
     733  if ( pcTextPic )
     734  {
     735#endif
     736
    724737  TComSlice* pcTextSlice = pcTextPic->getSlice(0); // currently only support single slice
    725738
     
    743756
    744757  }
     758#if H_3D_FCO
     759  }
     760#endif
     761
    745762}
    746763
Note: See TracChangeset for help on using the changeset viewer.