Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/SyntaxElementParser.h

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    4343#endif // _MSC_VER > 1000
    4444#include "TLibCommon/TComRom.h"
    45 #if ENC_DEC_TRACE
     45#include "TDecConformance.h"
    4646
    47 #define READ_CODE(length, code, name)     xReadCodeTr ( length, code, name )
    48 #define READ_UVLC(        code, name)     xReadUvlcTr (         code, name )
    49 #define READ_SVLC(        code, name)     xReadSvlcTr (         code, name )
    50 #define READ_FLAG(        code, name)     xReadFlagTr (         code, name )
    51 #if NH_MV
    52 #define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
     47#if DECODER_PARTIAL_CONFORMANCE_CHECK!=0
     48#define READ_CODE_CHK(length, code, name, minValIncl, maxValIncl) xReadCodeChk ( length, code, name, minValIncl, maxValIncl )
     49#define READ_UVLC_CHK(        code, name, minValIncl, maxValIncl) xReadUvlcChk (         code, name, minValIncl, maxValIncl )
     50#define READ_SVLC_CHK(        code, name, minValIncl, maxValIncl) xReadSvlcChk (         code, name, minValIncl, maxValIncl )
     51#define READ_FLAG_CHK(        code, name, minValIncl, maxValIncl) xReadFlagChk (         code, name, minValIncl, maxValIncl )
     52#elif RExt__DECODER_DEBUG_BIT_STATISTICS || ENC_DEC_TRACE
     53#define READ_CODE_CHK(length, code, name, minValIncl, maxValIncl) xReadCode ( length, code, name )
     54#define READ_UVLC_CHK(        code, name, minValIncl, maxValIncl) xReadUvlc (         code, name )
     55#define READ_SVLC_CHK(        code, name, minValIncl, maxValIncl) xReadSvlc (         code, name )
     56#define READ_FLAG_CHK(        code, name, minValIncl, maxValIncl) xReadFlag (         code, name )
     57#else
     58#define READ_CODE_CHK(length, code, name, minValIncl, maxValIncl) xReadCode ( length, code )
     59#define READ_UVLC_CHK(        code, name, minValIncl, maxValIncl) xReadUvlc (         code )
     60#define READ_SVLC_CHK(        code, name, minValIncl, maxValIncl) xReadSvlc (         code )
     61#define READ_FLAG_CHK(        code, name, minValIncl, maxValIncl) xReadFlag (         code )
    5362#endif
    54 #else
    55 
    56 #if RExt__DECODER_DEBUG_BIT_STATISTICS
    57 
     63#if RExt__DECODER_DEBUG_BIT_STATISTICS || ENC_DEC_TRACE
    5864#define READ_CODE(length, code, name)     xReadCode ( length, code, name )
    5965#define READ_UVLC(        code, name)     xReadUvlc (         code, name )
     
    6470#endif
    6571#else
    66 
    6772#define READ_CODE(length, code, name)     xReadCode ( length, code )
    6873#define READ_UVLC(        code, name)     xReadUvlc (         code )
     
    7176#if NH_MV
    7277#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length )
    73 #endif
    74 
    7578#endif
    7679
     
    9497  virtual ~SyntaxElementParser() {};
    9598
    96 #if RExt__DECODER_DEBUG_BIT_STATISTICS
     99#if DECODER_PARTIAL_CONFORMANCE_CHECK!=0
     100  Void  xReadCodeChk ( UInt   length, UInt& val, const TChar *pSymbolName, const UInt minValIncl, const UInt maxValIncl );
     101  Void  xReadUvlcChk ( UInt&  val, const TChar *pSymbolName, const UInt minValIncl, const UInt maxValIncl );
     102  Void  xReadSvlcChk ( Int&   val, const TChar *pSymbolName, const Int  minValIncl, const Int  maxValIncl );
     103  Void  xReadFlagChk ( UInt&  val, const TChar *pSymbolName, const UInt minValIncl, const UInt maxValIncl );
     104#endif
     105
     106
     107#if RExt__DECODER_DEBUG_BIT_STATISTICS || ENC_DEC_TRACE
    97108  Void  xReadCode    ( UInt   length, UInt& val, const TChar *pSymbolName );
    98109  Void  xReadUvlc    ( UInt&  val, const TChar *pSymbolName );
     
    109120#if NH_MV
    110121  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length);
    111 #endif
    112 #endif
    113 #if ENC_DEC_TRACE
    114   Void  xReadCodeTr  (UInt  length, UInt& rValue, const TChar *pSymbolName);
    115   Void  xReadUvlcTr  (              UInt& rValue, const TChar *pSymbolName);
    116   Void  xReadSvlcTr  (               Int& rValue, const TChar *pSymbolName);
    117   Void  xReadFlagTr  (              UInt& rValue, const TChar *pSymbolName);
    118 #if NH_MV
    119122  Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const TChar *pSymbolName);
    120123#endif
Note: See TracChangeset for help on using the changeset viewer.