From b58dba01d6320b9ca4907fadc155c6898f338272 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Mon, 24 Jun 2019 14:45:01 -0400
Subject: [PATCH] Remove old HEVC_USE_HOR_VER_PREDFILTERING macro
---
source/Lib/CommonLib/IntraPrediction.cpp | 18 ------------------
source/Lib/CommonLib/TypeDef.h | 1 -
2 files changed, 19 deletions(-)
diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp
index 5a43cde3a..964c7a911 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 db271a408..c19af4551 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
--
GitLab