Changeset 1191 in 3DVCSoftware for branches/HTM-14.0-MV-draft-3/source/Lib/TLibCommon/TComPic.cpp

Timestamp:

15 Apr 2015, 11:36:33 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC.

File:

• branches/HTM-14.0-MV-draft-3/source/Lib/TLibCommon/TComPic.cpp (modified) (6 diffs)

branches/HTM-14.0-MV-draft-3/source/Lib/TLibCommon/TComPic.cpp

@@ -63 +63 @@
 , m_layerId                               (0)
 , m_viewId                                (0)
-#if H_3D
-, m_viewIndex                             (0)
-, m_isDepth                               (false)
-, m_aaiCodedScale                         (0)
-, m_aaiCodedOffset                        (0)
-#endif
 #endif
 {
   m_apcPicYuv[0]      = NULL;
   m_apcPicYuv[1]      = NULL;
-#if H_3D_QTLPC
-  m_bReduceBitsQTL    = 0;
-#endif
-#if H_3D_NBDV
-  m_iNumDdvCandPics   = 0;
-  m_eRapRefList       = REF_PIC_LIST_0;
-  m_uiRapRefIdx       = 0;
-#endif
 }
 
@@ -114 +100 @@
   memcpy(m_numReorderPics, numReorderPics, MAX_TLAYER*sizeof(Int));
 
-#if H_3D_FCO
-/* initialize the texture to depth reference status */
-  for (int j=0; j<2; j++)
-  {
-      for (int i=0; i<MAX_NUM_REF; i++)
-      {
-          m_aiTexToDepRef[j][i] = -1;
-      }
-  }
-#endif
 
   return;
@@ -153 +129 @@
   deleteSEIs(m_SEIs);
 }
-#if H_3D
-Void TComPic::compressMotion(Int scale)
-#else
 Void TComPic::compressMotion()
-#endif
 {
   TComPicSym* pPicSym = getPicSym(); 
@@ -163 +135 @@
   {
     TComDataCU* pcCU = pPicSym->getCU(uiCUAddr);
-#if H_3D
-    pcCU->compressMV(scale); 
-#else
     pcCU->compressMV(); 
-#endif
   } 
 }
@@ -204 +172 @@
 }
 
-#if H_3D
-TComPic* TComPicLists::getPic( Int viewIndex, Bool depthFlag, Int poc )
-{
-  return getPic   ( m_vps->getLayerIdInNuh( viewIndex, depthFlag ), poc );
-}
-#endif
 Void TComPicLists::print()
 {
@@ -250 +212 @@
 }
 
-#if H_3D
-TComPicYuv* TComPicLists::getPicYuv( Int viewIndex, Bool depthFlag, Int poc, Bool recon )
-{  
-  Int layerIdInNuh = m_vps->getLayerIdInNuh( viewIndex, depthFlag ); 
-  return getPicYuv( layerIdInNuh, poc, recon );
-}
-#if H_3D_ARP
-TComList<TComPic*>* TComPicLists::getPicList( Int layerIdInNuh )
-{
-  TComList<TComList<TComPic*>*>::iterator itL = m_lists.begin();
-  Int iLayer = 0;
-
-  assert( layerIdInNuh < m_lists.size() );
-
-  while( iLayer != layerIdInNuh )
-  {
-    itL++;
-    iLayer++;
-  }
-
-  return *itL;
-}
-#endif
-#endif
 #endif // H_MV
 
