diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp index 0319ec77553f23c1cf61deda82cabe89bcd0509a..a968f20cbd1a7ada82b8d756caf7d49e50b16553 100644 --- a/source/Lib/CommonLib/Slice.cpp +++ b/source/Lib/CommonLib/Slice.cpp @@ -3731,6 +3731,9 @@ SPS::SPS() , m_OBMC ( false ) #endif , m_ciip ( false ) +#if JVET_X0141_CIIP_TIMD_TM && JVET_W0123_TIMD_FUSION +, m_ciipTimd ( false ) +#endif #if JVET_X0141_CIIP_TIMD_TM && TM_MRG , m_ciipTmMrg ( false ) #endif diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h index 8025fba8e8a411c0c39b6398c8d7b82ffbff8724..4a44b7de7c93e14407fdb9c2789a63d9eb40fd9a 100644 --- a/source/Lib/CommonLib/Slice.h +++ b/source/Lib/CommonLib/Slice.h @@ -1750,7 +1750,7 @@ private: unsigned m_intraTmpMaxSize; ///< max CU size for which intra TMP is allowed #endif #if JVET_AC0071_DBV - bool m_intraDBV; + bool m_intraDBV; #endif #if ENABLE_OBMC bool m_OBMC; diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp index e7bffb99edcaf49ab685cfdfc31605f646d24dbf..9eed7d1ac5292a87f973d1948d378d42bbf5a24b 100644 --- a/source/Lib/EncoderLib/EncLib.cpp +++ b/source/Lib/EncoderLib/EncLib.cpp @@ -1836,6 +1836,9 @@ void EncLib::xInitSPS( SPS& sps ) #if JVET_W0123_TIMD_FUSION sps.setUseTimd ( m_timd ); #endif +#if JVET_X0141_CIIP_TIMD_TM && JVET_W0123_TIMD_FUSION + sps.setUseCiipTimd ( m_ciipTimd ); +#endif #if JVET_AB0155_SGPM sps.setUseSgpm ( m_sgpm ); #endif