From e77b3fb1a2c6ab7226ff0bfa6e19ae4a05822930 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Mon, 15 Jun 2020 08:08:39 -0400
Subject: [PATCH] Add check for same layer ID before reusing APS for CC-ALF
This mirrors the check done for reusing an APS for luma/chroma ALF
---
source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
index d5876a6f6..f8021943d 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
@@ -3621,7 +3621,8 @@ std::vector<int> EncAdaptiveLoopFilter::getAvailableCcAlfApsIds(CodingStructure&
while (apsIdChecked < ALF_CTB_MAX_NUM_APS && !cs.slice->isIntra() && result.size() < ALF_CTB_MAX_NUM_APS && !cs.slice->getPendingRasInit() && !cs.slice->isIDRorBLA())
{
APS* curAPS = cs.slice->getAlfAPSs()[curApsId];
- if (curAPS && curAPS->getTemporalId() <= cs.slice->getTLayer() && curAPS->getCcAlfAPSParam().newCcAlfFilter[compID - 1])
+ if (curAPS && curAPS->getLayerId() == cs.slice->getPic()->layerId
+ && curAPS->getTemporalId() <= cs.slice->getTLayer() && curAPS->getCcAlfAPSParam().newCcAlfFilter[compID - 1])
{
result.push_back(curApsId);
}
--
GitLab