From b69219c0bcdab5a70a108fe63da6e5a43ac30794 Mon Sep 17 00:00:00 2001
From: deluxan <santiago.de.luxan@hhi.fraunhofer.de>
Date: Sat, 6 Jun 2020 23:13:07 +0200
Subject: [PATCH] In order to avoid confusion, the following cosmetic changes
have been introduced:
1) The getWideAngle function has been renamed to getModifiedWideAngle.
2) A comment has been added inside this function to explicitly mark the behavior.
---
source/Lib/CommonLib/IntraPrediction.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp
index 1b148e41e..9ba781560 100644
--- a/source/Lib/CommonLib/IntraPrediction.cpp
+++ b/source/Lib/CommonLib/IntraPrediction.cpp
@@ -181,7 +181,7 @@ Pel IntraPrediction::xGetPredValDc( const CPelBuf &pSrc, const Size &dstSize )
return dcVal;
}
-int IntraPrediction::getWideAngle( int width, int height, int predMode )
+int IntraPrediction::getModifiedWideAngle( int width, int height, int predMode )
{
if ( predMode > DC_IDX && predMode <= VDIA_IDX )
{
@@ -193,7 +193,7 @@ int IntraPrediction::getWideAngle( int width, int height, int predMode )
}
else if (height > width && predMode > VDIA_IDX - modeShift[deltaSize])
{
- predMode -= (VDIA_IDX - 1);
+ predMode -= (VDIA_IDX - 1); //In this software implementation, there is no need to reserve the indices 0 and 1 for Planar and DC
}
}
return predMode;
@@ -362,7 +362,7 @@ void IntraPrediction::initPredIntraParams(const PredictionUnit & pu, const CompA
const Size puSize = Size( area.width, area.height );
const Size& blockSize = useISP ? cuSize : puSize;
const int dirMode = PU::getFinalIntraMode(pu, chType);
- const int predMode = getWideAngle( blockSize.width, blockSize.height, dirMode );
+ const int predMode = getModifiedWideAngle( blockSize.width, blockSize.height, dirMode );
m_ipaParam.isModeVer = predMode >= DIA_IDX;
m_ipaParam.multiRefIndex = isLuma (chType) ? pu.multiRefIdx : 0 ;
--
GitLab