From 19c3ca642061deaeb90fe794345cfab8231e9895 Mon Sep 17 00:00:00 2001 From: Shunsuke Iwamura <iwamura.s-gc@nhk.or.jp> Date: Fri, 26 Oct 2018 09:59:09 +0900 Subject: [PATCH] change variable name to align with guideline --- source/Lib/CommonLib/LoopFilter.cpp | 14 +++++++------- source/Lib/CommonLib/LoopFilter.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/Lib/CommonLib/LoopFilter.cpp b/source/Lib/CommonLib/LoopFilter.cpp index ceec1963..71f3397b 100644 --- a/source/Lib/CommonLib/LoopFilter.cpp +++ b/source/Lib/CommonLib/LoopFilter.cpp @@ -561,26 +561,26 @@ unsigned LoopFilter::xGetBoundaryStrengthSingle ( const CodingUnit& cu, const De } #if LUMA_ADAPTIVE_DEBLOCKING_FILTER_QP_OFFSET -void LoopFilter::deriveLADFShift( const Pel* piSrc, const int iStride, int& iShift, const DeblockEdgeDir edgeDir, const SPS sps ) +void LoopFilter::deriveLADFShift( const Pel* src, const int stride, int& shift, const DeblockEdgeDir edgeDir, const SPS sps ) { - uint32_t uiLevel = 0; - iShift = sps.getSpsNext().getLadfQpOffset(0); + uint32_t lumaLevel = 0; + shift = sps.getSpsNext().getLadfQpOffset(0); if (edgeDir == EDGE_VER) { - uiLevel = (piSrc[0] + piSrc[3*iStride] + piSrc[-1] + piSrc[3*iStride - 1]) >> 2; + lumaLevel = (src[0] + src[3*stride] + src[-1] + src[3*stride - 1]) >> 2; } else // (edgeDir == EDGE_HOR) { - uiLevel = (piSrc[0] + piSrc[3] + piSrc[-iStride] + piSrc[-iStride + 3]) >> 2; + lumaLevel = (src[0] + src[3] + src[-stride] + src[-stride + 3]) >> 2; } for ( int k = 1; k < sps.getSpsNext().getLadfNumIntervals(); k++ ) { const int th = sps.getSpsNext().getLadfIntervalLowerBound( k ); - if ( uiLevel > th ) + if ( lumaLevel > th ) { - iShift = sps.getSpsNext().getLadfQpOffset( k ); + shift = sps.getSpsNext().getLadfQpOffset( k ); } else { diff --git a/source/Lib/CommonLib/LoopFilter.h b/source/Lib/CommonLib/LoopFilter.h index 2b74f476..2a7cb9c0 100644 --- a/source/Lib/CommonLib/LoopFilter.h +++ b/source/Lib/CommonLib/LoopFilter.h @@ -80,7 +80,7 @@ private: void xEdgeFilterChroma ( const CodingUnit& cu, const DeblockEdgeDir edgeDir, const int iEdge ); #if LUMA_ADAPTIVE_DEBLOCKING_FILTER_QP_OFFSET - void deriveLADFShift( const Pel* piSrc, const int iStride, int& iShift, const DeblockEdgeDir edgeDir, const SPS sps ); + void deriveLADFShift( const Pel* src, const int stride, int& shift, const DeblockEdgeDir edgeDir, const SPS sps ); #endif inline void xPelFilterLuma ( Pel* piSrc, const int iOffset, const int tc, const bool sw, const bool bPartPNoFilter, const bool bPartQNoFilter, const int iThrCut, const bool bFilterSecondP, const bool bFilterSecondQ, const ClpRng& clpRng ) const; inline void xPelFilterChroma ( Pel* piSrc, const int iOffset, const int tc, const bool bPartPNoFilter, const bool bPartQNoFilter, const ClpRng& clpRng ) const; -- GitLab