diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp index 733435afffeb63142c6a7485a40b8656fea62b30..d0625aa077c88947b5736546eb408a8518291faf 100644 --- a/source/Lib/CommonLib/SEI.cpp +++ b/source/Lib/CommonLib/SEI.cpp @@ -108,7 +108,7 @@ void SEIPictureTiming::copyTo (SEIPictureTiming& target) const target.dpbOutputDelay = dpbOutputDelay; target.dpbOutputDuDelay = dpbOutputDuDelay; target.numDecodingUnits = numDecodingUnits; - target.m_duCommonCpbRemovalDelayFlag = m_duCommonCpbRemovalDelayFlag; + target.duCommonCpbRemovalDelay = duCommonCpbRemovalDelay; target.m_numNalusInDuMinus1 = m_numNalusInDuMinus1; target.m_duCpbRemovalDelayMinus1 = m_duCpbRemovalDelayMinus1; @@ -768,7 +768,7 @@ SEIPictureTiming::SEIPictureTiming(const SEIPictureTiming& sei) dpbOutputDelay = sei.dpbOutputDelay; dpbOutputDuDelay = sei.dpbOutputDuDelay; numDecodingUnits = sei.numDecodingUnits; - m_duCommonCpbRemovalDelayFlag = sei.m_duCommonCpbRemovalDelayFlag; + duCommonCpbRemovalDelay = sei.duCommonCpbRemovalDelay; std::memcpy(m_duCommonCpbRemovalDelayMinus1, sei.m_duCommonCpbRemovalDelayMinus1, sizeof(sei.m_duCommonCpbRemovalDelayMinus1)); m_numNalusInDuMinus1 = sei.m_numNalusInDuMinus1; m_duCpbRemovalDelayMinus1 = sei.m_duCpbRemovalDelayMinus1; diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h index 6e645ee480b5a41a7d6a1dbe51e7ec9247e507e5..86486e00882fa4a3f33bfcfbf783a92fc0d4ef7d 100644 --- a/source/Lib/CommonLib/SEI.h +++ b/source/Lib/CommonLib/SEI.h @@ -687,7 +687,7 @@ public: : dpbOutputDelay(0) , dpbOutputDuDelay(0) , numDecodingUnits(0) - , m_duCommonCpbRemovalDelayFlag(false) + , duCommonCpbRemovalDelay(false) , hasAltTimingInfo(false) , m_ptDisplayElementalPeriodsMinus1(0) { @@ -709,7 +709,7 @@ public: uint32_t dpbOutputDelay; uint32_t dpbOutputDuDelay; uint32_t numDecodingUnits; - bool m_duCommonCpbRemovalDelayFlag; + bool duCommonCpbRemovalDelay; uint32_t m_duCommonCpbRemovalDelayMinus1[MAX_TLAYER]; std::vector<uint32_t> m_numNalusInDuMinus1; std::vector<uint32_t> m_duCpbRemovalDelayMinus1; diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp index 445560f81ad89e59e69ac205dbe4a5d524692d2d..559703f7787ffda26b22c826b38404255074c9a1 100644 --- a/source/Lib/DecoderLib/SEIread.cpp +++ b/source/Lib/DecoderLib/SEIread.cpp @@ -1828,8 +1828,8 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& pt, uint32_t payloadSiz if (pt.numDecodingUnits > 1) { sei_read_flag( pDecodedMessageOutputStream, symbol, "du_common_cpb_removal_delay_flag" ); - pt.m_duCommonCpbRemovalDelayFlag = symbol; - if (pt.m_duCommonCpbRemovalDelayFlag) + pt.duCommonCpbRemovalDelay = symbol; + if (pt.duCommonCpbRemovalDelay) { for (int i = temporalId; i < bp.maxSublayers; i++) { @@ -1845,7 +1845,7 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& pt, uint32_t payloadSiz { sei_read_uvlc( pDecodedMessageOutputStream, symbol, "num_nalus_in_du_minus1[i]" ); pt.m_numNalusInDuMinus1[i] = symbol; - if (!pt.m_duCommonCpbRemovalDelayFlag && i < pt.numDecodingUnits - 1) + if (!pt.duCommonCpbRemovalDelay && i < pt.numDecodingUnits - 1) { for (int j = temporalId; j < bp.maxSublayers; j++) { @@ -1861,7 +1861,7 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& pt, uint32_t payloadSiz } else { - pt.m_duCommonCpbRemovalDelayFlag = 0; + pt.duCommonCpbRemovalDelay = 0; } } sei_read_code( pDecodedMessageOutputStream, 8, symbol, "pt_display_elemental_periods_minus1" ); diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp index 6289cfaf65bbdab513dfb1a7b7373a6c7ab6c1b5..65d7c68e2eb8cafc6bac38310f92c98f049b6da0 100644 --- a/source/Lib/EncoderLib/EncGOP.cpp +++ b/source/Lib/EncoderLib/EncGOP.cpp @@ -1121,7 +1121,7 @@ void EncGOP::xCreatePictureTimingSEI(int irapGopId, SEIMessages &seiMessages, SE { const uint32_t numDU = (uint32_t) duData.size(); pictureTimingSEI->numDecodingUnits = numDU; - pictureTimingSEI->m_duCommonCpbRemovalDelayFlag = false; + pictureTimingSEI->duCommonCpbRemovalDelay = false; pictureTimingSEI->m_numNalusInDuMinus1.resize( numDU ); const uint32_t maxNumSubLayers = slice->getSPS()->getMaxTLayers(); pictureTimingSEI->m_duCpbRemovalDelayMinus1.resize( numDU * maxNumSubLayers ); diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp index 6105f30390f47c05a51389cdddab6cc517748f0e..3d3c3d927dc7f7b42c4ac0c4df8754ec8b806ce5 100644 --- a/source/Lib/EncoderLib/SEIwrite.cpp +++ b/source/Lib/EncoderLib/SEIwrite.cpp @@ -532,8 +532,8 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf xWriteUvlc(sei.numDecodingUnits - 1, "pt_num_decoding_units_minus1"); if (sei.numDecodingUnits > 1) { - xWriteFlag( sei.m_duCommonCpbRemovalDelayFlag, "du_commmon_cpb_removal_delay_flag" ); - if( sei.m_duCommonCpbRemovalDelayFlag ) + xWriteFlag(sei.duCommonCpbRemovalDelay, "pt_du_common_cpb_removal_delay_flag"); + if (sei.duCommonCpbRemovalDelay) { for (int i = temporalId; i < bp.maxSublayers; i++) { @@ -547,7 +547,7 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf for (int i = 0; i < sei.numDecodingUnits; i++) { xWriteUvlc( sei.m_numNalusInDuMinus1[i], "num_nalus_in_du_minus1[i]" ); - if (!sei.m_duCommonCpbRemovalDelayFlag && i < sei.numDecodingUnits - 1) + if (!sei.duCommonCpbRemovalDelay && i < sei.numDecodingUnits - 1) { for (int j = temporalId; j < bp.maxSublayers; j++) {