Changeset 1442 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
13 Aug 2015, 19:11:53 (10 years ago)
Author:
seregin
Message:

port rev 4590

Location:
branches/SHM-dev/source/Lib/TLibDecoder
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp

    r1434 r1442  
    6363#endif
    6464
    65 Void SEIReader::sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const Char *pSymbolName)
     65Void SEIReader::sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName)
    6666{
    6767  READ_CODE(uiLength, ruiCode, pSymbolName);
    … …  
    7272}
    7373
    74 Void SEIReader::sei_read_uvlc(std::ostream *pOS, UInt& ruiCode, const Char *pSymbolName)
     74Void SEIReader::sei_read_uvlc(std::ostream *pOS, UInt& ruiCode, const TChar *pSymbolName)
    7575{
    7676  READ_UVLC(ruiCode, pSymbolName);
    … …  
    8181}
    8282
    83 Void SEIReader::sei_read_svlc(std::ostream *pOS, Int& ruiCode, const Char *pSymbolName)
     83Void SEIReader::sei_read_svlc(std::ostream *pOS, Int& ruiCode, const TChar *pSymbolName)
    8484{
    8585  READ_SVLC(ruiCode, pSymbolName);
    … …  
    9090}
    9191
    92 Void SEIReader::sei_read_flag(std::ostream *pOS, UInt& ruiCode, const Char *pSymbolName)
     92Void SEIReader::sei_read_flag(std::ostream *pOS, UInt& ruiCode, const TChar *pSymbolName)
    9393{
    9494  READ_FLAG(ruiCode, pSymbolName);
    … …  
    522522  sei.method = static_cast<SEIDecodedPictureHash::Method>(val); bytesRead++;
    523523
    524   const Char *traceString="\0";
     524  const TChar *traceString="\0";
    525525  switch (sei.method)
    526526  {

  • branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h

    r1434 r1442  
    109109  Void xParseSEIMasteringDisplayColourVolume  (SEIMasteringDisplayColourVolume& sei,  UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    110110
    111   Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const Char *pSymbolName);
    112   Void sei_read_uvlc(std::ostream *pOS,                UInt& ruiCode, const Char *pSymbolName);
    113   Void sei_read_svlc(std::ostream *pOS,                Int&  ruiCode, const Char *pSymbolName);
    114   Void sei_read_flag(std::ostream *pOS,                UInt& ruiCode, const Char *pSymbolName);
     111  Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName);
     112  Void sei_read_uvlc(std::ostream *pOS,                UInt& ruiCode, const TChar *pSymbolName);
     113  Void sei_read_svlc(std::ostream *pOS,                Int&  ruiCode, const TChar *pSymbolName);
     114  Void sei_read_flag(std::ostream *pOS,                UInt& ruiCode, const TChar *pSymbolName);
    115115
    116116#if Q0074_COLOUR_REMAPPING_SEI

  • branches/SHM-dev/source/Lib/TLibDecoder/SyntaxElementParser.cpp

    r1351 r1442  
    4949#if ENC_DEC_TRACE
    5050
    51 Void  SyntaxElementParser::xReadCodeTr           (UInt length, UInt& rValue, const Char *pSymbolName)
     51Void  SyntaxElementParser::xReadCodeTr           (UInt length, UInt& rValue, const TChar *pSymbolName)
    5252{
    5353#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    6868}
    6969
    70 Void  SyntaxElementParser::xReadUvlcTr           (UInt& rValue, const Char *pSymbolName)
     70Void  SyntaxElementParser::xReadUvlcTr           (UInt& rValue, const TChar *pSymbolName)
    7171{
    7272#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    8080}
    8181
    82 Void  SyntaxElementParser::xReadSvlcTr           (Int& rValue, const Char *pSymbolName)
     82Void  SyntaxElementParser::xReadSvlcTr           (Int& rValue, const TChar *pSymbolName)
    8383{
    8484#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    9292}
    9393
    94 Void  SyntaxElementParser::xReadFlagTr           (UInt& rValue, const Char *pSymbolName)
     94Void  SyntaxElementParser::xReadFlagTr           (UInt& rValue, const TChar *pSymbolName)
    9595{
    9696#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    135135// ====================================================================================================================
    136136#if RExt__DECODER_DEBUG_BIT_STATISTICS
    137 Void SyntaxElementParser::xReadCode (UInt uiLength, UInt& ruiCode, const Char *pSymbolName)
     137Void SyntaxElementParser::xReadCode (UInt uiLength, UInt& ruiCode, const TChar *pSymbolName)
    138138#else
    139139Void SyntaxElementParser::xReadCode (UInt uiLength, UInt& ruiCode)
    … …  
    148148
    149149#if RExt__DECODER_DEBUG_BIT_STATISTICS
    150 Void SyntaxElementParser::xReadUvlc( UInt& ruiVal, const Char *pSymbolName)
     150Void SyntaxElementParser::xReadUvlc( UInt& ruiVal, const TChar *pSymbolName)
    151151#else
    152152Void SyntaxElementParser::xReadUvlc( UInt& ruiVal)
    … …  
    186186
    187187#if RExt__DECODER_DEBUG_BIT_STATISTICS
    188 Void SyntaxElementParser::xReadSvlc( Int& riVal, const Char *pSymbolName)
     188Void SyntaxElementParser::xReadSvlc( Int& riVal, const TChar *pSymbolName)
    189189#else
    190190Void SyntaxElementParser::xReadSvlc( Int& riVal)
    … …  
    224224
    225225#if RExt__DECODER_DEBUG_BIT_STATISTICS
    226 Void SyntaxElementParser::xReadFlag (UInt& ruiCode, const Char *pSymbolName)
     226Void SyntaxElementParser::xReadFlag (UInt& ruiCode, const TChar *pSymbolName)
    227227#else
    228228Void SyntaxElementParser::xReadFlag (UInt& ruiCode)
    … …  
    281281#if Q0096_OVERLAY_SEI
    282282#if RExt__DECODER_DEBUG_BIT_STATISTICS
    283 Void SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength, const Char *pSymbolName)
     283Void SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength, const TChar *pSymbolName)
    284284#else
    285285Void  SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength)

  • branches/SHM-dev/source/Lib/TLibDecoder/SyntaxElementParser.h

    r1351 r1442  
    9898
    9999#if RExt__DECODER_DEBUG_BIT_STATISTICS
    100   Void  xReadCode    ( UInt   length, UInt& val, const Char *pSymbolName );
    101   Void  xReadUvlc    ( UInt&  val, const Char *pSymbolName );
    102   Void  xReadSvlc    ( Int&   val, const Char *pSymbolName );
    103   Void  xReadFlag    ( UInt&  val, const Char *pSymbolName );
     100  Void  xReadCode    ( UInt   length, UInt& val, const TChar *pSymbolName );
     101  Void  xReadUvlc    ( UInt&  val, const TChar *pSymbolName );
     102  Void  xReadSvlc    ( Int&   val, const TChar *pSymbolName );
     103  Void  xReadFlag    ( UInt&  val, const TChar *pSymbolName );
    104104#if Q0096_OVERLAY_SEI
    105   Void  xReadString  (UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
     105  Void  xReadString  (UInt bufSize, UChar *pValue, UInt& rLength, const TChar *pSymbolName);
    106106#endif
    107107#else
    … …  
    115115#endif
    116116#if ENC_DEC_TRACE
    117   Void  xReadCodeTr  (UInt  length, UInt& rValue, const Char *pSymbolName);
    118   Void  xReadUvlcTr  (              UInt& rValue, const Char *pSymbolName);
    119   Void  xReadSvlcTr  (               Int& rValue, const Char *pSymbolName);
    120   Void  xReadFlagTr  (              UInt& rValue, const Char *pSymbolName);
     117  Void  xReadCodeTr  (UInt  length, UInt& rValue, const TChar *pSymbolName);
     118  Void  xReadUvlcTr  (              UInt& rValue, const TChar *pSymbolName);
     119  Void  xReadSvlcTr  (               Int& rValue, const TChar *pSymbolName);
     120  Void  xReadFlagTr  (              UInt& rValue, const TChar *pSymbolName);
    121121#if Q0096_OVERLAY_SEI
    122122  Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecBinCoderCABAC.cpp

    r1335 r1442  
    169169  if (g_debugCounter >= debugCabacBinTargetLine)
    170170  {
    171     Char breakPointThis;
     171    UChar breakPointThis;
    172172    breakPointThis = 7;
    173173  }

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1439 r1442  
    343343  {
    344344#if ENC_DEC_TRACE || RExt__DECODER_DEBUG_BIT_STATISTICS
    345     static const char *syntaxStrings[]={ "pps_range_extension_flag",
    346                                          "pps_multilayer_extension_flag",
    347                                          "pps_extension_6bits[0]",
    348                                          "pps_extension_6bits[1]",
    349                                          "pps_extension_6bits[2]",
    350                                          "pps_extension_6bits[3]",
    351                                          "pps_extension_6bits[4]",
    352                                          "pps_extension_6bits[5]" };
     345    static const TChar *syntaxStrings[]={ "pps_range_extension_flag",
     346                                          "pps_multilayer_extension_flag",
     347                                          "pps_extension_6bits[0]",
     348                                          "pps_extension_6bits[1]",
     349                                          "pps_extension_6bits[2]",
     350                                          "pps_extension_6bits[3]",
     351                                          "pps_extension_6bits[4]",
     352                                          "pps_extension_6bits[5]" };
    353353#endif
    354354
    … …  
    969969  {
    970970#if ENC_DEC_TRACE || RExt__DECODER_DEBUG_BIT_STATISTICS
    971     static const char *syntaxStrings[]={ "sps_range_extension_flag",
    972                                          "sps_multilayer_extension_flag",
    973                                          "sps_extension_6bits[0]",
    974                                          "sps_extension_6bits[1]",
    975                                          "sps_extension_6bits[2]",
    976                                          "sps_extension_6bits[3]",
    977                                          "sps_extension_6bits[4]",
    978                                          "sps_extension_6bits[5]" };
     971    static const TChar *syntaxStrings[]={ "sps_range_extension_flag",
     972                                          "sps_multilayer_extension_flag",
     973                                          "sps_extension_6bits[0]",
     974                                          "sps_extension_6bits[1]",
     975                                          "sps_extension_6bits[2]",
     976                                          "sps_extension_6bits[3]",
     977                                          "sps_extension_6bits[4]",
     978                                          "sps_extension_6bits[5]" };
    979979#endif
    980980    Bool sps_extension_flags[NUM_SPS_EXTENSION_FLAGS];

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r1431 r1442  
    181181
    182182  pcPic->compressMotion();
    183   Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
     183  TChar c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
    184184  if (!pcSlice->isReferenced())
    185185  {
    … …  
    284284  TComPictureHash recon_digest;
    285285  Int numChar=0;
    286   const Char* hashType = "\0";
     286  const TChar* hashType = "\0";
    287287
    288288  if (pictureHashSEI)
    … …  
    317317
    318318  /* compare digest against received version */
    319   const Char* ok = "(unk)";
     319  const TChar* ok = "(unk)";
    320320  Bool mismatch = false;
    321321

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecSbac.cpp

    r1316 r1442  
    860860  if (!pcCU->isIntra(uiAbsPartIdx) || (pcCU->getIntraDir( CHANNEL_TYPE_CHROMA, uiAbsPartIdx ) == DM_CHROMA_IDX))
    861861  {
    862     Char alpha = 0;
     862    SChar alpha = 0;
    863863    UInt symbol = 0;
    864864

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r1431 r1442  
    13861386        for( Int i = 0; i < uiHeight; i++ )
    13871387        {
    1388           pFile->read(reinterpret_cast<Char*>(buf), len);
     1388          pFile->read(reinterpret_cast<TChar*>(buf), len);
    13891389
    13901390          if( !is16bit )
    … …  
    14151415        for( Int i = 0; i < uiHeight; i++ )
    14161416        {
    1417           pFile->read(reinterpret_cast<Char*>(buf), len);
     1417          pFile->read(reinterpret_cast<TChar*>(buf), len);
    14181418
    14191419          if( !is16bit )
    … …  
    14401440        for( Int i = 0; i < uiHeight; i++ )
    14411441        {
    1442           pFile->read(reinterpret_cast<Char*>(buf), len);
     1442          pFile->read(reinterpret_cast<TChar*>(buf), len);
    14431443
    14441444          if( !is16bit )
Note: See TracChangeset for help on using the changeset viewer.