-#if H_3D_NBDV 
-Int TComPic::getDisCandRefPictures( Int iColPOC )
-{
-  UInt       uiTempLayerCurr = 7;
-  TComSlice* currSlice       = getSlice(getCurrSliceIdx());
-  UInt       numDdvCandPics  = 0;
-
-  if ( !currSlice->getEnableTMVPFlag() )
-    return numDdvCandPics;
-
-  numDdvCandPics += 1;
-
-  UInt pocCurr = currSlice->getPOC();
-  UInt pocDiff = 255;
-
-  for(UInt lpNr = 0; lpNr < (currSlice->isInterB() ? 2: 1); lpNr ++)
-  {
-    UInt x = lpNr ? currSlice->getColFromL0Flag() : 1 - currSlice->getColFromL0Flag();
-
-    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(x)); i++)
-    {
-      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)x, i)->getViewIndex() 
-        && (x == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)x, i)!= iColPOC) && numDdvCandPics!=2)
-      {
-        TComSlice* refSlice    = currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx());
-        Bool       bRAP        = (refSlice->getViewIndex() && refSlice->isIRAP())? 1: 0; 
-        UInt       uiTempLayer = currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx())->getTLayer(); 
-        
-        if( bRAP )
-        {
-          this->setRapRefIdx(i);
-          this->setRapRefList((RefPicList)x);
-          numDdvCandPics = 2;
-
-          return numDdvCandPics;
-        }
-        else if (uiTempLayerCurr > uiTempLayer) 
-        {
-           uiTempLayerCurr = uiTempLayer; 
-        }
-      }
-    }
-  }
-
-  UInt z   = -1; // GT: Added to make code compile needs to be checked!
-  UInt idx = 0;
-  
-  for(UInt lpNr = 0; lpNr < (currSlice->isInterB() ? 2: 1); lpNr ++)
-  {
-    UInt x = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
-    
-    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(x)); i++)
-    {
-      Int iTempPoc = currSlice->getRefPic((RefPicList)x, i)->getPOC();
-      Int iTempDiff = (iTempPoc > pocCurr) ? (iTempPoc - pocCurr): (pocCurr - iTempPoc);
-      
-      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)x, i)->getViewIndex() &&  (x == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)x, i)!= iColPOC) 
-        && currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx())->getTLayer() == uiTempLayerCurr && pocDiff > iTempDiff)
-      {
-        pocDiff = iTempDiff;
-        z       = x;
-        idx     = i;
-      }
-    }
-  }
-
-  if( pocDiff < 255 )
-  {
-    this->setRapRefIdx(idx);
-    this->setRapRefList((RefPicList) z );
-    numDdvCandPics = 2;
-  }
-
-  return numDdvCandPics;
-}
-
-Void TComPic::checkTemporalIVRef()
-{
-  TComSlice* currSlice = getSlice(getCurrSliceIdx());
-  const Int numCandPics = this->getNumDdvCandPics();
-  for(Int curCandPic = 0; curCandPic < numCandPics; curCandPic++)
-  {
-    RefPicList eCurRefPicList   = REF_PIC_LIST_0 ;
-    Int        curCandPicRefIdx = 0;
-    if( curCandPic == 0 ) 
-    { 
-      eCurRefPicList   = RefPicList(currSlice->isInterB() ? 1-currSlice->getColFromL0Flag() : 0);
-      curCandPicRefIdx = currSlice->getColRefIdx();
-    }
-    else                 
-    {
-      eCurRefPicList   = this->getRapRefList();
-      curCandPicRefIdx = this->getRapRefIdx();
-    }
-    TComPic* pcCandColPic = currSlice->getRefPic( eCurRefPicList, curCandPicRefIdx);
-    TComSlice* pcCandColSlice = pcCandColPic->getSlice(0);// currently only support single slice
-
-    if(!pcCandColSlice->isIntra())
-    {
-      for( Int iColRefDir = 0; iColRefDir < (pcCandColSlice->isInterB() ? 2: 1); iColRefDir ++ )
-      {
-        for( Int iColRefIdx =0; iColRefIdx < pcCandColSlice->getNumRefIdx(( RefPicList )iColRefDir ); iColRefIdx++)
-        {
-          m_abTIVRINCurrRL[curCandPic][iColRefDir][iColRefIdx] = false;
-          Int iColViewIdx    = pcCandColSlice->getViewIndex();
-          Int iColRefViewIdx = pcCandColSlice->getRefPic( ( RefPicList )iColRefDir, iColRefIdx)->getViewIndex();
-          if(iColViewIdx == iColRefViewIdx)
-            continue;
-
-          for(Int iCurrRefDir = 0;(iCurrRefDir < (currSlice->isInterB() ? 2: 1)) && (m_abTIVRINCurrRL[curCandPic][iColRefDir][iColRefIdx] == false ); iCurrRefDir++)
-          {
-            for( Int iCurrRefIdx =0; iCurrRefIdx < currSlice->getNumRefIdx(( RefPicList )iCurrRefDir ); iCurrRefIdx++)
-            {
-              if( currSlice->getRefPic( ( RefPicList )iCurrRefDir, iCurrRefIdx )->getViewIndex() == iColRefViewIdx )
-              {  
-                m_abTIVRINCurrRL[curCandPic][iColRefDir][iColRefIdx] = true;
-                break;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-Bool TComPic::isTempIVRefValid(Int currCandPic, Int iColRefDir, Int iColRefIdx)
-{
-  return m_abTIVRINCurrRL[currCandPic][iColRefDir][iColRefIdx];
-}
-
-Void TComPic::checkTextureRef(  )
-{
-  TComSlice* pcCurrSlice = getSlice(getCurrSliceIdx());
-  TComPic* pcTextPic = pcCurrSlice->getTexturePic();
-#if H_3D_FCO
-  if ( pcTextPic )
-  {
-#endif
-
-  TComSlice* pcTextSlice = pcTextPic->getSlice(0); // currently only support single slice
-
-  for( Int iTextRefDir = 0; (iTextRefDir < (pcTextSlice->isInterB()? 2:1) ) && !pcTextSlice->isIntra(); iTextRefDir ++ )
-  {
-    for( Int iTextRefIdx =0; iTextRefIdx<pcTextSlice->getNumRefIdx(( RefPicList )iTextRefDir ); iTextRefIdx++)
-    {
-      Int iTextRefPOC    = pcTextSlice->getRefPOC( ( RefPicList )iTextRefDir, iTextRefIdx);
-      Int iTextRefViewId = pcTextSlice->getRefPic( ( RefPicList )iTextRefDir, iTextRefIdx)->getViewIndex();
-      m_aiTexToDepRef[iTextRefDir][iTextRefIdx] = -1;
-      Int iCurrRefDir = iTextRefDir;
-      for( Int iCurrRefIdx =0; ( iCurrRefIdx<pcCurrSlice->getNumRefIdx(( RefPicList )iCurrRefDir ) ) && ( m_aiTexToDepRef[iTextRefDir][iTextRefIdx] < 0 ) ; iCurrRefIdx++)
-      {
-        if( pcCurrSlice->getRefPOC( ( RefPicList )iCurrRefDir, iCurrRefIdx ) == iTextRefPOC && 
-          pcCurrSlice->getRefPic( ( RefPicList )iCurrRefDir, iCurrRefIdx)->getViewIndex() == iTextRefViewId )
-        {  
-          m_aiTexToDepRef[iTextRefDir][iTextRefIdx] = iCurrRefIdx;
-        }
-      }
-    }
-
-  }
-#if H_3D_FCO
-  }
-#endif
-
-}
-
-Int TComPic::isTextRefValid(Int iTextRefDir, Int iTextRefIdx)
-{
-  return m_aiTexToDepRef[iTextRefDir][iTextRefIdx];
-}
-#endif
 //! \}