diff --git a/source/Lib/CommonLib/LoopFilter.cpp b/source/Lib/CommonLib/LoopFilter.cpp index aa530c108b858545ce1913814532ece7b64350fa..ac007d78db692098770e1080bbb31eda6d2dd28b 100644 --- a/source/Lib/CommonLib/LoopFilter.cpp +++ b/source/Lib/CommonLib/LoopFilter.cpp @@ -1641,7 +1641,6 @@ inline bool LoopFilter::xUseStrongFiltering(Pel* piSrc, const int iOffset, const { Pel mP4; Pel m11; -#if JVET_Q0054 if (sidePisLarge) { if (maxFilterLengthP == 7) @@ -1675,34 +1674,6 @@ inline bool LoopFilter::xUseStrongFiltering(Pel* piSrc, const int iOffset, const sq3 = (sq3 + abs(m11 - m7) + 1) >> 1; } return ((sp3 + sq3) < (beta*3 >> 5)) && (d < (beta >> 4)) && (abs(m3 - m4) < ((tc * 5 + 1) >> 1)); -#else - if (maxFilterLengthP == 5) - { - mP4 = piSrc[-iOffset * 6]; - } - else - { - mP4 = piSrc[-iOffset * 8]; - } - if (maxFilterLengthQ == 5) - { - m11 = piSrc[iOffset * 5]; - } - else - { - m11 = piSrc[iOffset * 7]; - } - - if (sidePisLarge) - { - sp3 = (sp3 + abs(m0 - mP4) + 1) >> 1; - } - if (sideQisLarge) - { - sq3 = (sq3 + abs(m11 - m7) + 1) >> 1; - } - return ((sp3 + sq3) < (beta*3 >> 5)) && (d < (beta >> 2)) && (abs(m3 - m4) < ((tc * 5 + 1) >> 1)); -#endif } else return ( ( d_strong < ( beta >> 3 ) ) && ( d < ( beta >> 2 ) ) && ( abs( m3 - m4 ) < ( ( tc * 5 + 1 ) >> 1 ) ) ); diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index e7da42452b7d7879506c4d6a4b6dc2ae9cd81350..5a50520c8f4650c2147977af64fa92baac81b1ee 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -144,7 +144,6 @@ -#define JVET_Q0054 1 // fix for long luma deblocking decision #define JVET_Q0795_CCALF 1 // Cross-component ALF #define JVET_Q0297_MER 1 // JVET_Q0297: Merge estimation region