Changeset 364 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib


Ignore:
Timestamp:
3 May 2013, 16:34:51 (12 years ago)
Author:
tech
Message:

Further cleanups

Location:
branches/HTM-DEV-0.1-dev/source/Lib
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h

    r324 r364  
    4646#endif
    4747#endif
    48 
    4948//! \ingroup TAppCommon
    5049//! \{
    … …  
    382381      }
    383382#endif
    384 
    385383      /**
    386384       * Add option described by name to the parent Options list,

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h

    r362 r364  
    168168
    169169#endif
    170 
    171170
    172171// ====================================================================================================================

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h

    r362 r364  
    4747  NalUnitType m_nalUnitType; ///< nal_unit_type
    4848  UInt        m_temporalId;  ///< temporal_id
    49 
    5049#if H_MV
    5150  Int         m_layerId;     ///< layer id

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r324 r364  
    32003200  Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
    32013201  Bool bIsNeibRefLongTerm = false;
    3202 
    32033202  //---------------  V1 (END) ------------------//
    32043203  if( pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0)

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h

    r324 r364  
    9393#endif
    9494#endif
    95 
    9695public:
    9796  TComPic();
    … …  
    116115#endif
    117116#endif
    118 
    119117  Bool          getUsedByCurr()             { return m_bUsedByCurr; }
    120118  Void          setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; }
    … …  
    186184  Void          print( Bool legend );
    187185#endif
    188 
    189 
    190 
    191186  /** transfer ownership of seis to this picture */
    192187  void setSEIs(SEIMessages& seis) { m_SEIs = seis; }

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

    r363 r364  
    603603  TimingInfo* getTimingInfo() { return &m_timingInfo; }
    604604#endif
    605 
    606605#if H_MV
    607606  Void    setAvcBaseLayerFlag( Bool val )                                  { m_avcBaseLayerFlag = val;  }
    … …  
    971970  static const Int   m_winUnitY[MAX_CHROMA_FORMAT_IDC+1];
    972971  TComPTL     m_pcPTL;
    973 
    974972#if H_MV
    975973  Bool        m_interViewMvVertConstraintFlag;
    976974#endif
    977 
    978975public:
    979976  TComSPS();
    … …  
    11061103
    11071104  TComPTL* getPTL()     { return &m_pcPTL; }
    1108 
    11091105#if H_MV
    11101106  Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; }
    … …  
    14641460
    14651461  Bool       m_enableTMVPFlag;
    1466 
    14671462#if H_MV
    14681463  Int        m_layerId;
    … …  
    14721467#endif
    14731468#endif
    1474 
    14751469public:
    14761470  TComSlice();
    … …  
    16391633  Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum );
    16401634  Void applyReferencePictureSet( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList);
    1641 
    16421635#if H_MV
    16431636  Void createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector<TComPic*>& refPicSetInterLayer );
    … …  
    16481641  Void xPrintRefPicList();
    16491642#endif
    1650 
    16511643  Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic );
    16521644  Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic );

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h

    r362 r364  
    9191#define MAX_VPS_NUM_HRD_PARAMETERS                1
    9292#define MAX_VPS_OP_SETS_PLUS1                     1024
    93 
    9493#if H_MV
    9594#define MAX_VPS_NUH_LAYER_ID_PLUS1  64
    … …  
    105104#define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
    106105#define MAX_NUM_LAYER_IDS               64
     106#if H_MV
    107107#define MAX_NUM_LAYERS                  64
     108#endif
    108109
    109110#define COEF_REMAIN_BIN_REDUCTION        3 ///< indicates the level at which the VLC
    … …  
    569570#endif
    570571#endif
    571 

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r324 r364  
    208208  rpcPic->compressMotion();
    209209#endif
    210 
    211210  Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
    212211  if (!pcSlice->isReferenced()) c += 32;
    213212
    214213  //-- For time output for each slice
    215 
    216214#if H_MV
    217215  printf("\nLayer %2d   POC %4d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getLayerId(),

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r363 r364  
    9393}
    9494
    95 
    9695Void TDecTop::init()
    9796{
    … …  
    10099  initROM();
    101100#endif
    102 
    103101  m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO);
    104102  m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
    … …  
    222220  rpcListPic          = &m_cListPic; 
    223221  m_cCuDecoder.destroy();       
    224 
    225222#if H_MV
    226223  TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer ); 
    227224  TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc );
    228225#endif
    229 
    230226  m_bFirstSliceInPicture  = true;
    231227
    … …  
    380376  m_apcSlicePilot->setLayerId( nalu.m_layerId );
    381377#endif
    382 
    383378  m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
    384379

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h

    r324 r364  
    6464class TAppDecTop;
    6565#endif
    66 
    6766/// decoder class
    6867class TDecTop
    … …  
    8180  ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets
    8281#endif
    83 
    8482  TComSlice*              m_apcSlicePilot;
    8583 

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h

    r363 r364  
    406406#endif
    407407#endif
    408 
    409408  //====== Coding Structure ========
    410409  Void      setIntraPeriod                  ( Int   i )      { m_uiIntraPeriod = (UInt)i; }

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r362 r364  
    410410  UInt *accumNalsDU = NULL;
    411411  SEIDecodingUnitInfo decodingUnitInfoSEI;
    412 
    413412#if !H_MV
    414413  for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
    … …  
    472471    if(pocCurr>=m_pcCfg->getFramesToBeEncoded())
    473472    {
    474 
    475473#if H_MV
    476474      delete pcBitstreamRedirect;
    … …  
    20572055  assert ( m_iNumPicCoded == iNumPicRcvd );
    20582056#endif
    2059 
    20602057}
    20612058
    … …  
    23772374  m_gcAnalyzeAll.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
    23782375#endif
    2379 
    23802376  TComSlice*  pcSlice = pcPic->getSlice(0);
    23812377  if (pcSlice->isIntra())
    … …  
    23862382    m_gcAnalyzeI.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
    23872383#endif
    2388 
    23892384  }
    23902385  if (pcSlice->isInterP())

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h

    r363 r364  
    108108#endif
    109109#endif
    110 
    111110  //--Adaptive Loop filter
    112111  TEncSampleAdaptiveOffset*  m_pcSAO;

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h

    r362 r364  
    6363// Class definition
    6464// ====================================================================================================================
    65 
    66 
    6765
    6866/// encoder class
    … …  
    133131  TEncAnalyze             m_cAnalyzeB; 
    134132#endif
    135 
    136133protected:
    137134  Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
    … …  
    148145  Void      create          ();
    149146  Void      destroy         ();
    150 
    151147  Void      init            ();
    152 
    153148#if H_MV 
    154149  TComPicLists* getIvPicLists() { return m_ivPicLists; }
    155150#endif
    156 
    157151  Void      deletePicBuffer ();
    158152
    … …  
    162156  Void      initNewPic(TComPicYuv* pcPicYuvOrg);
    163157#endif
    164 
    165158  // -------------------------------------------------------------------------------------------------------------------
    166159  // member access functions
Note: See TracChangeset for help on using the changeset viewer.