Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecGop.h


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecGop.h

    r56 r296  
    9090  TComDepthMapGenerator*  m_pcDepthMapGenerator;
    9191#endif
    92 #if HHI_INTER_VIEW_RESIDUAL_PRED
     92#if H3D_IVRP
    9393  TComResidualGenerator*  m_pcResidualGenerator;
    9494#endif
     
    101101  bool m_pictureDigestEnabled; ///< if true, handle picture_digest SEI messages
    102102  AlfCUCtrlInfo       m_cAlfCUCtrlOneSlice;
    103 #if LCU_SYNTAX_ALF
    104103  AlfParamSet           m_alfParamSetPilot;
    105 #endif
    106104
    107105public:
     
    120118                 ,TComDepthMapGenerator*  pcDepthMapGenerator
    121119#endif
    122 #if HHI_INTER_VIEW_RESIDUAL_PRED
     120#if H3D_IVRP
    123121                ,TComResidualGenerator*  pcResidualGenerator
    124122#endif
     
    131129  void setPictureDigestEnabled(bool enabled) { m_pictureDigestEnabled = enabled; }
    132130  AlfCUCtrlInfo& getAlfCuCtrlParam() { return m_cAlfCUCtrlOneSlice; }
    133 #if LCU_SYNTAX_ALF
    134131  AlfParamSet& getAlfParamSet() {return m_alfParamSetPilot;}
    135 #endif
    136132
    137133private:
    138 #if LCU_SYNTAX_ALF
    139134  Void patchAlfLCUParams(ALFParam*** alfLCUParam, AlfParamSet* alfParamSet, Int firstLCUAddr = 0);
    140 #endif
    141135
    142136
Note: See TracChangeset for help on using the changeset viewer.