Commit b7cb8c29 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'N0435-WAIP-Harmonization' into 'master'

JVET-N0435: WAIP Harmonization

See merge request jvet/VVCSoftware_VTM!450
parents c957162c 0a2f0e34
......@@ -607,7 +607,11 @@ void IntraPrediction::initPredIntraParams(const PredictionUnit & pu, const CompA
if (filterFlag)
{
const bool isRefFilter = isIntegerSlope(absAng);
#if JVET_N0435_WAIP_HARMONIZATION
m_ipaParam.refFilterFlag = isRefFilter && puSize.width * puSize.height > 32;
#else
m_ipaParam.refFilterFlag = isRefFilter;
#endif
m_ipaParam.interpolationFlag = !isRefFilter;
}
}
......
......@@ -115,7 +115,11 @@ protected:
void initPredIntraParams ( const PredictionUnit & pu, const CompArea compArea, const SPS& sps );
#if JVET_N0435_WAIP_HARMONIZATION
static bool isIntegerSlope(const int absAng) { return (0 == (absAng & 0x1F)); }
#else
static bool isIntegerSlope ( const int absAng ) { return (0 == (absAng & 0x1F)) && absAng <=32; } // integer-slope modes 2, DIA_IDX and VDIA_IDX. "absAng <=32" restricts wide-angle integer modes
#endif
Pel xGetPredValDc ( const CPelBuf &pSrc, const Size &dstSize );
......
......@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
#define JVET_N0435_WAIP_HARMONIZATION 1
#define JVET_N0168_AMVR_ME_MODIFICATION 1 // Correct the cost and bits calculation in encoder side
#define JVET_N0068_AFFINE_MEM_BW 1 // memory bandwidth reduction for affine mode
......
Supports Markdown
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