Changeset 1291 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

18 Jul 2015, 02:28:34 (10 years ago)

Author:

seregin

Message:

port rev 4325

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -85 +85 @@
 , m_pcPPS                         ( NULL )
 , m_pcPic                         ( NULL )
-#if ADAPTIVE_QP_SELECTION
-, m_pcTrQuant                     ( NULL )
-#endif
 , m_colFromL0Flag                 ( true )
 , m_noOutputPriorPicsFlag         ( false )

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -2049 +2049 @@
   const TComPPS*              getPPS() const                                         { return m_pcPPS;                                               }
 
-#if ADAPTIVE_QP_SELECTION
-  Void                        setTrQuant( TComTrQuant* pcTrQuant )                   { m_pcTrQuant = pcTrQuant;                                      }
-  TComTrQuant*                getTrQuant()                                           { return m_pcTrQuant;                                           }
-  const TComTrQuant*          getTrQuant() const                                     { return m_pcTrQuant;                                           }
-#endif
-
   Void                        setPPSId( Int PPSId )                                  { m_iPPSId = PPSId;                                             }
   Int                         getPPSId() const                                       { return m_iPPSId;                                              }