Ignore:
Timestamp:
27 Oct 2015, 11:33:16 (9 years ago)
Author:
tech
Message:

Merged 15.1-dev0-NICT@1355.

File:
1 edited

Legend:

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

    r1313 r1356  
    4949#define READ_SVLC(        code, name)     xReadSvlcTr (         code, name )
    5050#define READ_FLAG(        code, name)     xReadFlagTr (         code, name )
     51#define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
    5152
    5253#else
     
    5859#define READ_SVLC(        code, name)     xReadSvlc (         code, name )
    5960#define READ_FLAG(        code, name)     xReadFlag (         code, name )
     61#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length, name )
    6062
    6163#else
     
    6567#define READ_SVLC(        code, name)     xReadSvlc (         code )
    6668#define READ_FLAG(        code, name)     xReadFlag (         code )
     69#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length )
    6770
    6871#endif
     
    9295  Void  xReadSvlc    ( Int&   val, const Char *pSymbolName );
    9396  Void  xReadFlag    ( UInt&  val, const Char *pSymbolName );
     97  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length, const Char *pSymbolName);
    9498#else
    9599  Void  xReadCode    ( UInt   length, UInt& val );
     
    97101  Void  xReadSvlc    ( Int&   val );
    98102  Void  xReadFlag    ( UInt&  val );
     103  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length);
    99104#endif
    100105#if ENC_DEC_TRACE
     
    103108  Void  xReadSvlcTr  (               Int& rValue, const Char *pSymbolName);
    104109  Void  xReadFlagTr  (              UInt& rValue, const Char *pSymbolName);
     110  Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
    105111#endif
    106112public:
Note: See TracChangeset for help on using the changeset viewer.