Changeset 56 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecGop.h

Timestamp:

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

Author:

hschwarz

Message:

updated trunk (move to HM6.1)

File:

• trunk/source/Lib/TLibDecoder/TDecGop.h (modified) (8 diffs)

trunk/source/Lib/TLibDecoder/TDecGop.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     TDecGop.h
     \brief    GOP decoder class (header)
@@ -45 +43 @@
 #endif // _MSC_VER > 1000
 
-#include "../TLibCommon/CommonDef.h"
-#include "../TLibCommon/TComBitStream.h"
-#include "../TLibCommon/TComList.h"
-#include "../TLibCommon/TComPicYuv.h"
-#include "../TLibCommon/TComPic.h"
-#include "../TLibCommon/TComLoopFilter.h"
-#include "../TLibCommon/TComAdaptiveLoopFilter.h"
-#include "../TLibCommon/TComDepthMapGenerator.h"
+#include "TLibCommon/CommonDef.h"
+#include "TLibCommon/TComBitStream.h"
+#include "TLibCommon/TComList.h"
+#include "TLibCommon/TComPicYuv.h"
+#include "TLibCommon/TComPic.h"
+#include "TLibCommon/TComLoopFilter.h"
+#include "TLibCommon/TComAdaptiveLoopFilter.h"
+#include "TLibCommon/TComSampleAdaptiveOffset.h"
+#include "TLibCommon/TComDepthMapGenerator.h"
 #include "../TLibCommon/TComResidualGenerator.h"
 
@@ -59 +58 @@
 #include "TDecBinCoder.h"
 #include "TDecBinCoderCABAC.h"
+
+//! \ingroup TLibDecoder
+//! \{
 
 // ====================================================================================================================
@@ -71 +73 @@
   TComList<TComPic*>    m_cListPic;         //  Dynamic buffer
   
+  Bool m_first;
+  UInt m_uiILSliceCount;
+  UInt* m_puiILSliceStartLCU;
+  std::vector<AlfCUCtrlInfo> m_vAlfCUCtrlSlices;
+
   //  Access channel
   TDecEntropy*          m_pcEntropyDecoder;
   TDecSbac*             m_pcSbacDecoder;
   TDecBinCABAC*         m_pcBinCABAC;
+  TDecSbac*             m_pcSbacDecoders; // independant CABAC decoders
+  TDecBinCABAC*         m_pcBinCABACs;
   TDecCavlc*            m_pcCavlcDecoder;
   TDecSlice*            m_pcSliceDecoder;
   TComLoopFilter*       m_pcLoopFilter;
-
 #if DEPTH_MAP_GENERATION
   TComDepthMapGenerator*  m_pcDepthMapGenerator;
@@ -88 +96 @@
   // Adaptive Loop filter
   TComAdaptiveLoopFilter*       m_pcAdaptiveLoopFilter;
-#if MTK_SAO
-  TComSampleAdaptiveOffset*              m_pcSAO;
-  SAOParam              m_cSaoParam;
-#endif
-  ALFParam              m_cAlfParam;
+  TComSampleAdaptiveOffset*     m_pcSAO;
   Double                m_dDecTime;
 
   bool m_pictureDigestEnabled; ///< if true, handle picture_digest SEI messages
+  AlfCUCtrlInfo       m_cAlfCUCtrlOneSlice;
+#if LCU_SYNTAX_ALF
+  AlfParamSet           m_alfParamSetPilot;
+#endif
 
 public:
@@ -107 +115 @@
                  TDecSlice*              pcSliceDecoder, 
                  TComLoopFilter*         pcLoopFilter, 
-                 TComAdaptiveLoopFilter* pcAdaptiveLoopFilter,
-#if MTK_SAO
-                 TComSampleAdaptiveOffset*                pcSAO
-#endif
+                 TComAdaptiveLoopFilter* pcAdaptiveLoopFilter
+                 ,TComSampleAdaptiveOffset* pcSAO
 #if DEPTH_MAP_GENERATION
-                ,TComDepthMapGenerator*  pcDepthMapGenerator
+                 ,TComDepthMapGenerator*  pcDepthMapGenerator
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
-                ,TComResidualGenerator*  pcResidualGenerator 
+                ,TComResidualGenerator*  pcResidualGenerator
 #endif
                  );
   Void  create  ();
   Void  destroy ();
-  Void  decompressGop ( Bool bEos, TComBitstream* pcBitstream, TComPic*& rpcPic, Bool bExecuteDeblockAndAlf );
+  Void  decompressGop(TComInputBitstream* pcBitstream, TComPic*& rpcPic, Bool bExecuteDeblockAndAlf );
   Void  setGopSize( Int i) { m_iGopSize = i; }
 
   void setPictureDigestEnabled(bool enabled) { m_pictureDigestEnabled = enabled; }
+  AlfCUCtrlInfo& getAlfCuCtrlParam() { return m_cAlfCUCtrlOneSlice; }
+#if LCU_SYNTAX_ALF
+  AlfParamSet& getAlfParamSet() {return m_alfParamSetPilot;}
+#endif
+
+private:
+#if LCU_SYNTAX_ALF
+  Void patchAlfLCUParams(ALFParam*** alfLCUParam, AlfParamSet* alfParamSet, Int firstLCUAddr = 0);
+#endif
+
+
 };
+
+//! \}
 
 #endif // !defined(AFX_TDECGOP_H__29440B7A_7CC0_48C7_8DD5_1A531D3CED45__INCLUDED_)