Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibDecoder/SyntaxElementParser.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/TLibDecoder/SyntaxElementParser.h (modified) (6 diffs)

branches/HTM-16.2-dev/source/Lib/TLibDecoder/SyntaxElementParser.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -43 +43 @@
 #endif // _MSC_VER > 1000
 #include "TLibCommon/TComRom.h"
-#if ENC_DEC_TRACE
+#include "TDecConformance.h"
 
-#define READ_CODE(length, code, name)     xReadCodeTr ( length, code, name )
-#define READ_UVLC(        code, name)     xReadUvlcTr (         code, name )
-#define READ_SVLC(        code, name)     xReadSvlcTr (         code, name )
-#define READ_FLAG(        code, name)     xReadFlagTr (         code, name )
-#if NH_MV
-#define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
+#if DECODER_PARTIAL_CONFORMANCE_CHECK!=0
+#define READ_CODE_CHK(length, code, name, minValIncl, maxValIncl) xReadCodeChk ( length, code, name, minValIncl, maxValIncl )
+#define READ_UVLC_CHK(        code, name, minValIncl, maxValIncl) xReadUvlcChk (         code, name, minValIncl, maxValIncl )
+#define READ_SVLC_CHK(        code, name, minValIncl, maxValIncl) xReadSvlcChk (         code, name, minValIncl, maxValIncl )
+#define READ_FLAG_CHK(        code, name, minValIncl, maxValIncl) xReadFlagChk (         code, name, minValIncl, maxValIncl )
+#elif RExt__DECODER_DEBUG_BIT_STATISTICS || ENC_DEC_TRACE
+#define READ_CODE_CHK(length, code, name, minValIncl, maxValIncl) xReadCode ( length, code, name )
+#define READ_UVLC_CHK(        code, name, minValIncl, maxValIncl) xReadUvlc (         code, name )
+#define READ_SVLC_CHK(        code, name, minValIncl, maxValIncl) xReadSvlc (         code, name )
+#define READ_FLAG_CHK(        code, name, minValIncl, maxValIncl) xReadFlag (         code, name )
+#else
+#define READ_CODE_CHK(length, code, name, minValIncl, maxValIncl) xReadCode ( length, code )
+#define READ_UVLC_CHK(        code, name, minValIncl, maxValIncl) xReadUvlc (         code )
+#define READ_SVLC_CHK(        code, name, minValIncl, maxValIncl) xReadSvlc (         code )
+#define READ_FLAG_CHK(        code, name, minValIncl, maxValIncl) xReadFlag (         code )
 #endif
-#else
-
-#if RExt__DECODER_DEBUG_BIT_STATISTICS
-
+#if RExt__DECODER_DEBUG_BIT_STATISTICS || ENC_DEC_TRACE
 #define READ_CODE(length, code, name)     xReadCode ( length, code, name )
 #define READ_UVLC(        code, name)     xReadUvlc (         code, name )
@@ -64 +70 @@
 #endif
 #else
-
 #define READ_CODE(length, code, name)     xReadCode ( length, code )
 #define READ_UVLC(        code, name)     xReadUvlc (         code )
@@ -71 +76 @@
 #if NH_MV
 #define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length )
-#endif
-
 #endif
 
@@ -94 +97 @@
   virtual ~SyntaxElementParser() {};
 
-#if RExt__DECODER_DEBUG_BIT_STATISTICS
+#if DECODER_PARTIAL_CONFORMANCE_CHECK!=0
+  Void  xReadCodeChk ( UInt   length, UInt& val, const TChar *pSymbolName, const UInt minValIncl, const UInt maxValIncl );
+  Void  xReadUvlcChk ( UInt&  val, const TChar *pSymbolName, const UInt minValIncl, const UInt maxValIncl );
+  Void  xReadSvlcChk ( Int&   val, const TChar *pSymbolName, const Int  minValIncl, const Int  maxValIncl );
+  Void  xReadFlagChk ( UInt&  val, const TChar *pSymbolName, const UInt minValIncl, const UInt maxValIncl );
+#endif
+
+
+#if RExt__DECODER_DEBUG_BIT_STATISTICS || ENC_DEC_TRACE
   Void  xReadCode    ( UInt   length, UInt& val, const TChar *pSymbolName );
   Void  xReadUvlc    ( UInt&  val, const TChar *pSymbolName );
@@ -109 +120 @@
 #if NH_MV
   Void  xReadString  ( UInt bufSize, UChar *val, UInt& length);
-#endif
-#endif
-#if ENC_DEC_TRACE
-  Void  xReadCodeTr  (UInt  length, UInt& rValue, const TChar *pSymbolName);
-  Void  xReadUvlcTr  (              UInt& rValue, const TChar *pSymbolName);
-  Void  xReadSvlcTr  (               Int& rValue, const TChar *pSymbolName);
-  Void  xReadFlagTr  (              UInt& rValue, const TChar *pSymbolName);
-#if NH_MV
   Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const TChar *pSymbolName);
 #endif