Commit 7c547d62 authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'fix_ticket_670' into 'master'

Fix for Ticket #670 - Apply ALF VB on the bottom CTU row

See merge request !1167
parents 3057c21d a968d8c8
Pipeline #3489 passed with stage
in 5 minutes and 34 seconds
......@@ -970,11 +970,19 @@ void AdaptiveLoopFilter::deriveClassification( AlfClassifier** classifier, const
#if JVET_O0625_ALF_PADDING
m_deriveClassificationBlk( classifier, m_laplacian, srcLuma, Area( j - blk.pos().x + blkDst.pos().x, i - blk.pos().y + blkDst.pos().y, nWidth, nHeight ), Area(j, i, nWidth, nHeight), m_inputBitDepth[CHANNEL_TYPE_LUMA] + 4
, m_alfVBLumaCTUHeight
#if JVET_P0158_ALIGN_ALF_VB
, m_alfVBLumaPos, alfBryList );
#else
, ( ( i - blk.pos().y + blkDst.pos().y + nHeight >= m_picHeight ) ? m_picHeight : m_alfVBLumaPos ), alfBryList );
#endif
#else
m_deriveClassificationBlk(classifier, m_laplacian, srcLuma, Area( j - blk.pos().x + blkDst.pos().x, i - blk.pos().y + blkDst.pos().y, nWidth, nHeight ), Area(j, i, nWidth, nHeight), m_inputBitDepth[CHANNEL_TYPE_LUMA] + 4
, m_alfVBLumaCTUHeight
#if JVET_P0158_ALIGN_ALF_VB
, m_alfVBLumaPos
#else
, ((i - blk.pos().y + blkDst.pos().y + nHeight >= m_picHeight) ? m_picHeight : m_alfVBLumaPos)
#endif
);
#endif
}
......
......@@ -1920,7 +1920,11 @@ void EncAdaptiveLoopFilter::deriveStatsForFiltering( PelUnitBuf& orgYuv, PelUnit
const CompArea& compAreaDst = areaDst.block( compID );
getBlkStats(m_alfCovariance[compIdx][shape][ctuRsAddr], m_filterShapes[chType][shape], compIdx ? nullptr : m_classifier, org, orgStride, rec, recStride, compAreaDst, compArea, chType
, ((compIdx == 0) ? m_alfVBLumaCTUHeight : m_alfVBChmaCTUHeight)
#if JVET_P0158_ALIGN_ALF_VB
, (compIdx == 0) ? m_alfVBLumaPos : m_alfVBChmaPos
#else
, ((yPos + m_maxCUHeight >= m_picHeight) ? m_picHeight : ((compIdx == 0) ? m_alfVBLumaPos : m_alfVBChmaPos))
#endif
#if JVET_O0625_ALF_PADDING
, compIdx ? alfBryListChroma : alfBryList
#endif
......@@ -1972,7 +1976,11 @@ void EncAdaptiveLoopFilter::deriveStatsForFiltering( PelUnitBuf& orgYuv, PelUnit
{
getBlkStats(m_alfCovariance[compIdx][shape][ctuRsAddr], m_filterShapes[chType][shape], compIdx ? nullptr : m_classifier, org, orgStride, rec, recStride, compArea, compArea, chType
, ((compIdx == 0) ? m_alfVBLumaCTUHeight : m_alfVBChmaCTUHeight)
#if JVET_P0158_ALIGN_ALF_VB
, (compIdx == 0) ? m_alfVBLumaPos : m_alfVBChmaPos
#else
, ((yPos + m_maxCUHeight >= m_picHeight) ? m_picHeight : ((compIdx == 0) ? m_alfVBLumaPos : m_alfVBChmaPos))
#endif
#if JVET_O0625_ALF_PADDING
, alfBryList
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment