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


Ignore:
Timestamp:
18 Jun 2013, 17:25:49 (11 years ago)
Author:
tech
Message:

Minor clean ups.

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

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

    r476 r478  
    683683#endif
    684684#if H_3D_IV_MERGE
     685// GT: This function is not necessary anymore m_ivPicLists should be used instead
    685686TComPic* TAppDecTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
    686687{
     
    701702}
    702703#endif
    703 
    704704//! \}
  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.h

    r476 r478  
    7676    // for output control
    7777  Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
    78 
    7978#if H_3D_IV_MERGE
    8079  Int  m_fcoViewDepthId;
     
    107106  TDecTop* getTDecTop     ( Int viewIdx, Bool isDepth );
    108107  TComPic*              getPicFromView     ( Int viewIdx, Int poc, bool isDepth ) { return xGetPicFromView( viewIdx, poc, isDepth ); }
    109 #endif
    110 
    111 #if H_3D_IV_MERGE
    112108  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
    113109  TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
     
    124120  TComPic* xGetPicFromView( Int viewIdx, Int poc, Bool isDepth );
    125121#endif
    126 
    127122#if H_MV
    128123  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
     
    133128  Void  xFlushOutput      ( TComList<TComPic*>* pcListPic ); ///< flush all remaining decoded pictures to file
    134129#endif
    135 
    136130  Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
    137131};
  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

    r476 r478  
    717717
    718718#endif //HHI_VSO
    719 
    720719#if H_3D_IV_MERGE
    721720  ("PredDepthMapGen",  m_uiPredDepthMapGeneration, (UInt)0, "generation of prediction depth maps for motion data prediction" )
  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp

    r476 r478  
    128128    m_frameRcvd                 .push_back(0);
    129129    m_acTEncTopList             .push_back(new TEncTop);
    130 #if H_3D_IV_MERGE
    131 //    m_acTEncDepthTopList        .push_back(new TEncTop);
    132 #endif
    133130    m_acTVideoIOYuvInputFileList.push_back(new TVideoIOYuv);
    134131    m_acTVideoIOYuvReconFileList.push_back(new TVideoIOYuv);
    135132    m_picYuvRec                 .push_back(new TComList<TComPicYuv*>) ;
    136 #if H_3D_IV_MERGE
    137     //m_acTEncDepthTopList[iViewIdx]->setFrameRate                    ( m_iFrameRate );
    138     //m_acTEncDepthTopList[iViewIdx]->setFrameSkip                    ( m_FrameSkip );
    139     //m_acTEncDepthTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
    140     //m_acTEncDepthTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
    141     //m_acTEncDepthTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
    142     //m_acTEncDepthTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
    143     //m_acTEncDepthTopList[iViewIdx]->setCropRight                    ( m_cropRight );
    144     //m_acTEncDepthTopList[iViewIdx]->setCropTop                      ( m_cropTop );
    145     //m_acTEncDepthTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
    146     //m_acTEncDepthTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
    147     //m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
    148     //m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
    149 
    150     //m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
    151 
    152     //m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( layerId );
    153 
    154 #endif
     133
    155134    m_ivPicLists.push_back( m_acTEncTopList[ layer ]->getListPic()  );
    156135    TEncTop& m_cTEncTop = *m_acTEncTopList[ layer ];  // It is not a member, but this name helps avoiding code duplication !!!
     
    164143    m_cTEncTop.setIsDepth                      ( isDepth );
    165144    //====== Camera Parameters =========
    166 #if H_3D_IV_MERGE
    167       //m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( 0 );
    168       //m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( false );
    169       //m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( 0 );
    170       //m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( 0 );
    171 #endif
    172145    m_cTEncTop.setCameraParameters             ( &m_cCameraData );     
    173146    m_cTEncTop.setCamParPrecision              ( isDepth ? false : m_cCameraData.getCamParsCodedPrecision  () );
     
    220193 
    221194  //====== Coding Structure ========
    222 #if H_3D_IV_MERGE
    223       //m_acTEncDepthTopList[iViewIdx]->setIntraPeriod                  ( m_iIntraPeriod );
    224       //m_acTEncDepthTopList[iViewIdx]->setDecodingRefreshType          ( m_iDecodingRefreshType );
    225       //m_acTEncDepthTopList[iViewIdx]->setGOPSize                      ( m_iGOPSize );
    226       //m_acTEncDepthTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
    227       //m_acTEncDepthTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
    228 #endif
    229195  m_cTEncTop.setIntraPeriod                  ( m_iIntraPeriod );
    230196  m_cTEncTop.setDecodingRefreshType          ( m_iDecodingRefreshType );
     
    267233  {
    268234    m_cTEncTop.setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
    269 #if H_3D_IV_MERGE
    270 //        m_acTEncDepthTopList[iViewIdx]->setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
    271 #endif
    272235  }
    273236#if H_MV
     
    289252 
    290253  //====== Loop/Deblock Filter ========
    291 #if H_3D_IV_MERGE
    292       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterDisable            ( m_abLoopFilterDisable[1]   );
    293       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterOffsetInAPS        ( m_loopFilterOffsetInAPS );
    294       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
    295       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
    296       //m_acTEncDepthTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
    297 #endif
    298254#if H_MV
    299255  m_cTEncTop.setLoopFilterDisable            ( m_bLoopFilterDisable[layer]);
     
    11021058#endif
    11031059#if H_3D_IV_MERGE
     1060 // GT: This function is not necessary anymore m_ivPicLists should be used instead
    11041061TComPic* TAppEncTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
    11051062{
  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h

    r476 r478  
    9292  TRenModel                   m_cRendererModel;   
    9393#endif
    94 
    9594#if H_3D_IV_MERGE
    9695  TComVPSAccess               m_cVPSAccess;
     
    145144  TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
    146145#endif
    147 
    148146#if H_3D_IV_MERGE
    149147  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h

    r476 r478  
    211211}
    212212#endif
    213 
    214213template <typename T>
    215214__inline T gSign(const T& t)
     
    362361
    363362#if H_3D_IV_MERGE
     363 // GT: To be checked if all of this is still necessary.
    364364#define PDM_USE_FOR_IVIEW                 1
    365365#define PDM_USE_FOR_INTER                 2
     
    381381
    382382#endif
    383 
    384383#endif // end of H_3D
    385384//! \}
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

    r476 r478  
    24572457  deriveLeftRightTopIdxGeneral( uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
    24582458  deriveLeftBottomIdxGeneral  ( uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
    2459 
    24602459#if H_3D_IV_MERGE
    24612460  Bool bNoPdmMerge   = ( m_pcSlice->getSPS()->getViewIndex() == 0 || ( m_pcSlice->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) != PDM_USE_FOR_MERGE );
     
    26032602#endif
    26042603#endif
    2605 
    26062604  //left
    26072605  UInt uiLeftPartIdx = 0;
     
    26232621      pcCULeft->getMvField( pcCULeft, uiLeftPartIdx, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
    26242622    }
    2625 
    26262623#if H_3D_IV_MERGE
    26272624    Bool bRemoveSpa = false; //pruning to inter-view candidates
     
    45024499}
    45034500#endif
    4504 
    45054501#if H_3D_IV_MERGE
    45064502Bool TComDataCU::getUnifiedMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h

    r476 r478  
    434434   
    435435#endif
    436 
    437436#if H_3D_IV_MERGE
    438437  Bool          getUnifiedMvPredCan       ( UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge );
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.cpp

    r476 r478  
    4343#include "TComDepthMapGenerator.h"
    4444
    45 
     45#if H_3D_IV_MERGE
    4646
    4747TComDepthMapGenerator::TComDepthMapGenerator()
     
    136136}
    137137
    138 
    139 #if H_3D_IV_MERGE
    140138Bool
    141139TComDepthMapGenerator::getPdmCandidate(TComDataCU* pcCU, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.h

    r476 r478  
    4848#include "TComSlice.h"
    4949
    50 
     50#if H_3D_IV_MERGE
    5151
    5252class TComVPSAccess // would be better to have a real VPS buffer
     
    156156
    157157
    158 
     158#endif
    159159#endif // __TCOM_DEPTH_MAP_GENERATOR__
    160160
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComMotionInfo.h

    r476 r478  
    105105  Int getHor   () const { return  m_acMv.getHor(); }
    106106  Int getVer   () const { return  m_acMv.getVer(); }
    107 
    108107#if H_3D_IV_MERGE
    109108  Bool operator== ( const TComMvField& rcMv ) const
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPicYuv.cpp

    r476 r478  
    8484  m_iBaseUnitHeight = uiMaxCUHeight >> uiMaxCUDepth;
    8585#endif
    86 
    8786  Int numCuInWidth  = m_iPicWidth  / m_iCuWidth  + (m_iPicWidth  % m_iCuWidth  != 0);
    8887  Int numCuInHeight = m_iPicHeight / m_iCuHeight + (m_iPicHeight % m_iCuHeight != 0);
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

    r476 r478  
    18571857  }
    18581858}
    1859 
    18601859#if H_3D_IV_MERGE
    18611860Void
     
    18711870}
    18721871#endif
    1873 
    18741872const Int TComSPS::m_winUnitX[]={1,2,2,1};
    18751873const Int TComSPS::m_winUnitY[]={1,2,1,1};
     
    19421940  m_bDepth                = false;
    19431941#endif
    1944 
    19451942  if( !m_bCamParInSliceHeader )
    19461943  {
     
    19541951  }
    19551952}
    1956 
    19571953#if H_3D_IV_MERGE
    19581954Void
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

    r476 r478  
    5454class TComPicLists;
    5555#endif
    56 
    5756#if H_3D_IV_MERGE
    5857class TComDepthMapGenerator;
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r476 r478  
    759759    }
    760760#endif // !H_MV
    761 
    762761#if H_3D_IV_MERGE
    763762    READ_FLAG( uiCode, "base_view_flag" );
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCu.cpp

    r476 r478  
    320320    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
    321321    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );
     322#if H_3D_IV_MERGE
    322323    m_ppcCU[uiDepth]->copyDVInfoFrom(pcCU, uiAbsPartIdx);
    323 #if H_3D_IV_MERGE
    324324    TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
    325325    UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.cpp

    r476 r478  
    158158    m_LFCrossSliceBoundaryFlag.push_back( pcSlice->getLFCrossSliceBoundaryFlag());
    159159  }
    160 
    161160#if H_3D_IV_MERGE
    162161  if( uiStartCUAddr == 0 )
     
    165164  }
    166165#endif
    167 
    168166#if H_3D_NBDV
    169167  if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.h

    r476 r478  
    5454#include "TLibCommon/TComDepthMapGenerator.h"
    5555#endif
    56 
    5756#include "TDecEntropy.h"
    5857#include "TDecSlice.h"
     
    8685  TComDepthMapGenerator*  m_pcDepthMapGenerator;
    8786#endif
    88 
    8987  TComSampleAdaptiveOffset*     m_pcSAO;
    9088  Double                m_dDecTime;
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp

    r476 r478  
    409409  m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
    410410  m_cEntropyDecoder.init(&m_cPrediction);
    411 
    412411#if H_3D_IV_MERGE
    413412  m_tAppDecTop = pcTAppDecTop;
     
    919918
    920919#endif
    921 
    922920#if H_3D_IV_MERGE
    923921    TComPic * const pcTexturePic = m_isDepth ? m_tAppDecTop->getPicFromView(  m_viewIndex, pcSlice->getPOC(), false ) : NULL;
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

    r476 r478  
    581581  WRITE_FLAG( 0, "sps_extension_flag" );
    582582#endif
    583 
    584583#if H_3D_IV_MERGE
    585584  if( pcSPS->getViewIndex() || pcSPS->isDepth() )
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

    r476 r478  
    682682#endif
    683683
    684 #if H_3D_IV_MERGE
     684#if H_3D_IV_MERGE 
    685685    TAppEncTop* tAppEncTop = m_pcEncTop->getEncTop();
    686686    TComPic * const pcTexturePic = m_pcEncTop->getIsDepth() ? tAppEncTop->getPicFromView( getViewIndex(), pcSlice->getPOC(), false ) : NULL;
     
    10421042    m_storedStartCUAddrForEncodingSliceSegment.push_back(nextCUAddr);
    10431043    startCUAddrSliceSegmentIdx++;
    1044 
    10451044#if H_3D_IV_MERGE
    10461045    m_pcDepthMapGenerator->initViewComponent( pcPic );
    10471046#endif
    1048 
    10491047#if H_3D_NBDV
    10501048      if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.h

    r476 r478  
    110110  Int                     m_viewIndex;
    111111  Bool                    m_isDepth;
    112 
    113112#if H_3D_IV_MERGE
    114113  TComDepthMapGenerator*  m_pcDepthMapGenerator;
    115114#endif
    116 
    117115#endif
    118116#endif
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

    r476 r478  
    123123  m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_bitDepthY, PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
    124124#endif
    125 
    126125#if RATE_CONTROL_LAMBDA_DOMAIN
    127126  if ( m_RCEnableRateControl )
     
    229228  m_cLoopFilter.        destroy();
    230229  m_cRateCtrl.          destroy();
    231 
    232230#if H_3D_IV_MERGE
    233231  m_cDepthMapGenerator. destroy();
     
    322320  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
    323321#endif
    324 
    325322  // initialize transform & quantization class
    326323  m_pcCavlcCoder = getCavlcCoder();
     
    13341331}
    13351332#endif
    1336 
    1337 
    13381333//! \}
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.h

    r476 r478  
    5757#include "TEncPreanalyzer.h"
    5858#include "TEncRateCtrl.h"
    59 
    6059#if H_3D_IV_MERGE
    6160#include "TLibCommon/TComDepthMapGenerator.h"
     
    7170class TAppEncTop;
    7271#endif
    73 
    7472/// encoder class
    7573class TEncTop : public TEncCfg
     
    104102  TEncSlice               m_cSliceEncoder;                ///< slice encoder
    105103  TEncCu                  m_cCuEncoder;                   ///< CU encoder
    106 
    107104#if H_3D_IV_MERGE
    108105  TComDepthMapGenerator   m_cDepthMapGenerator;           ///< depth map generator
    109106#endif
    110 
    111107  // SPS
    112108  TComSPS                 m_cSPS;                         ///< SPS
Note: See TracChangeset for help on using the changeset viewer.