Ignore:
Timestamp:
17 Jul 2015, 05:43:37 (9 years ago)
Author:
seregin
Message:

port rev 4322 (g_bitDepth)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r1273 r1287  
    6363//! \ingroup TLibDecoder
    6464//! \{
    65 static Void calcAndPrintHashStatus(TComPicYuv& pic, const SEIDecodedPictureHash* pictureHashSEI);
     65static Void calcAndPrintHashStatus(TComPicYuv& pic, const SEIDecodedPictureHash* pictureHashSEI, const BitDepths &bitDepths);
    6666// ====================================================================================================================
    6767// Constructor / destructor / initialization / destroy
     
    246246      printf ("Warning: Got multiple decoded picture hash SEI messages. Using first.");
    247247    }
    248     calcAndPrintHashStatus(*(pcPic->getPicYuvRec()), hash);
     248#if SVC_EXTENSION
     249    calcAndPrintHashStatus(*(pcPic->getPicYuvRec()), hash, pcSlice->getBitDepths());
     250#else
     251    calcAndPrintHashStatus(*(pcPic->getPicYuvRec()), hash, pcSlice->getSPS()->getBitDepths());
     252#endif
    249253  }
    250254#if CONFORMANCE_BITSTREAM_MODE
     
    275279 *            unk         - no SEI message was available for comparison
    276280 */
    277 static Void calcAndPrintHashStatus(TComPicYuv& pic, const SEIDecodedPictureHash* pictureHashSEI)
     281static Void calcAndPrintHashStatus(TComPicYuv& pic, const SEIDecodedPictureHash* pictureHashSEI, const BitDepths &bitDepths)
    278282{
    279283  /* calculate MD5sum for entire reconstructed picture */
     
    289293        {
    290294          hashType = "MD5";
    291           numChar = calcMD5(pic, recon_digest);
     295          numChar = calcMD5(pic, recon_digest, bitDepths);
    292296          break;
    293297        }
     
    295299        {
    296300          hashType = "CRC";
    297           numChar = calcCRC(pic, recon_digest);
     301          numChar = calcCRC(pic, recon_digest, bitDepths);
    298302          break;
    299303        }
     
    301305        {
    302306          hashType = "Checksum";
    303           numChar = calcChecksum(pic, recon_digest);
     307          numChar = calcChecksum(pic, recon_digest, bitDepths);
    304308          break;
    305309        }
Note: See TracChangeset for help on using the changeset viewer.