Skip to content

[pull] master from fraunhoferhhi:master #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jun 18, 2026
Merged

[pull] master from fraunhoferhhi:master #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02f890c
Arm: Update Neon implementation for Filter7x7Blk
athulya-arm May 8, 2026
bbfff10
Arm: Update ALF Filter7x7Blk to skip clip handling
athulya-arm May 14, 2026
4046482
Merge pull request #355 from athulya-arm/Filter7x7Blk_revisit_upstream
K-os Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions source/Lib/CommonLib/AdaptiveLoopFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,8 @@ void AdaptiveLoopFilter::filterAreaLuma( const CPelUnitBuf& srcBuf,
{
const short* coeff = nullptr;
const short* clip = nullptr;
const bool isFixedFilterSet = filterSetIndex < NUM_FIXED_FILTER_SETS;

if( filterSetIndex >= NUM_FIXED_FILTER_SETS )
{
CHECK( slice->getNumAlfAps() <= ( filterSetIndex - NUM_FIXED_FILTER_SETS ), "deduemm" );
Expand Down Expand Up @@ -536,7 +538,7 @@ void AdaptiveLoopFilter::filterAreaLuma( const CPelUnitBuf& srcBuf,
int nWidth = std::min( j + m_CLASSIFICATION_BLK_SIZE, right ) - j;

m_deriveClassificationBlk( classifier[tId].data(), srcBuf.Y(), Area( j, i, nWidth, nHeight ), m_inputBitDepth + 4, m_alfVBLumaCTUHeight, m_alfVBLumaPos );
m_filter7x7Blk ( classifier[tId].data(), dstBuf, srcBuf, Area( j, i, nWidth, nHeight ), COMPONENT_Y, coeff, clip, clpRngs, m_alfVBLumaCTUHeight, m_alfVBLumaPos );
m_filter7x7Blk ( classifier[tId].data(), dstBuf, srcBuf, Area( j, i, nWidth, nHeight ), COMPONENT_Y, coeff, clip, clpRngs, m_alfVBLumaCTUHeight, m_alfVBLumaPos, isFixedFilterSet );
}
}
}
Expand Down Expand Up @@ -569,7 +571,7 @@ void AdaptiveLoopFilter::filterAreaChroma( const CPelUnitBuf& srcBuf,
alfSliceParam.chrmClippFinal + altIdx * MAX_NUM_ALF_CHROMA_COEFF,
clpRngs,
m_alfVBChmaCTUHeight,
m_alfVBChmaPos );
m_alfVBChmaPos, false );
}
else
{
Expand Down Expand Up @@ -1180,8 +1182,10 @@ void AdaptiveLoopFilter::filterBlk( const AlfClassifier* classifier,
const short* fClipSet,
const ClpRng& clpRng,
int vbCTUHeight,
int vbPos )
int vbPos,
const bool isFixedFilterSet )
{
( void ) isFixedFilterSet;
const bool bChroma = isChroma( compId );

if( bChroma )
Expand Down
6 changes: 3 additions & 3 deletions source/Lib/CommonLib/AdaptiveLoopFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ class AdaptiveLoopFilter

void ( *m_filter5x5Blk )( const AlfClassifier* classifier, const PelUnitBuf& recDst, const CPelUnitBuf& recSrc,
const Area& blk, const ComponentID compId, const short* filterSet, const short* fClipSet,
const ClpRng& clpRng, int vbCTUHeight, int vbPos );
const ClpRng& clpRng, int vbCTUHeight, int vbPos, const bool isFixedFilterSet );
void ( *m_filter7x7Blk )( const AlfClassifier* classifier, const PelUnitBuf& recDst, const CPelUnitBuf& recSrc,
const Area& blk, const ComponentID compId, const short* filterSet, const short* fClipSet,
const ClpRng& clpRng, int vbCTUHeight, int vbPos );
const ClpRng& clpRng, int vbCTUHeight, int vbPos, const bool isFixedFilterSet );
void ( *m_deriveClassificationBlk )( AlfClassifier *classifier, const CPelBuf& srcLuma, const Area& blk, const int shift, int vbCTUHeight, int vbPos );
protected:

Expand All @@ -143,7 +143,7 @@ class AdaptiveLoopFilter
void filterAreaChromaBothCc ( const CPelUnitBuf& srcBuf, PelUnitBuf& dstBuf, const Area& blkLuma, const Area& blkChroma, const Slice* slice, const APS* const* aps, const CtuAlfData& ctuAlfData, const ClpRngs& clpRngs );

template<AlfFilterType filtType>
static void filterBlk ( const AlfClassifier *classifier, const PelUnitBuf &recDst, const CPelUnitBuf& recSrc, const Area& blk, const ComponentID compId, const short* filterSet, const short* fClipSet, const ClpRng& clpRng, int vbCTUHeight, int vbPos );
static void filterBlk ( const AlfClassifier *classifier, const PelUnitBuf &recDst, const CPelUnitBuf& recSrc, const Area& blk, const ComponentID compId, const short* filterSet, const short* fClipSet, const ClpRng& clpRng, int vbCTUHeight, int vbPos, const bool isFixedFilterSet );
void ( *m_filterCcAlf ) ( const PelBuf &dstBuf, const CPelUnitBuf &recSrc, const Area &blkDst, const Area &blkSrc, const ComponentID compId, const int16_t *filterCoeff, const ClpRngs &clpRngs, int vbCTUHeight, int vbPos );
void ( *m_filterCcAlfBoth ) ( const PelBuf& dstBufCb, const PelBuf& dstBufCr, const CPelUnitBuf &recSrc, const Area &blkDst,
const Area &blkSrc, const int16_t* filterCoeffCb, const int16_t* filterCoeffCr,
Expand Down
Loading
Loading