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

Timestamp:

1 Sep 2013, 22:47:26 (12 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

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

trunk/source/Lib/TLibDecoder/TDecGop.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -49 +49 @@
 #include "TLibCommon/TComPic.h"
 #include "TLibCommon/TComLoopFilter.h"
-#include "TLibCommon/TComAdaptiveLoopFilter.h"
 #include "TLibCommon/TComSampleAdaptiveOffset.h"
-#include "TLibCommon/TComDepthMapGenerator.h"
-#include "../TLibCommon/TComResidualGenerator.h"
 
 #include "TDecEntropy.h"
@@ -70 +67 @@
 {
 private:
-  Int                   m_iGopSize;
   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;
@@ -87 +78 @@
   TDecSlice*            m_pcSliceDecoder;
   TComLoopFilter*       m_pcLoopFilter;
-#if DEPTH_MAP_GENERATION
-  TComDepthMapGenerator*  m_pcDepthMapGenerator;
-#endif
-#if H3D_IVRP & !QC_ARP_D0177
-  TComResidualGenerator*  m_pcResidualGenerator;
-#endif
   
-  // Adaptive Loop filter
-  TComAdaptiveLoopFilter*       m_pcAdaptiveLoopFilter;
   TComSampleAdaptiveOffset*     m_pcSAO;
   Double                m_dDecTime;
+  Int                   m_decodedPictureHashSEIEnabled;  ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message
 
-  bool m_pictureDigestEnabled; ///< if true, handle picture_digest SEI messages
-  AlfCUCtrlInfo       m_cAlfCUCtrlOneSlice;
-  AlfParamSet           m_alfParamSetPilot;
+  //! list that contains the CU address of each slice plus the end address 
+  std::vector<Int> m_sliceStartCUAddress;
+  std::vector<Bool> m_LFCrossSliceBoundaryFlag;
 
 public:
@@ -112 +96 @@
                  TDecCavlc*              pcCavlcDecoder, 
                  TDecSlice*              pcSliceDecoder, 
-                 TComLoopFilter*         pcLoopFilter, 
-                 TComAdaptiveLoopFilter* pcAdaptiveLoopFilter
-                 ,TComSampleAdaptiveOffset* pcSAO
-#if DEPTH_MAP_GENERATION
-                 ,TComDepthMapGenerator*  pcDepthMapGenerator
-#endif
-#if H3D_IVRP & !QC_ARP_D0177
-                ,TComResidualGenerator*  pcResidualGenerator
-#endif
+                 TComLoopFilter*         pcLoopFilter,
+                 TComSampleAdaptiveOffset* pcSAO
                  );
   Void  create  ();
   Void  destroy ();
-  Void  decompressGop(TComInputBitstream* pcBitstream, TComPic*& rpcPic, Bool bExecuteDeblockAndAlf );
-  Void  setGopSize( Int i) { m_iGopSize = i; }
+  Void  decompressSlice(TComInputBitstream* pcBitstream, TComPic*& rpcPic );
+  Void  filterPicture  (TComPic*& rpcPic );
 
-  void setPictureDigestEnabled(bool enabled) { m_pictureDigestEnabled = enabled; }
-  AlfCUCtrlInfo& getAlfCuCtrlParam() { return m_cAlfCUCtrlOneSlice; }
-  AlfParamSet& getAlfParamSet() {return m_alfParamSetPilot;}
-
-private:
-  Void patchAlfLCUParams(ALFParam*** alfLCUParam, AlfParamSet* alfParamSet, Int firstLCUAddr = 0);
-
+  void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
 
 };