Changeset 456 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2


Ignore:
Timestamp:
4 Jun 2013, 18:05:33 (11 years ago)
Author:
tech
Message:

Fixed linux compiler warnings and changed some variable names to match styleguide.

Location:
branches/HTM-DEV-0.3-dev2/source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecCfg.h

    r446 r456  
    8484#if H_MV
    8585  , m_maxLayerId(0)
    86   , m_pchReconFiles(NULL)
    8786#endif
    8887  , m_pchReconFile(NULL)
  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

    r446 r456  
    145145  Int  pocCurrPic        = -MAX_INT;     
    146146  Int  pocLastPic        = -MAX_INT;   
    147  
    148   Int  layerIdLastPic    = 0;
     147
    149148  Int  layerIdCurrPic    = 0;
    150149
     
    223222        if ( bNewPicture || !bitstreamFile )
    224223        {
    225           layerIdLastPic    = layerIdCurrPic; 
    226224          layerIdCurrPic    = nalu.m_layerId;
    227225         
  • branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/TAppComCamPara.cpp

    r446 r456  
    965965  //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) ---
    966966  Double        dCamPosShift, dPicPosShift;
     967#if H_3D_PDM_CAM_PARAS
    967968  Int           iMinVOI       = (1<<30);
     969#endif
    968970  Int           iMinAbsVOI    = (1<<30);
    969971  Int           iMinAbsVOIId  = 0;
     
    973975    if( iAbsVOI < iMinAbsVOI )
    974976    {
     977#if H_3D_PDM_CAM_PARAS
    975978      iMinVOI      = m_aiViewOrderIndex[ iBaseId ];
     979#endif
    976980      iMinAbsVOI   = iAbsVOI;
    977981      iMinAbsVOIId = iBaseId;
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

    r455 r456  
    39853985          pDInfo->m_acNBDV = cColMv;
    39863986          pDInfo->m_aVIdxCan  = iTargetViewIdx;
    3987           TComPic* picDepth = NULL;
    39883987
    39893988#if H_3D_NBDV_REF
     
    40904089  }
    40914090
    4092   TComPic* picDepth = NULL;
    40934091  TComMv defaultDV(0, 0);
    40944092  pDInfo->m_acNBDV = defaultDV;
     
    41254123          pNbDvInfo->m_acNBDV = cMvPred;
    41264124          pNbDvInfo->m_aVIdxCan = refViewIdx;
    4127           TComPic* picDepth = NULL;
    41284125#if H_3D_NBDV_REF
    41294126          /*Place DoNBDV*/
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPic.cpp

    r455 r456  
    558558#endif // H_3D
    559559#endif // H_MV
     560
    560561#if H_3D_NBDV
    561 Int TComPic::getDisCandRefPictures(Int iColPOC)
    562 {
    563   UInt uiTempLayerCurr=7;
    564   TComSlice* currSlice = getSlice(getCurrSliceIdx());
    565   UInt NumDdvCandPics = 0;
     562Int TComPic::getDisCandRefPictures( Int iColPOC )
     563{
     564  UInt       uiTempLayerCurr = 7;
     565  TComSlice* currSlice       = getSlice(getCurrSliceIdx());
     566  UInt       numDdvCandPics  = 0;
     567
    566568  if ( !currSlice->getEnableTMVPFlag() )
    567     return NumDdvCandPics;
    568   NumDdvCandPics +=1;
    569 
    570   UInt iPOCCurr=currSlice->getPOC();
    571   UInt iPOCDiff = 255;
    572   Bool bCheck = false;
     569    return numDdvCandPics;
     570
     571  numDdvCandPics += 1;
     572
     573  UInt pocCurr = currSlice->getPOC();
     574  UInt pocDiff = 255;
    573575
    574576  for(UInt lpNr = 0; lpNr < (currSlice->isInterB() ? 2: 1); lpNr ++)
    575577  {
    576     UInt X = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
    577     for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(X)); i++)
    578     {
    579       if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)X, i)->getViewIndex()
    580         && (X == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)X, i)!= iColPOC) && NumDdvCandPics!=2)
    581       {
    582         TComSlice* refSlice = currSlice->getRefPic((RefPicList)X, i)->getSlice(getCurrSliceIdx());
    583         Bool bRAP = (refSlice->getViewIndex() && refSlice->isIRAP())? 1: 0;
    584         UInt uiTempLayer = currSlice->getRefPic((RefPicList)X, i)->getSlice(getCurrSliceIdx())->getTLayer();
    585         Int iTempPoc = currSlice->getRefPic((RefPicList)X, i)->getPOC();
    586         Int iTempDiff = (iTempPoc > iPOCCurr) ? (iTempPoc - iPOCCurr): (iPOCCurr - iTempPoc);
    587         if(bRAP)
     578    UInt x = lpNr ? currSlice->getColFromL0Flag() : 1 - currSlice->getColFromL0Flag();
     579
     580    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(x)); i++)
     581    {
     582      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)x, i)->getViewIndex()
     583        && (x == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)x, i)!= iColPOC) && numDdvCandPics!=2)
     584      {
     585        TComSlice* refSlice    = currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx());
     586        Bool       bRAP        = (refSlice->getViewIndex() && refSlice->isIRAP())? 1: 0;
     587        UInt       uiTempLayer = currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx())->getTLayer();
     588       
     589        if( bRAP )
    588590        {
    589591          this->setRapRefIdx(i);
    590           this->setRapRefList((RefPicList)X);
    591           NumDdvCandPics = 2;
    592           return NumDdvCandPics;
     592          this->setRapRefList((RefPicList)x);
     593          numDdvCandPics = 2;
     594
     595          return numDdvCandPics;
    593596        }
    594597        else if (uiTempLayerCurr > uiTempLayer)
     598        {
    595599           uiTempLayerCurr = uiTempLayer;
    596       }
    597     }
    598   }
    599   UInt Z;
    600   UInt idx=0;
     600        }
     601      }
     602    }
     603  }
     604
     605  UInt z   = -1; // GT: Added to make code compile needs to be checked!
     606  UInt idx = 0;
     607 
    601608  for(UInt lpNr = 0; lpNr < (currSlice->isInterB() ? 2: 1); lpNr ++)
    602609  {
    603     UInt X = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
    604     for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(X)); i++)
    605     {
    606       Int iTempPoc = currSlice->getRefPic((RefPicList)X, i)->getPOC();
    607       Int iTempDiff = (iTempPoc > iPOCCurr) ? (iTempPoc - iPOCCurr): (iPOCCurr - iTempPoc);
    608       if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)X, i)->getViewIndex() &&  (X == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)X, i)!= iColPOC)
    609         && currSlice->getRefPic((RefPicList)X, i)->getSlice(getCurrSliceIdx())->getTLayer() == uiTempLayerCurr && iPOCDiff > iTempDiff)
    610       {
    611         iPOCDiff=iTempDiff;
    612         Z=X;
    613         idx = i;
    614       }
    615     }
    616   }
    617   if(iPOCDiff<255)
     610    UInt x = lpNr? currSlice->getColFromL0Flag() : 1-currSlice->getColFromL0Flag();
     611   
     612    for (UInt i = 0; i < currSlice->getNumRefIdx(RefPicList(x)); i++)
     613    {
     614      Int iTempPoc = currSlice->getRefPic((RefPicList)x, i)->getPOC();
     615      Int iTempDiff = (iTempPoc > pocCurr) ? (iTempPoc - pocCurr): (pocCurr - iTempPoc);
     616     
     617      if(currSlice->getViewIndex() == currSlice->getRefPic((RefPicList)x, i)->getViewIndex() &&  (x == currSlice->getColFromL0Flag()||currSlice->getRefPOC((RefPicList)x, i)!= iColPOC)
     618        && currSlice->getRefPic((RefPicList)x, i)->getSlice(getCurrSliceIdx())->getTLayer() == uiTempLayerCurr && pocDiff > iTempDiff)
     619      {
     620        pocDiff = iTempDiff;
     621        z       = x;
     622        idx     = i;
     623      }
     624    }
     625  }
     626
     627  if( pocDiff < 255 )
    618628  {
    619629    this->setRapRefIdx(idx);
    620     this->setRapRefList((RefPicList)Z);
    621     NumDdvCandPics = 2;
    622   }
    623 
    624   return NumDdvCandPics;
     630    this->setRapRefList((RefPicList) z );
     631    numDdvCandPics = 2;
     632  }
     633
     634  return numDdvCandPics;
    625635}
    626636#endif
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

    r455 r456  
    102102#define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
    103103#define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
     104
     105#define H_3D_VSO_FIX                      0   // This fix should be enabled after verification
     106
    104107#endif
    105108////   ****** Neighbouring block-based Disparity Vector  *********
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSearch.cpp

    r446 r456  
    25762576     
    25772577#if H_3D_VSO // M35
     2578#if H_3D_VSO_FIX // This fix should be enabled after verification
    25782579        Double dLambda;
    25792580        if ( m_pcRdCost->getUseLambdaScaleVSO() )
     
    25832584
    25842585        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
     2586#else
     2587        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
     2588#endif
    25852589#else
    25862590        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
Note: See TracChangeset for help on using the changeset viewer.