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

Timestamp:

10 Dec 2013, 13:50:12 (10 years ago)

Author:

tech

Message:

Merged HTM-9.0-dev0@731. (MV-HEVC 6 HLS)

File:

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

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -186 +186 @@
   TComList<TComPic*>      m_cListPic;         //  Dynamic buffer
 #if H_MV
+#if H_MV_LAYER_WISE_STARTUP
+  Bool*                    m_layerInitilizedFlag; // initialization Layers
+#endif
   static ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
 #else
@@ -243 +246 @@
   Void  init();
 #if H_MV  
+#if H_MV_FIX_SKIP_PICTURES
+  Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayer, Bool& sliceSkippedFlag );
+#else
+  Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayer );
+#endif
   Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayer );
 #else  
@@ -260 +268 @@
   TComList<TComPic*>*     getListPic            ()               { return &m_cListPic;  }  
   Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
-  
+#if H_MV_LAYER_WISE_STARTUP
+  Void                    setLayerInitilizedFlags( Bool* val )    { m_layerInitilizedFlag = val; }
+#endif
+#if H_MV_6_HRD_O0217_13
+  TComVPS*                getPrefetchedVPS      ()               { return m_parameterSetManagerDecoder.getPrefetchedVPS( 0 ); }; //Assuming that currently only one VPS is present. 
+#endif
   Int                     getCurrPoc            ()               { return m_apcSlicePilot->getPOC(); }
   Void                    setLayerId            ( Int layer)     { m_layerId = layer;   }
@@ -281 +294 @@
 #if H_MV  
   TComPic*  xGetPic( Int layerId, Int poc ); 
+#if H_MV_FIX_SKIP_PICTURES
+  Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, Bool newLayerFlag, Bool& sliceSkippedFlag );  
+#else
   Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, Bool newLayerFlag );  
+#endif
   Void      xResetPocInPicBuffer();
+#if H_MV_LAYER_WISE_STARTUP
+  Void      xCeckNoClrasOutput();
+
+  Bool      xAllRefLayersInitilized();
+#endif
 #else
   Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay);