diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp index d3c9b38b061534f18445ed241fdbb16cbf03a644..eb92e6f91ce63c39d69644a3f3fa9d240d96829d 100644 --- a/source/Lib/DecoderLib/CABACReader.cpp +++ b/source/Lib/DecoderLib/CABACReader.cpp @@ -4654,9 +4654,9 @@ void CABACReader::cuIbcLicFlag( CodingUnit& cu ) cu.ibcFilterFlag = false; } #if JVET_AE0078_IBC_LIC_EXTENSION - if (!cu.ibcFilterFlag) + if (!cu.ibcFilterFlag && cu.cs->sps->getUseIbcLic()) #else - if (!cu.ibcFilterFlag && (cu.lwidth() * cu.lheight() <= 256)) + if (!cu.ibcFilterFlag && cu.cs->sps->getUseIbcLic() && (cu.lwidth() * cu.lheight() <= 256)) #endif { cu.ibcLicFlag = m_BinDecoder.decodeBin(Ctx::IbcLicFlag(0)); @@ -4683,14 +4683,14 @@ void CABACReader::cuIbcLicFlag( CodingUnit& cu ) #endif } #if !JVET_AE0078_IBC_LIC_EXTENSION - else if (!cu.ibcFilterFlag) // (cu.lwidth() * cu.lheight() > 256) + else if (!cu.ibcFilterFlag && cu.cs->sps->getUseIbcLic()) // (cu.lwidth() * cu.lheight() > 256) { cu.ibcLicFlag = false; } #endif else { - cu.ibcLicFlag = true; + cu.ibcLicFlag = cu.cs->sps->getUseIbcLic()? true : false; #if JVET_AE0078_IBC_LIC_EXTENSION cu.ibcLicIdx = 0; #endif diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp index 14762b658e3980a3f9641db8f6f249374d830676..4bcd74dee94d1185663db723816a1f7d1dd3c8ea 100644 --- a/source/Lib/EncoderLib/CABACWriter.cpp +++ b/source/Lib/EncoderLib/CABACWriter.cpp @@ -4243,9 +4243,9 @@ void CABACWriter::cuIbcLicFlag(const CodingUnit& cu) DTRACE(g_trace_ctx, D_SYNTAX, "cu_ibc_lic_flag() filter_flag=%d\n", cu.ibcFilterFlag); } #if JVET_AE0078_IBC_LIC_EXTENSION - if (!cu.ibcFilterFlag) + if (!cu.ibcFilterFlag && cu.cs->sps->getUseIbcLic()) #else - if (!cu.ibcFilterFlag && (cu.lwidth() * cu.lheight() <= 256)) + if (!cu.ibcFilterFlag && cu.cs->sps->getUseIbcLic() && (cu.lwidth() * cu.lheight() <= 256)) #endif { m_BinEncoder.encodeBin(cu.ibcLicFlag ? 1 : 0, Ctx::IbcLicFlag(0));