Commit 6f5ce047 authored by Karsten Suehring's avatar Karsten Suehring

remove macro JVET_L0191_LM_WO_LMS

parent 3911adcf
This diff is collapsed.
......@@ -130,9 +130,6 @@ protected:
void xFilterGroup ( Pel* pMulDst[], int i, Pel const* const piSrc, int iRecStride, bool bAboveAvaillable, bool bLeftAvaillable);
void xGetLMParameters(const PredictionUnit &pu, const ComponentID compID, const CompArea& chromaArea, int& a, int& b, int& iShift);
#if JVET_L0338_MDLM && !JVET_L0191_LM_WO_LMS
void xPadMdlmTemplateSample (Pel*pSrc, Pel*pCur, int cWidth, int cHeight, int existSampNum, int targetSampNum);
#endif
public:
IntraPrediction();
virtual ~IntraPrediction();
......
......@@ -180,7 +180,6 @@ public:
return rtn;
}
};
#if JVET_L0191_LM_WO_LMS
int g_aiLMDivTableLow[] = {
0, 0, 21845, 0, 13107, 43690, 18724, 0, 50972, 39321, 53620, 21845, 15123, 9362, 4369, 0, 3855,
58254, 17246, 52428, 49932, 59578, 25644, 43690, 28835, 40329, 16990, 37449, 56496, 34952, 4228, 0, 61564, 34695,
......@@ -245,7 +244,6 @@ int g_aiLMDivTableHigh[] = {
134, 134, 134, 133, 133, 133, 132, 132, 132, 132, 131, 131, 131, 131, 130, 130, 130, 130,
129, 129, 129, 129, 128, 128, 128, 128,
};
#endif
#if !JVET_L0338_MDLM
const int g_aiNonLMPosThrs[] = { 3, 1, 0 };
#endif
......
......@@ -214,10 +214,8 @@ extern const uint32_t g_scalingListSizeX[SCALING_LIST_SIZE_NUM];
extern MsgLevel g_verbosity;
#if JVET_L0191_LM_WO_LMS
extern int g_aiLMDivTableLow[];
extern int g_aiLMDivTableHigh[];
#endif
extern const int g_aiNonLMPosThrs[];
......
......@@ -64,7 +64,6 @@
#define JVET_L0191_LM_WO_LMS 1 // NO LMS regression. min/max are used instead
#define JVET_L0338_MDLM 1 // multi-directional LM. L0338 test5.4.1,L0340 test5.6.1
......
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