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

Timestamp:

5 Jul 2014, 05:16:45 (10 years ago)

Author:

tech

Message:

• Merged 11.0-dev0@963. (Update to HM 14.0 + MV-HEVC Draft 8 HLS)
• Added coding results.
• Changed version number.

File:

• trunk/source/Lib/TLibDecoder/TDecTop.h (modified) (5 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 
@@ -225 +228 @@
   Bool                    m_prevSliceSkipped;
   Int                     m_skippedPOC;
+#if SETTING_NO_OUT_PIC_PRIOR  
+  Bool                    m_bFirstSliceInBitstream;
+  Int                     m_lastPOCNoOutputPriorPics;
+  Bool                    m_isNoOutputPriorPics;
+  Bool                    m_craNoRaslOutputFlag;    //value of variable NoRaslOutputFlag of the last CRA pic
+#endif
+#if H0056_EOS_CHECKS
+  Bool                    m_isLastNALWasEos;
+#endif
 
 #if H_MV
@@ -258 +270 @@
   
   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
+  TComSPS* getActiveSPS() { return m_parameterSetManagerDecoder.getActiveSPS(); }
+#endif
 
 #if H_MV
@@ -265 +285 @@
 #endif
   
+#if SETTING_NO_OUT_PIC_PRIOR  
+  Void  checkNoOutputPriorPics (TComList<TComPic*>*& rpcListPic);
+
+  Bool  getNoOutputPriorPicsFlag () { return m_isNoOutputPriorPics; }
+  Void  setNoOutputPriorPicsFlag (bool val) { m_isNoOutputPriorPics = val; }
+#endif
 #if H_MV    
   TComPic*                getPic                ( Int poc );
@@ -270 +296 @@
   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(); }