Changeset 1313 in 3DVCSoftware for trunk/source/App/TAppDecoder/TAppDecTop.h


Ignore:
Timestamp:
13 Aug 2015, 17:38:13 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev1@1312.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppDecoder/TAppDecTop.h

    r1179 r1313  
    22 * License, included below. This software may be subject to other third party
    33 * and contributor rights, including patent rights, and no such rights are
    4  * granted under this license. 
     4 * granted under this license.
    55 *
    6 * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2015, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    6161private:
    6262  // class interface
    63 #if H_MV
     63#if NH_MV
    6464  TDecTop*                        m_tDecTop             [ MAX_NUM_LAYERS ];    ///< decoder classes
    6565  TVideoIOYuv*                    m_tVideoIOYuvReconFile[ MAX_NUM_LAYERS ];    ///< reconstruction YUV class
     
    6868  TComPicLists                    m_ivPicLists;                                ///< picture buffers of decoder instances
    6969  Bool                            m_layerInitilizedFlags[ MAX_NUM_LAYER_IDS ]; ///< for layerwise startup
    70   TComVPS*                        m_vps;                                ///< active VPS
     70  const TComVPS*                  m_vps;                                ///< active VPS
    7171#else
    7272  TDecTop                         m_cTDecTop;                     ///< decoder class
    7373  TVideoIOYuv                     m_cTVideoIOYuvReconFile;        ///< reconstruction YUV class
    7474#endif
    75     // for output control
    76 #if H_MV
     75  // for output control
     76#if NH_MV
    7777  Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order
    7878  Bool                            m_reconOpen           [ MAX_NUM_LAYERS ]; ///< reconstruction file opened
     
    8181  Int                             m_iPOCLastDisplay;              ///< last POC in display order
    8282#endif
     83  std::ofstream                   m_seiMessageFileStream;         ///< Used for outputing SEI messages.
    8384
    84 #if H_3D
     85#if NH_3D
    8586  FILE*                           m_pScaleOffsetFile;
    8687  CamParsCollector                m_cCamParsCollector;
     
    8990  TAppDecTop();
    9091  virtual ~TAppDecTop() {}
    91  
     92
    9293  Void  create            (); ///< create internal members
    9394  Void  destroy           (); ///< destroy internal members
    9495  Void  decode            (); ///< main decoding function
     96#if NH_MV
     97  UInt  getNumberOfChecksumErrorsDetected( ) const
     98  {
     99    UInt numOfChecksumErrors = 0;
     100    for (Int i = 0; i < m_numDecoders; i++ )
     101    {
     102      numOfChecksumErrors += getNumberOfChecksumErrorsDetected( i );
     103    }
     104    return numOfChecksumErrors;
     105  }
     106
     107  UInt  getNumberOfChecksumErrorsDetected( Int decIdx ) const { return m_tDecTop[decIdx]->getNumberOfChecksumErrorsDetected(); }
     108
     109#else
     110  UInt  getNumberOfChecksumErrorsDetected() const { return m_cTDecTop.getNumberOfChecksumErrorsDetected(); }
     111#endif
    95112
    96113protected:
     
    99116  Void  xInitDecLib       (); ///< initialize decoder class
    100117
    101 #if H_MV
     118#if NH_MV
    102119  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
    103120
Note: See TracChangeset for help on using the changeset viewer.