Skip to content
Snippets Groups Projects
Commit 86c81ae4 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Fix: check if APS used by CC ALF is available at the decoder

parent 8110dd27
No related branches found
No related tags found
1 merge request!1681Fix: check if APS used by CC ALF is available at the decoder
...@@ -1217,6 +1217,10 @@ void activateAPS(PicHeader* picHeader, Slice* pSlice, ParameterSetManager& param ...@@ -1217,6 +1217,10 @@ void activateAPS(PicHeader* picHeader, Slice* pSlice, ParameterSetManager& param
memcpy(filterParam.ccAlfCoeff[COMPONENT_Cb - 1][filterIdx], aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cb - 1][filterIdx], sizeof(aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cb - 1][filterIdx])); memcpy(filterParam.ccAlfCoeff[COMPONENT_Cb - 1][filterIdx], aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cb - 1][filterIdx], sizeof(aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cb - 1][filterIdx]));
} }
} }
else
{
THROW("CC ALF Cb APS not available!");
}
} }
if(pSlice->getTileGroupCcAlfCrEnabledFlag()) if(pSlice->getTileGroupCcAlfCrEnabledFlag())
...@@ -1241,6 +1245,10 @@ void activateAPS(PicHeader* picHeader, Slice* pSlice, ParameterSetManager& param ...@@ -1241,6 +1245,10 @@ void activateAPS(PicHeader* picHeader, Slice* pSlice, ParameterSetManager& param
memcpy(filterParam.ccAlfCoeff[COMPONENT_Cr - 1][filterIdx], aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cr - 1][filterIdx], sizeof(aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cr - 1][filterIdx])); memcpy(filterParam.ccAlfCoeff[COMPONENT_Cr - 1][filterIdx], aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cr - 1][filterIdx], sizeof(aps->getCcAlfAPSParam().ccAlfCoeff[COMPONENT_Cr - 1][filterIdx]));
} }
} }
else
{
THROW("CC ALF Cr APS not available!");
}
} }
if (picHeader->getLmcsEnabledFlag() && lmcsAPS == nullptr) if (picHeader->getLmcsEnabledFlag() && lmcsAPS == nullptr)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment