diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp index 5a43cde3ac7d6299ee7678434fc77467c5224f03..964c7a9115995a2e721d1c60d7ef778858d2cc7c 100644 --- a/source/Lib/CommonLib/IntraPrediction.cpp +++ b/source/Lib/CommonLib/IntraPrediction.cpp @@ -676,15 +676,6 @@ void IntraPrediction::xPredIntraAng( const CPelBuf &pSrc, PelBuf &pDst, const Ch pDstBuf[y*dstStride + x] = refMain[x + 1]; } } -#if HEVC_USE_HOR_VER_PREDFILTERING - if (edgeFilter && multiRefIdx == 0) - { - for( int y = 0; y < height; y++ ) - { - pDstBuf[y*dstStride] = ClipPel( pDstBuf[y*dstStride] + ( ( refSide[y + 1] - refSide[0] ) >> 1 ), clpRng ); - } - } -#endif } else { @@ -785,15 +776,6 @@ void IntraPrediction::xPredIntraAng( const CPelBuf &pSrc, PelBuf &pDst, const Ch } } } -#if HEVC_USE_HOR_VER_PREDFILTERING - if( edgeFilter && absAng <= 1 ) - { - for( int y = 0; y < height; y++ ) - { - pDstBuf[y*dstStride] = ClipPel( pDstBuf[y*dstStride] + ((refSide[y + 1] - refSide[0]) >> 2), clpRng ); - } - } -#endif } // Flip the block if this is the horizontal mode diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index db271a4083b5b0eb901684e485e763e28d08cd0c..c19af4551d8bead6f5cee3d317d801327971bc88 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -303,7 +303,6 @@ typedef std::pair<int, int> TrCost; #if HEVC_TOOLS #define HEVC_USE_INTRA_SMOOTHING_T32 1 #define HEVC_USE_INTRA_SMOOTHING_T64 1 -#define HEVC_USE_HOR_VER_PREDFILTERING 1 #define HEVC_USE_MDCS 1 #define HEVC_USE_SIGN_HIDING 1 #define HEVC_USE_SCALING_LISTS 1