Changeset 366 in 3DVCSoftware for branches/HTM-DEV-0.1-dev


Ignore:
Timestamp:
3 May 2013, 16:53:39 (11 years ago)
Author:
tech
Message:

Further minor cleanups.

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

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r365 r366  
    5454
    5555TAppDecTop::TAppDecTop()
    56 
    5756#if !H_MV
    5857: m_iPOCLastDisplay(-MAX_INT)
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r365 r366  
    19791979  printf("Input          File          : %s\n", m_pchInputFile          );
    19801980#endif
    1981 
    19821981  printf("Bitstream      File          : %s\n", m_pchBitstreamFile      );
    1983 
    19841982#if H_MV
    19851983  for( Int layer = 0; layer < m_numberOfLayers; layer++)
     
    19901988  printf("Reconstruction File          : %s\n", m_pchReconFile          );
    19911989#endif
    1992 
    19931990#if H_MV
    19941991 xPrintParaVector( "ViewId", m_viewId );
    19951992#endif
    1996 
    19971993#if H_3D
    19981994 xPrintParaVector( "DepthFlag", m_depthFlag );
    19991995#endif
    2000 
    20011996#if H_MV 
    20021997  xPrintParaVector( "QP"               , m_fQP                );
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r365 r366  
    183183  m_cTEncTop.setQP                           ( m_iQP );
    184184#endif
     185
    185186  m_cTEncTop.setPad                          ( m_aiPad );
     187
    186188#if H_MV
    187189  m_cTEncTop.setMaxTempLayer                 ( m_maxTempLayerMvc[layer] );
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

    r363 r366  
    15431543}
    15441544#endif
    1545 
    15461545// ------------------------------------------------------------------------------------------------
    15471546// Sequence parameter set (SPS)
     
    21432142}
    21442143#endif
    2145 
    21462144/** get scaling matrix from RefMatrixID
    21472145 * \param sizeId size index
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

    r364 r366  
    248248  ProfileTierLevel* getGeneralPTL()  { return &m_generalPTL; }
    249249  ProfileTierLevel* getSubLayerPTL(Int i)  { return &m_subLayerPTL[i]; }
    250 
    251250#if H_MV
    252251  Void copyLevelFrom( TComPTL* source );
     
    536535
    537536#endif
    538 
    539537public:
    540538  TComVPS();
     
    596594  TComPTL* getPTL() { return &m_pcPTL; }
    597595#endif
    598 
    599596#if SIGNAL_BITRATE_PICRATE_IN_VPS
    600597  TComBitRatePicRateInfo *getBitratePicrateInfo() { return &m_bitRatePicRateInfo; }
     
    15851582  Void      setRefPicList       ( TComList<TComPic*>& rcListPic );
    15861583#endif
    1587 
    15881584#endif
    15891585  Void      setRefPOCList       ();
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h

    r364 r366  
    140140#endif
    141141 
    142 
    143142#if H_MV   
    144143  TComPic*                getPic                ( Int poc );
     
    156155#endif
    157156#endif
    158  
    159157protected:
    160158  Void  xGetNewPicBuffer  (TComSlice* pcSlice, TComPic*& rpcPic);
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r362 r366  
    654654  }
    655655#endif
    656 
    657656#if H_MV
    658657  WRITE_FLAG( 1,                                             "vps_extension_flag" );
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r364 r366  
    358358// Public member functions
    359359// ====================================================================================================================
    360 
    361360#if H_MV
    362361Void TEncGOP::initGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
     
    366365}
    367366#endif
    368 
    369367#if H_MV
    370368Void TEncGOP::compressPicInGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid)
     
    17121710      pcPic->compressMotion();
    17131711#endif
    1714 
    17151712#if H_MV
    17161713      m_pocLastCoded = pcPic->getPOC();
    17171714#endif
    1718 
    17191715      //-- For time output for each slice
    17201716      Double dEncTime = (Double)(clock()-iBeforeTime) / CLOCKS_PER_SEC;
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r365 r366  
    10061006  }
    10071007#endif
     1008
    10081009}
    10091010
     
    11191120  }
    11201121}
    1121 
    11221122#if H_MV
    11231123Void TEncTop::printSummary( Int numAllPicCoded )
     
    11821182}
    11831183#endif
    1184 
    11851184//! \}
Note: See TracChangeset for help on using the changeset viewer.