From 06e6ad8bed34ffcc637648318d0cb3c9f461282c Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Fri, 18 Jan 2019 12:20:44 +0100
Subject: [PATCH] remove macro L0074_SUBBLOCK_DEBLOCKING
---
source/Lib/CommonLib/LoopFilter.cpp | 31 -------------------------
source/Lib/CommonLib/TypeDef.h | 36 -----------------------------
2 files changed, 67 deletions(-)
diff --git a/source/Lib/CommonLib/LoopFilter.cpp b/source/Lib/CommonLib/LoopFilter.cpp
index be0f9d8ba..bf58aec10 100644
--- a/source/Lib/CommonLib/LoopFilter.cpp
+++ b/source/Lib/CommonLib/LoopFilter.cpp
@@ -250,10 +250,8 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
xSetEdgefilterMultiple( cu, EDGE_HOR, areaTu, m_stLFCUParam.internalEdge );
}
-#if L0074_SUBBLOCK_DEBLOCKING
bool mvSubBlocks = false;
int subBlockSize = 8;
-#endif
for( auto &currPU : CU::traversePUs( cu ) )
{
const Area& areaPu = cu.Y().valid() ? currPU.block( COMPONENT_Y ) : area;
@@ -263,7 +261,6 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
xSetEdgefilterMultiple( cu, EDGE_VER, areaPu, (xOff ? m_stLFCUParam.internalEdge : m_stLFCUParam.leftEdge), xOff );
xSetEdgefilterMultiple( cu, EDGE_HOR, areaPu, (yOff ? m_stLFCUParam.internalEdge : m_stLFCUParam.topEdge), yOff );
-#if L0074_SUBBLOCK_DEBLOCKING
if ((currPU.mergeFlag && (currPU.mergeType == MRG_TYPE_SUBPU_ATMVP)) || cu.affine)
{
mvSubBlocks = true;
@@ -284,26 +281,8 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
}
}
}
-#endif
}
-#if !L0074_SUBBLOCK_DEBLOCKING
- if ( cu.affine )
- {
- const int widthInBaseUnits = cu.Y().width >> pcv.minCUWidthLog2;
- for( uint32_t edgeIdx = 1 ; edgeIdx < widthInBaseUnits ; edgeIdx++ )
- {
- const Area affiBlockV( cu.Y().x + edgeIdx * pcv.minCUWidth, cu.Y().y, pcv.minCUWidth, cu.Y().height );
- xSetEdgefilterMultiple( cu, EDGE_VER, affiBlockV, m_stLFCUParam.internalEdge, 1 );
- }
- const int heightInBaseUnits = cu.Y().height >> pcv.minCUHeightLog2;
- for( uint32_t edgeIdx = 1 ; edgeIdx < heightInBaseUnits ; edgeIdx++ )
- {
- const Area affiBlockH( cu.Y().x, cu.Y().y + edgeIdx * pcv.minCUHeight, cu.Y().width, pcv.minCUHeight );
- xSetEdgefilterMultiple( cu, EDGE_HOR, affiBlockH, m_stLFCUParam.internalEdge, 1 );
- }
- }
-#endif
const unsigned uiPelsInPart = pcv.minCUWidth;
for( int y = 0; y < area.height; y += uiPelsInPart )
@@ -337,27 +316,17 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
if (cu.blocks[COMPONENT_Y].valid())
{
-#if L0074_SUBBLOCK_DEBLOCKING
if (mvSubBlocks)
{
orthogonalIncrement = subBlockSize / 4;
orthogonalLength = (edgeDir == EDGE_HOR) ? cu.blocks[COMPONENT_Y].height / 4 : cu.blocks[COMPONENT_Y].width / 4;
}
-#endif
-#if L0074_SUBBLOCK_DEBLOCKING
if ((cu.blocks[COMPONENT_Y].height > 64) && (edgeDir == EDGE_HOR) && !mvSubBlocks)
-#else
- if ((cu.blocks[COMPONENT_Y].height > 64) && (edgeDir == EDGE_HOR))
-#endif
{
orthogonalIncrement = 64 / 4;
orthogonalLength = cu.blocks[COMPONENT_Y].height / 4;
}
-#if L0074_SUBBLOCK_DEBLOCKING
if ((cu.blocks[COMPONENT_Y].width > 64) && (edgeDir == EDGE_VER) && !mvSubBlocks)
-#else
- if ((cu.blocks[COMPONENT_Y].width > 64) && (edgeDir == EDGE_VER))
-#endif
{
orthogonalIncrement = 64 / 4;
orthogonalLength = cu.blocks[COMPONENT_Y].width / 4;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index a2bbed28e..57a12bf25 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -52,45 +52,9 @@
#define TRAINED_CABAC_INIT_TABLES 1 // Trained values for VTM3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
#define JVET_L0090_PAIR_AVG 1 // Add pairwise average candidates, replace HEVC combined candidates
-
-
-
-
-
-
-
-
-#define L0074_SUBBLOCK_DEBLOCKING 1
-
-
-
-
-
-
-
#define REUSE_CU_RESULTS 1
-
-
-
-
-
-
#ifndef JVET_B0051_NON_MPM_MODE
#define JVET_B0051_NON_MPM_MODE ( 1 && JEM_TOOLS )
#endif
--
GitLab