Ignore:
Timestamp:
13 Nov 2015, 16:29:39 (9 years ago)
Author:
tech
Message:

Merged 15.1-dev1@1381.

File:
1 edited

Legend:

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

    r1356 r1386  
    4949#define READ_SVLC(        code, name)     xReadSvlcTr (         code, name )
    5050#define READ_FLAG(        code, name)     xReadFlagTr (         code, name )
     51#if NH_MV
    5152#define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
    52 
     53#endif
    5354#else
    5455
     
    5960#define READ_SVLC(        code, name)     xReadSvlc (         code, name )
    6061#define READ_FLAG(        code, name)     xReadFlag (         code, name )
     62#if NH_MV
    6163#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length, name )
    62 
     64#endif
    6365#else
    6466
     
    6769#define READ_SVLC(        code, name)     xReadSvlc (         code )
    6870#define READ_FLAG(        code, name)     xReadFlag (         code )
     71#if NH_MV
    6972#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length )
     73#endif
    7074
    7175#endif
     
    9195
    9296#if RExt__DECODER_DEBUG_BIT_STATISTICS
    93   Void  xReadCode    ( UInt   length, UInt& val, const Char *pSymbolName );
    94   Void  xReadUvlc    ( UInt&  val, const Char *pSymbolName );
    95   Void  xReadSvlc    ( Int&   val, const Char *pSymbolName );
    96   Void  xReadFlag    ( UInt&  val, const Char *pSymbolName );
    97   Void  xReadString  ( UInt bufSize, UChar *val, UInt& length, const Char *pSymbolName);
     97  Void  xReadCode    ( UInt   length, UInt& val, const TChar *pSymbolName );
     98  Void  xReadUvlc    ( UInt&  val, const TChar *pSymbolName );
     99  Void  xReadSvlc    ( Int&   val, const TChar *pSymbolName );
     100  Void  xReadFlag    ( UInt&  val, const TChar *pSymbolName );
     101#if NH_MV
     102  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length, const TChar *pSymbolName);
     103#endif
    98104#else
    99105  Void  xReadCode    ( UInt   length, UInt& val );
     
    101107  Void  xReadSvlc    ( Int&   val );
    102108  Void  xReadFlag    ( UInt&  val );
     109#if NH_MV
    103110  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length);
    104111#endif
     112#endif
    105113#if ENC_DEC_TRACE
    106   Void  xReadCodeTr  (UInt  length, UInt& rValue, const Char *pSymbolName);
    107   Void  xReadUvlcTr  (              UInt& rValue, const Char *pSymbolName);
    108   Void  xReadSvlcTr  (               Int& rValue, const Char *pSymbolName);
    109   Void  xReadFlagTr  (              UInt& rValue, const Char *pSymbolName);
    110   Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
     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
     119  Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const TChar *pSymbolName);
     120#endif
    111121#endif
    112122public:
Note: See TracChangeset for help on using the changeset viewer.