diff --git a/source/Lib/CommonLib/PicYuvMD5.cpp b/source/Lib/CommonLib/PicYuvMD5.cpp index 5248acb9452b38a7663472abbd97c0a7688a9aed..a15f81ac5b56662a7364562f8e676088f95fb973 100644 --- a/source/Lib/CommonLib/PicYuvMD5.cpp +++ b/source/Lib/CommonLib/PicYuvMD5.cpp @@ -253,9 +253,7 @@ int calcAndPrintHashStatus(const CPelUnitBuf& pic, const SEIDecodedPictureHash* if (pictureHashSEI) { -#if FIX_TICKET_1405 CHECK ((uint32_t)pic.bufs.size() != ( pictureHashSEI->singleCompFlag ? 1 : 3 ), "The value of dph_sei_single_component_flag shall be equal to (ChromaFormatIdc == 0)."); -#endif switch (pictureHashSEI->method) { case HASHTYPE_MD5: diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h index 30f51acbaba8fd79c12133bea1f241f8c4b40cbb..0c4e03602429756736faa1f2c30512dd852b6362 100644 --- a/source/Lib/CommonLib/SEI.h +++ b/source/Lib/CommonLib/SEI.h @@ -245,9 +245,7 @@ public: virtual ~SEIDecodedPictureHash() {} HashType method; -#if FIX_TICKET_1405 bool singleCompFlag; -#endif PictureHash m_pictureHash; }; diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 60549eefdafae6cda82b6669316ef7d0f1108c4f..587218823859e1f0586c39590354e028657b9bda 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -55,7 +55,6 @@ //########### place macros to be removed in next cycle below this line ############### #define JVET_S0078_NOOUTPUTPRIORPICFLAG 0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process -#define FIX_TICKET_1405 1 // Add dph_sei_single_component_flag and dph_sei_reserved_zero_7bits syntax to decoded picture hash SEI message #define FIX_SUBPICS_W_RPR 1 // Fix handling of RPR with subpictures (via scaling windows with no resolution change) //########### place macros to be be kept below this line ############### diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp index d85c53be5188ed40f9ab782e8f7f1d136941f70f..b8ca0dec8738b88ac95f6d7263d906c4a36b30f5 100644 --- a/source/Lib/DecoderLib/SEIread.cpp +++ b/source/Lib/DecoderLib/SEIread.cpp @@ -442,14 +442,12 @@ void SEIReader::xParseSEIDecodedPictureHash(SEIDecodedPictureHash& sei, uint32_t uint32_t val; sei_read_code( pDecodedMessageOutputStream, 8, val, "dph_sei_hash_type"); sei.method = static_cast<HashType>(val); bytesRead++; -#if FIX_TICKET_1405 sei_read_code( pDecodedMessageOutputStream, 1, val, "dph_sei_single_component_flag"); sei.singleCompFlag = val; sei_read_code( pDecodedMessageOutputStream, 7, val, "dph_sei_reserved_zero_7bits"); bytesRead++; uint32_t expectedSize = ( sei.singleCompFlag ? 1 : 3 ) * (sei.method == 0 ? 16 : (sei.method == 1 ? 2 : 4)); CHECK ((payloadSize - bytesRead) != expectedSize, "The size of the decoded picture hash does not match the expected size."); -#endif const char *traceString="\0"; switch (sei.method) diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp index 9257aaacea442cd9ccb9eeba98801071399640f8..9f0f1978952a1cce8490916b44ce7705c74bbbe2 100644 --- a/source/Lib/EncoderLib/SEIEncoder.cpp +++ b/source/Lib/EncoderLib/SEIEncoder.cpp @@ -461,9 +461,7 @@ void SEIEncoder::initDecodedPictureHashSEI(SEIDecodedPictureHash *decodedPicture CHECK(!(decodedPictureHashSEI!=NULL), "Unspecified error"); decodedPictureHashSEI->method = m_pcCfg->getDecodedPictureHashSEIType(); -#if FIX_TICKET_1405 decodedPictureHashSEI->singleCompFlag = (m_pcCfg->getChromaFormatIdc() == 0); -#endif switch (m_pcCfg->getDecodedPictureHashSEIType()) { case HASHTYPE_MD5: diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp index d1c4892e2c1f2a3475bf058ef69a1b0294f34f76..da182af0c8dc7a4590ac157047c8b62db0aa4ae1 100644 --- a/source/Lib/EncoderLib/SEIwrite.cpp +++ b/source/Lib/EncoderLib/SEIwrite.cpp @@ -231,10 +231,8 @@ void SEIWriter::xWriteSEIDecodedPictureHash(const SEIDecodedPictureHash& sei) if (traceString != 0) //use of this variable is needed to avoid a compiler error with G++ 4.6.1 { WRITE_CODE(sei.method, 8, "dph_sei_hash_type"); -#if FIX_TICKET_1405 WRITE_CODE(sei.singleCompFlag, 1, "dph_sei_single_component_flag"); WRITE_CODE(0, 7, "dph_sei_reserved_zero_7bits"); -#endif for(uint32_t i=0; i<uint32_t(sei.m_pictureHash.hash.size()); i++) { WRITE_CODE(sei.m_pictureHash.hash[i], 8, traceString);