diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp index 9ea123638d3c46a48b31a86fbbc4c29e5e26158e..4a46ac28395d26192e08292c693becd2d63bca8d 100644 --- a/source/Lib/CommonLib/SEI.cpp +++ b/source/Lib/CommonLib/SEI.cpp @@ -739,14 +739,7 @@ SEIBufferingPeriod::SEIBufferingPeriod(const SEIBufferingPeriod& sei) = default; SEIPictureTiming::SEIPictureTiming(const SEIPictureTiming& sei) = default; -SEIDecodingUnitInfo::SEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei) -{ - decodingUnitIdx = sei.decodingUnitIdx; - hasSublayerDelays = sei.hasSublayerDelays; - duCpbRemovalDelayIncrement = sei.duCpbRemovalDelayIncrement; - hasDpbOutputDuDelay = sei.hasDpbOutputDuDelay; - dpbOutputDuDelay = sei.dpbOutputDuDelay; -} +SEIDecodingUnitInfo::SEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei) = default; SEIFrameFieldInfo::SEIFrameFieldInfo(const SEIFrameFieldInfo& sei) { diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h index ab892fb7fae47c2697c13d2ab0df5275fe12f295..3396d9b537b64b67079baba53b5eefe032ae4fc8 100644 --- a/source/Lib/CommonLib/SEI.h +++ b/source/Lib/CommonLib/SEI.h @@ -736,13 +736,14 @@ public: } SEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei); virtual ~SEIDecodingUnitInfo() {} - int decodingUnitIdx = 0; + + bool hasDpbOutputDuDelay = false; + + int decodingUnitIdx = 0; + int dpbOutputDuDelay = -1; std::array<bool, MAX_TLAYER> hasSublayerDelays; std::array<uint32_t, MAX_TLAYER> duCpbRemovalDelayIncrement; - - bool hasDpbOutputDuDelay = false; - int dpbOutputDuDelay = -1; }; diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp index 78cbd92b0270eba859dc88c03ecab7fc052f601f..c539859893ac28d378e75251390ace0bf0e3fbec 100644 --- a/source/Lib/EncoderLib/EncGOP.cpp +++ b/source/Lib/EncoderLib/EncGOP.cpp @@ -1484,11 +1484,11 @@ void EncGOP::xUpdateDuInfoSEI(SEIMessages& duInfoSeiMessages, SEIPictureTiming* int i = 0; for (auto sei: duInfoSeiMessages) { - SEIDecodingUnitInfo* dui = (SEIDecodingUnitInfo*) sei; - dui->decodingUnitIdx = i; - dui->hasSublayerDelays = pt->hasSublayerDelays; - dui->duCpbRemovalDelayIncrement = pt->duCpbRemovalDelayIncrement[i]; - dui->hasDpbOutputDuDelay = false; + SEIDecodingUnitInfo* dui = (SEIDecodingUnitInfo*) sei; + dui->decodingUnitIdx = i; + dui->hasSublayerDelays = pt->hasSublayerDelays; + dui->duCpbRemovalDelayIncrement = pt->duCpbRemovalDelayIncrement[i]; + dui->hasDpbOutputDuDelay = false; i++; } }