Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPicSym.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPicSym.h (modified) (5 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPicSym.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -106 +106 @@
   UInt*         m_ctuRsToTsAddrMap;    ///< for a given RS (Raster-Scan) address, returns the TS (Tile-Scan; coding order) address. cf CtbAddrRsToTs in specification.
 
+#if REDUCED_ENCODER_MEMORY
+public:
+  struct DPBPerCtuData
+  {
+    Bool isInter(const UInt absPartAddr)                const { return m_pePredMode[absPartAddr] == MODE_INTER; }
+    PartSize getPartitionSize( const UInt absPartAddr ) const { return static_cast<PartSize>( m_pePartSize[absPartAddr] ); }
+    const TComCUMvField* getCUMvField ( RefPicList e )  const { return &m_CUMvField[e];                  }
+    const TComSlice* getSlice()                         const { return m_pSlice; }
+
+    SChar        * m_pePredMode;
+    SChar        * m_pePartSize;
+    TComCUMvField  m_CUMvField[NUM_REF_PIC_LIST_01];
+    TComSlice    * m_pSlice;
+  };
+
+private:
+  DPBPerCtuData *m_dpbPerCtuData;
+#endif
   SAOBlkParam  *m_saoBlkParams;
 #if ADAPTIVE_QP_SELECTION
@@ -121 +139 @@
 
 public:
+#if REDUCED_ENCODER_MEMORY
+  Void               create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const Bool bAllocateCtuArray );
+  Void               prepareForReconstruction();
+  Void               releaseReconstructionIntermediateData();
+  Void               releaseAllReconstructionData();
+#else
   Void               create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth );
+#endif
   Void               destroy ();
 
@@ -138 +163 @@
   const TComSPS&     getSPS()                 const                        { return m_sps; }
   const TComPPS&     getPPS()                 const                        { return m_pps; }
+#if REDUCED_ENCODER_MEMORY
+  Bool                 hasDPBPerCtuData() const                            { return (m_dpbPerCtuData!=0); };
+  DPBPerCtuData&       getDPBPerCtuData(UInt ctuRsAddr)                    { return m_dpbPerCtuData[ctuRsAddr]; }
+  const DPBPerCtuData& getDPBPerCtuData(UInt ctuRsAddr) const              { return m_dpbPerCtuData[ctuRsAddr]; }
+#endif
 
   TComSlice *        swapSliceObject(TComSlice* p, UInt i)                 { p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }
@@ -166 +196 @@
 //! \}
 
+#if MCTS_ENC_CHECK
+Void getTilePosition(const TComDataCU* const pcCU, UInt &tileXPosInCtus, UInt &tileYPosInCtus, UInt &tileWidthtInCtus, UInt &tileHeightInCtus);
+#endif
+
 #endif // __TCOMPICSYM__