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

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibDecoder/TDecGop.h (modified) (5 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-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -56 +56 @@
 #include "TDecBinCoderCABAC.h"
 
-
 //! \ingroup TLibDecoder
 //! \{
@@ -63 +62 @@
 // Class definition
 // ====================================================================================================================
-#if H_3D
+#if NH_MV
 class TDecTop; 
 #endif
@@ -73 +72 @@
 private:
   TComList<TComPic*>    m_cListPic;         //  Dynamic buffer
-  
+
   //  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 H_3D
-  TDecTop*              m_decTop; 
+#if NH_MV
+  //TDecTop*              m_decTop;
 #endif
-  
+
   TComSampleAdaptiveOffset*     m_pcSAO;
   Double                m_dDecTime;
   Int                   m_decodedPictureHashSEIEnabled;  ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message
+  UInt                  m_numberOfChecksumErrorsDetected;
 
 public:
   TDecGop();
   virtual ~TDecGop();
-  
-  Void  init    ( TDecEntropy*            pcEntropyDecoder, 
-                 TDecSbac*               pcSbacDecoder, 
+
+  Void  init    ( TDecEntropy*            pcEntropyDecoder,
+                 TDecSbac*               pcSbacDecoder,
                  TDecBinCABAC*           pcBinCABAC,
-                 TDecCavlc*              pcCavlcDecoder, 
-                 TDecSlice*              pcSliceDecoder, 
+                 TDecCavlc*              pcCavlcDecoder,
+                 TDecSlice*              pcSliceDecoder,
                  TComLoopFilter*         pcLoopFilter,
                  TComSampleAdaptiveOffset* pcSAO
@@ -105 +103 @@
   Void  create  ();
   Void  destroy ();
-  Void  decompressSlice(TComInputBitstream* pcBitstream, TComPic*& rpcPic );
-  Void  filterPicture  (TComPic*& rpcPic );
+  Void  decompressSlice(TComInputBitstream* pcBitstream, TComPic* pcPic );
+  Void  filterPicture  (TComPic* pcPic );
 
-  void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
+  Void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
+  UInt getNumberOfChecksumErrorsDetected() const { return m_numberOfChecksumErrorsDetected; }
 
 };