Changeset 56 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSlice.h

Timestamp:

11 May 2012, 21:20:17 (13 years ago)

Author:

hschwarz

Message:

updated trunk (move to HM6.1)

File:

• trunk/source/Lib/TLibEncoder/TEncSlice.h (modified) (9 diffs)

trunk/source/Lib/TLibEncoder/TEncSlice.h

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.
+ * granted under this license.  
  *
- * Copyright (c) 2010-2011, ISO/IEC
+ * Copyright (c) 2010-2012, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -15 +15 @@
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- *  * Neither the name of the ISO/IEC nor the names of its contributors may
+ *  * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
  *    be used to endorse or promote products derived from this software without
  *    specific prior written permission.
@@ -32 +32 @@
  */
 
-
-
 /** \file     TEncSlice.h
     \brief    slice encoder class (header)
@@ -42 +40 @@
 
 // Include files
-#include "../TLibCommon/CommonDef.h"
-#include "../TLibCommon/TComList.h"
-#include "../TLibCommon/TComPic.h"
-#include "../TLibCommon/TComPicYuv.h"
+#include "TLibCommon/CommonDef.h"
+#include "TLibCommon/TComList.h"
+#include "TLibCommon/TComPic.h"
+#include "TLibCommon/TComPicYuv.h"
 #include "TEncCu.h"
-#ifdef WEIGHT_PRED
 #include "WeightPredAnalysis.h"
-#endif
+
+//! \ingroup TLibEncoder
+//! \{
 
 class TEncTop;
-class TEncPic;
+class TEncGOP;
 
 // ====================================================================================================================
@@ -60 +59 @@
 /// slice encoder class
 class TEncSlice
-#ifdef WEIGHT_PRED
   : public WeightPredAnalysis
-#endif
 {
 private:
@@ -74 +71 @@
   
   // processing units
-  TEncPic*                m_pcPicEncoder;                       ///< Pic encoder
+  TEncGOP*                m_pcGOPEncoder;                       ///< GOP encoder
   TEncCu*                 m_pcCuEncoder;                        ///< CU encoder
   
@@ -98 +95 @@
   Double*                 m_pdRdPicQp;                          ///< array of picture QP candidates (double-type for lambda)
   Int*                    m_piRdPicQp;                          ///< array of picture QP candidates (int-type)
+  TEncBinCABAC*           m_pcBufferBinCoderCABACs;       ///< line of bin coder CABAC
+  TEncSbac*               m_pcBufferSbacCoders;                 ///< line to store temporary contexts
+  TEncBinCABAC*           m_pcBufferLowLatBinCoderCABACs;       ///< dependent tiles: line of bin coder CABAC
+  TEncSbac*               m_pcBufferLowLatSbacCoders;           ///< dependent tiles: line to store temporary contexts
   
   UInt                    m_uiSliceIdx;
@@ -109 +110 @@
   
   /// preparation of slice encoding (reference marking, QP and lambda)
-  Void    initEncSlice        ( TComPic* pcPic, TComSlice*& rpcSlice );
-  
+  Void    initEncSlice        ( TComPic*  pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS );
+
   // compress and encode slice
   Void    precompressSlice    ( TComPic*& rpcPic                                );      ///< precompress slice for multi-loop opt.
   Void    compressSlice       ( TComPic*& rpcPic                                );      ///< analysis stage of slice
-  Void    encodeSlice         ( TComPic*& rpcPic, TComBitstream*& rpcBitstream  );      ///< entropy coding of slice
+  Void    encodeSlice         ( TComPic*& rpcPic, TComOutputBitstream* rpcBitstream, TComOutputBitstream* pcSubstreams  );
   
   // misc. functions
@@ -126 +127 @@
 };
 
+//! \}
 
 #endif // __TENCSLICE__
-