Changeset 1360 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
28 Oct 2015, 17:46:00 (9 years ago)
Author:
tech
Message:

Update to HM-16.7.

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

Legend:

Unmodified
Added
Removed

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/SEIread.cpp

    r1356 r1360  
    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);
    … …  
    9999}
    100100
    101 Void SEIReader::sei_read_string(std::ostream *pOS, UInt uiBufSize, UChar* pucCode, UInt& ruiLength, const Char *pSymbolName)
     101#if NH_MV_SEI
     102Void SEIReader::sei_read_string(std::ostream *pOS, UInt uiBufSize, UChar* pucCode, UInt& ruiLength, const TChar *pSymbolName)
    102103{
    103104  READ_STRING(uiBufSize, pucCode, ruiLength, pSymbolName);
    … …  
    107108  }
    108109}
    109 
    110 #if NH_MV_SEI
    111110inline Void SEIReader::output_sei_message_header(SEI &sei, std::ostream *pDecodedMessageOutputStream, UInt payloadSize)
    112111#else
    … …  
    295294      xParseSEITimeCode((SEITimeCode&) *sei, payloadSize, pDecodedMessageOutputStream);
    296295      break;
    297     case SEI::CHROMA_SAMPLING_FILTER_HINT:
    298       sei = new SEIChromaSamplingFilterHint;
    299       xParseSEIChromaSamplingFilterHint((SEIChromaSamplingFilterHint&) *sei, payloadSize/*, sps*/, pDecodedMessageOutputStream);
     296    case SEI::CHROMA_RESAMPLING_FILTER_HINT:
     297      sei = new SEIChromaResamplingFilterHint;
     298      xParseSEIChromaResamplingFilterHint((SEIChromaResamplingFilterHint&) *sei, payloadSize, pDecodedMessageOutputStream);
    300299      //}
    301300      break;
    … …  
    303302      sei = new SEIKneeFunctionInfo;
    304303      xParseSEIKneeFunctionInfo((SEIKneeFunctionInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
     304      break;
     305    case SEI::COLOUR_REMAPPING_INFO:
     306      sei = new SEIColourRemappingInfo;
     307      xParseSEIColourRemappingInfo((SEIColourRemappingInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
    305308      break;
    306309    case SEI::MASTERING_DISPLAY_COLOUR_VOLUME:
    … …  
    531534  UInt val;
    532535  sei_read_code( pDecodedMessageOutputStream, 8, val, "hash_type");
    533   sei.method = static_cast<SEIDecodedPictureHash::Method>(val); bytesRead++;
    534 
    535   const Char *traceString="\0";
     536  sei.method = static_cast<HashType>(val); bytesRead++;
     537
     538  const TChar *traceString="\0";
    536539  switch (sei.method)
    537540  {
    538     case SEIDecodedPictureHash::MD5: traceString="picture_md5"; break;
    539     case SEIDecodedPictureHash::CRC: traceString="picture_crc"; break;
    540     case SEIDecodedPictureHash::CHECKSUM: traceString="picture_checksum"; break;
     541    case HASHTYPE_MD5: traceString="picture_md5"; break;
     542    case HASHTYPE_CRC: traceString="picture_crc"; break;
     543    case HASHTYPE_CHECKSUM: traceString="picture_checksum"; break;
    541544    default: assert(false); break;
    542545  }
    … …  
    11231126}
    11241127
    1125 Void SEIReader::xParseSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint& sei, UInt payloadSize/*, TComSPS* sps*/, std::ostream *pDecodedMessageOutputStream)
     1128Void SEIReader::xParseSEIChromaResamplingFilterHint(SEIChromaResamplingFilterHint& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
    11261129{
    11271130  UInt uiCode;
    … …  
    11301133  sei_read_code( pDecodedMessageOutputStream, 8, uiCode, "ver_chroma_filter_idc"); sei.m_verChromaFilterIdc = uiCode;
    11311134  sei_read_code( pDecodedMessageOutputStream, 8, uiCode, "hor_chroma_filter_idc"); sei.m_horChromaFilterIdc = uiCode;
    1132   sei_read_flag( pDecodedMessageOutputStream, uiCode, "ver_filtering_process_flag"); sei.m_verFilteringProcessFlag = uiCode;
     1135  sei_read_flag( pDecodedMessageOutputStream, uiCode, "ver_filtering_field_processing_flag"); sei.m_verFilteringFieldProcessingFlag = uiCode;
    11331136  if(sei.m_verChromaFilterIdc == 1 || sei.m_horChromaFilterIdc == 1)
    11341137  {
    … …  
    11361139    if(sei.m_verChromaFilterIdc == 1)
    11371140    {
    1138       sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "num_vertical_filters"); sei.m_numVerticalFilters = uiCode;
    1139       if(sei.m_numVerticalFilters > 0)
    1140       {
    1141         sei.m_verTapLengthMinus1 = (Int*)malloc(sei.m_numVerticalFilters * sizeof(Int));
    1142         sei.m_verFilterCoeff = (Int**)malloc(sei.m_numVerticalFilters * sizeof(Int*));
    1143         for(Int i = 0; i < sei.m_numVerticalFilters; i ++)
    1144         {
    1145           sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "ver_tap_length_minus_1"); sei.m_verTapLengthMinus1[i] = uiCode;
    1146           sei.m_verFilterCoeff[i] = (Int*)malloc(sei.m_verTapLengthMinus1[i] * sizeof(Int));
    1147           for(Int j = 0; j < sei.m_verTapLengthMinus1[i]; j ++)
     1141      UInt numVerticalFilters;
     1142      sei_read_uvlc( pDecodedMessageOutputStream, numVerticalFilters, "num_vertical_filters"); sei.m_verFilterCoeff.resize(numVerticalFilters);
     1143      if(numVerticalFilters > 0)
     1144      {
     1145        for(Int i = 0; i < numVerticalFilters; i++)
     1146        {
     1147          UInt verTapLengthMinus1;
     1148          sei_read_uvlc( pDecodedMessageOutputStream, verTapLengthMinus1, "ver_tap_length_minus_1"); sei.m_verFilterCoeff[i].resize(verTapLengthMinus1+1);
     1149          for(Int j = 0; j < (verTapLengthMinus1 + 1); j++)
    11481150          {
    11491151            sei_read_svlc( pDecodedMessageOutputStream, sei.m_verFilterCoeff[i][j], "ver_filter_coeff");
    … …  
    11541156    if(sei.m_horChromaFilterIdc == 1)
    11551157    {
    1156       sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "num_horizontal_filters"); sei.m_numHorizontalFilters = uiCode;
    1157       if(sei.m_numHorizontalFilters  > 0)
    1158       {
    1159         sei.m_horTapLengthMinus1 = (Int*)malloc(sei.m_numHorizontalFilters * sizeof(Int));
    1160         sei.m_horFilterCoeff = (Int**)malloc(sei.m_numHorizontalFilters * sizeof(Int*));
    1161         for(Int i = 0; i < sei.m_numHorizontalFilters; i ++)
    1162         {
    1163           sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "hor_tap_length_minus_1"); sei.m_horTapLengthMinus1[i] = uiCode;
    1164           sei.m_horFilterCoeff[i] = (Int*)malloc(sei.m_horTapLengthMinus1[i] * sizeof(Int));
    1165           for(Int j = 0; j < sei.m_horTapLengthMinus1[i]; j ++)
     1158      UInt numHorizontalFilters;
     1159      sei_read_uvlc( pDecodedMessageOutputStream, numHorizontalFilters, "num_horizontal_filters"); sei.m_horFilterCoeff.resize(numHorizontalFilters);
     1160      if(numHorizontalFilters  > 0)
     1161      {
     1162        for(Int i = 0; i < numHorizontalFilters; i++)
     1163        {
     1164          UInt horTapLengthMinus1;
     1165          sei_read_uvlc( pDecodedMessageOutputStream, horTapLengthMinus1, "hor_tap_length_minus_1"); sei.m_horFilterCoeff[i].resize(horTapLengthMinus1+1);
     1166          for(Int j = 0; j < (horTapLengthMinus1 + 1); j++)
    11661167          {
    11671168            sei_read_svlc( pDecodedMessageOutputStream, sei.m_horFilterCoeff[i][j], "hor_filter_coeff");
    … …  
    11991200  }
    12001201}
     1202
     1203Void SEIReader::xParseSEIColourRemappingInfo(SEIColourRemappingInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
     1204{
     1205  UInt  uiVal;
     1206  Int   iVal;
     1207  output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
     1208
     1209  sei_read_uvlc( pDecodedMessageOutputStream, uiVal, "colour_remap_id" );          sei.m_colourRemapId = uiVal;
     1210  sei_read_flag( pDecodedMessageOutputStream, uiVal, "colour_remap_cancel_flag" ); sei.m_colourRemapCancelFlag = uiVal;
     1211  if( !sei.m_colourRemapCancelFlag )
     1212  {
     1213    sei_read_flag( pDecodedMessageOutputStream, uiVal, "colour_remap_persistence_flag" );                sei.m_colourRemapPersistenceFlag = uiVal;
     1214    sei_read_flag( pDecodedMessageOutputStream, uiVal, "colour_remap_video_signal_info_present_flag" );  sei.m_colourRemapVideoSignalInfoPresentFlag = uiVal;
     1215    if ( sei.m_colourRemapVideoSignalInfoPresentFlag )
     1216    {
     1217      sei_read_flag( pDecodedMessageOutputStream, uiVal,    "colour_remap_full_range_flag" );            sei.m_colourRemapFullRangeFlag = uiVal;
     1218      sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "colour_remap_primaries" );                  sei.m_colourRemapPrimaries = uiVal;
     1219      sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "colour_remap_transfer_function" );          sei.m_colourRemapTransferFunction = uiVal;
     1220      sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "colour_remap_matrix_coefficients" );        sei.m_colourRemapMatrixCoefficients = uiVal;
     1221    }
     1222    sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "colour_remap_input_bit_depth" );              sei.m_colourRemapInputBitDepth = uiVal;
     1223    sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "colour_remap_bit_depth" );                    sei.m_colourRemapBitDepth = uiVal;
     1224 
     1225    for( Int c=0 ; c<3 ; c++ )
     1226    {
     1227      sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "pre_lut_num_val_minus1[c]" ); sei.m_preLutNumValMinus1[c] = (uiVal==0) ? 1 : uiVal;
     1228      sei.m_preLut[c].resize(sei.m_preLutNumValMinus1[c]+1);
     1229      if( uiVal> 0 )
     1230      {
     1231        for ( Int i=0 ; i<=sei.m_preLutNumValMinus1[c] ; i++ )
     1232        {
     1233          sei_read_code( pDecodedMessageOutputStream, (( sei.m_colourRemapInputBitDepth   + 7 ) >> 3 ) << 3, uiVal, "pre_lut_coded_value[c][i]" );  sei.m_preLut[c][i].codedValue  = uiVal;
     1234          sei_read_code( pDecodedMessageOutputStream, (( sei.m_colourRemapBitDepth + 7 ) >> 3 ) << 3, uiVal, "pre_lut_target_value[c][i]" ); sei.m_preLut[c][i].targetValue = uiVal;
     1235        }
     1236      }
     1237      else // pre_lut_num_val_minus1[c] == 0
     1238      {
     1239        sei.m_preLut[c][0].codedValue  = 0;
     1240        sei.m_preLut[c][0].targetValue = 0;
     1241        sei.m_preLut[c][1].codedValue  = (1 << sei.m_colourRemapInputBitDepth) - 1 ;
     1242        sei.m_preLut[c][1].targetValue = (1 << sei.m_colourRemapBitDepth) - 1 ;
     1243      }
     1244    }
     1245
     1246    sei_read_flag( pDecodedMessageOutputStream, uiVal,      "colour_remap_matrix_present_flag" ); sei.m_colourRemapMatrixPresentFlag = uiVal;
     1247    if( sei.m_colourRemapMatrixPresentFlag )
     1248    {
     1249      sei_read_code( pDecodedMessageOutputStream, 4, uiVal, "log2_matrix_denom" ); sei.m_log2MatrixDenom = uiVal;
     1250      for ( Int c=0 ; c<3 ; c++ )
     1251      {
     1252        for ( Int i=0 ; i<3 ; i++ )
     1253        {
     1254          sei_read_svlc( pDecodedMessageOutputStream, iVal, "colour_remap_coeffs[c][i]" ); sei.m_colourRemapCoeffs[c][i] = iVal;
     1255        }
     1256      }
     1257    }
     1258    else // setting default matrix (I3)
     1259    {
     1260      sei.m_log2MatrixDenom = 10;
     1261      for ( Int c=0 ; c<3 ; c++ )
     1262      {
     1263        for ( Int i=0 ; i<3 ; i++ )
     1264        {
     1265          sei.m_colourRemapCoeffs[c][i] = (c==i) << sei.m_log2MatrixDenom;
     1266        }
     1267      }
     1268    }
     1269    for( Int c=0 ; c<3 ; c++ )
     1270    {
     1271      sei_read_code( pDecodedMessageOutputStream, 8, uiVal, "post_lut_num_val_minus1[c]" ); sei.m_postLutNumValMinus1[c] = (uiVal==0) ? 1 : uiVal;
     1272      sei.m_postLut[c].resize(sei.m_postLutNumValMinus1[c]+1);
     1273      if( uiVal > 0 )
     1274      {
     1275        for ( Int i=0 ; i<=sei.m_postLutNumValMinus1[c] ; i++ )
     1276        {
     1277          sei_read_code( pDecodedMessageOutputStream, (( sei.m_colourRemapBitDepth + 7 ) >> 3 ) << 3, uiVal, "post_lut_coded_value[c][i]" );  sei.m_postLut[c][i].codedValue = uiVal;
     1278          sei_read_code( pDecodedMessageOutputStream, (( sei.m_colourRemapBitDepth + 7 ) >> 3 ) << 3, uiVal, "post_lut_target_value[c][i]" ); sei.m_postLut[c][i].targetValue = uiVal;
     1279        }
     1280      }
     1281      else
     1282      {
     1283        sei.m_postLut[c][0].codedValue  = 0;
     1284        sei.m_postLut[c][0].targetValue = 0;
     1285        sei.m_postLut[c][1].targetValue = (1 << sei.m_colourRemapBitDepth) - 1;
     1286        sei.m_postLut[c][1].codedValue  = (1 << sei.m_colourRemapBitDepth) - 1;
     1287      }
     1288    }
     1289  }
     1290}
     1291
    12011292
    12021293Void SEIReader::xParseSEIMasteringDisplayColourVolume(SEIMasteringDisplayColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/SEIread.h

    r1356 r1360  
    9393  Void xParseSEITempMotionConstraintsTileSets (SEITempMotionConstrainedTileSets& sei, UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    9494  Void xParseSEITimeCode                      (SEITimeCode& sei,                      UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    95   Void xParseSEIChromaSamplingFilterHint      (SEIChromaSamplingFilterHint& sei,      UInt payloadSize/*,TComSPS* */,       std::ostream *pDecodedMessageOutputStream);
     95  Void xParseSEIChromaResamplingFilterHint    (SEIChromaResamplingFilterHint& sei,    UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    9696  Void xParseSEIKneeFunctionInfo              (SEIKneeFunctionInfo& sei,              UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    9797  Void xParseSEIMasteringDisplayColourVolume  (SEIMasteringDisplayColourVolume& sei,  UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
     98  Void xParseSEIColourRemappingInfo           (SEIColourRemappingInfo& sei,           UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    9899#if NH_MV
    99100#if !NH_MV_SEI
    … …  
    133134#endif
    134135
    135   Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const Char *pSymbolName);
    136   Void sei_read_uvlc(std::ostream *pOS,                UInt& ruiCode, const Char *pSymbolName);
    137   Void sei_read_svlc(std::ostream *pOS,                Int&  ruiCode, const Char *pSymbolName);
    138   Void sei_read_flag(std::ostream *pOS,                UInt& ruiCode, const Char *pSymbolName);
    139   Void sei_read_string(std::ostream *pOS, UInt uiBufSize, UChar* pucCode, UInt& ruiLength, const Char *pSymbolName);
     136  Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName);
     137  Void sei_read_uvlc(std::ostream *pOS,                UInt& ruiCode, const TChar *pSymbolName);
     138  Void sei_read_svlc(std::ostream *pOS,                Int&  ruiCode, const TChar *pSymbolName);
     139  Void sei_read_flag(std::ostream *pOS,                UInt& ruiCode, const TChar *pSymbolName);
     140  Void sei_read_string(std::ostream *pOS, UInt uiBufSize, UChar* pucCode, UInt& ruiLength, const TChar *pSymbolName);
    140141#if NH_MV_SEI
    141142  inline Void output_sei_message_header(SEI &sei, std::ostream *pDecodedMessageOutputStream, UInt payloadSize);

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/SyntaxElementParser.cpp

    r1356 r1360  
    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
    … …  
    8080}
    8181
    82 Void  SyntaxElementParser::xReadUvlcTr           (UInt& rValue, const Char *pSymbolName)
     82Void  SyntaxElementParser::xReadUvlcTr           (UInt& rValue, const TChar *pSymbolName)
    8383{
    8484#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    104104}
    105105
    106 Void  SyntaxElementParser::xReadSvlcTr           (Int& rValue, const Char *pSymbolName)
     106Void  SyntaxElementParser::xReadSvlcTr           (Int& rValue, const TChar *pSymbolName)
    107107{
    108108#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    128128}
    129129
    130 Void  SyntaxElementParser::xReadFlagTr           (UInt& rValue, const Char *pSymbolName)
     130Void  SyntaxElementParser::xReadFlagTr           (UInt& rValue, const TChar *pSymbolName)
    131131{
    132132#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    152152}
    153153
    154 Void  SyntaxElementParser::xReadStringTr        (UInt buSize, UChar *pValue, UInt& rLength, const Char *pSymbolName)
     154#if NH_MV
     155Void  SyntaxElementParser::xReadStringTr        (UInt buSize, UChar *pValue, UInt& rLength, const TChar *pSymbolName)
    155156{
    156157#if RExt__DECODER_DEBUG_BIT_STATISTICS
    … …  
    163164  fflush ( g_hTrace );
    164165}
    165 
     166#endif
    166167Void  xTraceAccessUnitDelimiter ()
    167168{
    … …  
    181182// ====================================================================================================================
    182183#if RExt__DECODER_DEBUG_BIT_STATISTICS
    183 Void SyntaxElementParser::xReadCode (UInt uiLength, UInt& ruiCode, const Char *pSymbolName)
     184Void SyntaxElementParser::xReadCode (UInt uiLength, UInt& ruiCode, const TChar *pSymbolName)
    184185#else
    185186Void SyntaxElementParser::xReadCode (UInt uiLength, UInt& ruiCode)
    … …  
    194195
    195196#if RExt__DECODER_DEBUG_BIT_STATISTICS
    196 Void SyntaxElementParser::xReadUvlc( UInt& ruiVal, const Char *pSymbolName)
     197Void SyntaxElementParser::xReadUvlc( UInt& ruiVal, const TChar *pSymbolName)
    197198#else
    198199Void SyntaxElementParser::xReadUvlc( UInt& ruiVal)
    … …  
    232233
    233234#if RExt__DECODER_DEBUG_BIT_STATISTICS
    234 Void SyntaxElementParser::xReadSvlc( Int& riVal, const Char *pSymbolName)
     235Void SyntaxElementParser::xReadSvlc( Int& riVal, const TChar *pSymbolName)
    235236#else
    236237Void SyntaxElementParser::xReadSvlc( Int& riVal)
    … …  
    270271
    271272#if RExt__DECODER_DEBUG_BIT_STATISTICS
    272 Void SyntaxElementParser::xReadFlag (UInt& ruiCode, const Char *pSymbolName)
     273Void SyntaxElementParser::xReadFlag (UInt& ruiCode, const TChar *pSymbolName)
    273274#else
    274275Void SyntaxElementParser::xReadFlag (UInt& ruiCode)
    … …  
    281282}
    282283
    283 #if RExt__DECODER_DEBUG_BIT_STATISTICS
    284 Void  SyntaxElementParser::xReadString  (UInt bufSize, UChar *pVal, UInt& rLength, const Char *pSymbolName)
     284#if NH_MV
     285#if RExt__DECODER_DEBUG_BIT_STATISTICS
     286Void  SyntaxElementParser::xReadString  (UInt bufSize, UChar *pVal, UInt& rLength, const TChar *pSymbolName)
    285287#else
    286288Void  SyntaxElementParser::xReadString  (UInt bufSize, UChar *pVal, UInt& rLength)
    … …  
    302304  assert( pVal[rLength] == 0 ); 
    303305}
     306#endif
    304307
    305308Void SyntaxElementParser::xReadRbspTrailingBits()

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/SyntaxElementParser.h

    r1356 r1360  
    9191
    9292#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);
     93  Void  xReadCode    ( UInt   length, UInt& val, const TChar *pSymbolName );
     94  Void  xReadUvlc    ( UInt&  val, const TChar *pSymbolName );
     95  Void  xReadSvlc    ( Int&   val, const TChar *pSymbolName );
     96  Void  xReadFlag    ( UInt&  val, const TChar *pSymbolName );
     97#if NH_MV
     98  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length, const TChar *pSymbolName);
     99#endif
    98100#else
    99101  Void  xReadCode    ( UInt   length, UInt& val );
    … …  
    101103  Void  xReadSvlc    ( Int&   val );
    102104  Void  xReadFlag    ( UInt&  val );
     105#if NH_MV
    103106  Void  xReadString  ( UInt bufSize, UChar *val, UInt& length);
    104107#endif
     108#endif
    105109#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);
     110  Void  xReadCodeTr  (UInt  length, UInt& rValue, const TChar *pSymbolName);
     111  Void  xReadUvlcTr  (              UInt& rValue, const TChar *pSymbolName);
     112  Void  xReadSvlcTr  (               Int& rValue, const TChar *pSymbolName);
     113  Void  xReadFlagTr  (              UInt& rValue, const TChar *pSymbolName);
     114#if NH_MV
     115  Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const TChar *pSymbolName);
     116#endif
    111117#endif
    112118public:

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/TDecBinCoderCABAC.cpp

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

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1321 r1360  
    454454#else
    455455#if ENC_DEC_TRACE || RExt__DECODER_DEBUG_BIT_STATISTICS
    456     static const char *syntaxStrings[]={ "pps_range_extension_flag",
     456    static const TChar *syntaxStrings[]={ "pps_range_extension_flag",
    457457                                         "pps_multilayer_extension_flag",
    458458                                         "pps_extension_6bits[0]",
    … …  
    10171017    pcSPS->setSpsMaxLatencyIncreasePlus1( uiCode, i );
    10181018#else
    1019     pcSPS->setMaxLatencyIncrease( uiCode, i );
     1019    pcSPS->setMaxLatencyIncreasePlus1( uiCode, i );
    10201020#endif
    10211021
    … …  
    10291029        pcSPS->setSpsMaxLatencyIncreasePlus1(pcSPS->getSpsMaxLatencyIncreasePlus1(0), i);
    10301030#else
    1031         pcSPS->setMaxLatencyIncrease(pcSPS->getMaxLatencyIncrease(0), i);
     1031        pcSPS->setMaxLatencyIncreasePlus1(pcSPS->getMaxLatencyIncreasePlus1(0), i);
    10321032#endif
    10331033      }
    … …  
    12061206
    12071207#if ENC_DEC_TRACE || RExt__DECODER_DEBUG_BIT_STATISTICS
    1208     static const char *syntaxStrings[]={ "sps_range_extension_flag",
     1208    static const TChar *syntaxStrings[]={ "sps_range_extension_flag",
    12091209                                         "sps_multilayer_extension_flag",
    12101210                                         "sps_extension_6bits[0]",

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1321 r1360  
    505505#endif
    506506
    507       UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
     507      const UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    508508      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 )
    509509      {
    … …  
    547547      else
    548548      {
    549         uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    550549
    551550#if NH_3D_MLC

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r1313 r1360  
    177177  pcPic->compressMotion();
    178178#endif
    179   Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
     179  TChar c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
    180180  if (!pcSlice->isReferenced())
    181181  {
    … …  
    255255  TComPictureHash recon_digest;
    256256  Int numChar=0;
    257   const Char* hashType = "\0";
     257  const TChar* hashType = "\0";
    258258
    259259  if (pictureHashSEI)
    … …  
    261261    switch (pictureHashSEI->method)
    262262    {
    263       case SEIDecodedPictureHash::MD5:
     263      case HASHTYPE_MD5:
    264264        {
    265265          hashType = "MD5";
    … …  
    267267          break;
    268268        }
    269       case SEIDecodedPictureHash::CRC:
     269      case HASHTYPE_CRC:
    270270        {
    271271          hashType = "CRC";
    … …  
    273273          break;
    274274        }
    275       case SEIDecodedPictureHash::CHECKSUM:
     275      case HASHTYPE_CHECKSUM:
    276276        {
    277277          hashType = "Checksum";
    … …  
    288288
    289289  /* compare digest against received version */
    290   const Char* ok = "(unk)";
     290  const TChar* ok = "(unk)";
    291291  Bool mismatch = false;
    292292

  • branches/HTM-15.2-dev/source/Lib/TLibDecoder/TDecSbac.cpp

    r1313 r1360  
    11941194  if (!pcCU->isIntra(uiAbsPartIdx) || (pcCU->getIntraDir( CHANNEL_TYPE_CHROMA, uiAbsPartIdx ) == DM_CHROMA_IDX))
    11951195  {
    1196     Char alpha = 0;
     1196    SChar alpha = 0;
    11971197    UInt symbol = 0;
    11981198
Note: See TracChangeset for help on using the changeset viewer.