Changeset 976 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecTop.h

Timestamp:

7 Jul 2014, 17:27:51 (10 years ago)

Author:

tech

Message:

• Merged 11.1-dev0@975. (Clean ups)
• Added coding results.
• Changed version number.

File:

• trunk/source/Lib/TLibDecoder/TDecTop.h (modified) (4 diffs)

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -195 +195 @@
   Bool*                    m_layerInitilizedFlag; // initialization Layers
   static ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
-#if  H_MV_HLS_8_HRD_Q0102_08
   Int                      m_targetOptLayerSetIdx; 
-#endif
 #else
   ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
@@ -234 +232 @@
   Bool                    m_craNoRaslOutputFlag;    //value of variable NoRaslOutputFlag of the last CRA pic
 #endif
-#if H0056_EOS_CHECKS
+#if H_MV
   Bool                    m_isLastNALWasEos;
 #endif
@@ -271 +269 @@
   Void  deletePicBuffer();
 #if H_MV
-#if H_MV_HLS_7_VPS_P0300_27
   TComVPS* getActiveVPS() { return m_parameterSetManagerDecoder.getActiveVPS( ); }
-#endif
   TComSPS* getActiveSPS() { return m_parameterSetManagerDecoder.getActiveSPS( m_layerId ); }
 #else
@@ -296 +292 @@
   Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
   Void                    setLayerInitilizedFlags( Bool* val )    { m_layerInitilizedFlag = val; }
-#if  H_MV_HLS_8_HRD_Q0102_08
   Void                    setTargetOptLayerSetIdx( Int targetOptLayerSetIdx ) { m_targetOptLayerSetIdx = targetOptLayerSetIdx; }    
-#endif
   TComVPS*                getPrefetchedVPS      ()               { return m_parameterSetManagerDecoder.getPrefetchedVPS( 0 ); }; //Assuming that currently only one VPS is present. 
   Int                     getCurrPoc            ()               { return m_apcSlicePilot->getPOC(); }