Ignore:
Timestamp:
3 May 2013, 15:59:14 (11 years ago)
Author:
tech
Message:

Fixed wrongly merged parts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.h

    r362 r363  
    6060  Char*     m_pchInputFile;                                   ///< source file name
    6161#endif
    62 
    6362  Char*     m_pchBitstreamFile;                               ///< output bitstream file
    64 
    6563#if H_MV
    6664  std::vector<char*>     m_pchReconFileList;                  ///< output reconstruction file names
     
    6967  Char*     m_pchReconFile;                                   ///< output reconstruction file
    7068#endif
    71 
    72 
    7369  // VPS specification
    7470#if H_MV
     
    8379  std::vector<Int>       m_dimensionIdLen;                   ///< Length of scalability dimension s
    8480#endif
    85 
    86 
    8781  Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer
    8882  // source specification
     
    10397  Level::Tier   m_levelTier;
    10498  Level::Name   m_level;
    105 
    10699#if L0046_CONSTRAINT_FLAGS
    107100  Bool m_progressiveSourceFlag;
     
    128121#else
    129122  Int       m_maxDecPicBuffering[MAX_TLAYER];                 ///< total number of reference pictures needed for decoding
     123#endif
    130124#endif
    131125#if !L0034_COMBINED_LIST_CLEANUP
     
    378372  Void  xPrintParameter ();                                   ///< print configuration values
    379373  Void  xPrintUsage     ();                                   ///< print usage
    380 
    381374#if H_MV
    382375  template <typename T>
     
    429422  Int*      m_constantPicRateIdc;                                ///< Indicates constant picture rate idc for various sub-layers
    430423#endif
    431  
    432424#if H_MV
    433425  Int   getGOPSize() { return m_iGOPSize; }
    434426#endif
    435 
    436427public:
    437428  TAppEncCfg();
Note: See TracChangeset for help on using the changeset viewer.