Skip to content

GitLab

V
VVCSoftware_VTM
Commit 00675d41 authored by Karsten Suehring's avatar Karsten Suehring
Browse files
Options

remove macro JVET_L0053_L0272_DM

parent 75fb27d8
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
source/Lib/CommonLib/TypeDef.h
View file @ 00675d41
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
#define JVET_L0053_L0272_DM 1 // use center position of luma block to derive DM
#define JVET_L0147_ALF_SUBSAMPLED_LAPLACIAN 1 // Subsampled Laplacian calculation #define JVET_L0147_ALF_SUBSAMPLED_LAPLACIAN 1 // Subsampled Laplacian calculation
......
source/Lib/CommonLib/UnitTools.cpp
View file @ 00675d41
...@@ -474,13 +474,9 @@ void PU::getIntraChromaCandModes( const PredictionUnit &pu, unsigned modeList[NU ...@@ -474,13 +474,9 @@ void PU::getIntraChromaCandModes( const PredictionUnit &pu, unsigned modeList[NU
modeList[5] = DM_CHROMA_IDX; modeList[5] = DM_CHROMA_IDX;
#endif #endif
#if JVET_L0053_L0272_DM
Position topLeftPos = pu.blocks[pu.chType].lumaPos(); Position topLeftPos = pu.blocks[pu.chType].lumaPos();
Position refPos = topLeftPos.offset( pu.blocks[pu.chType].lumaSize().width >> 1, pu.blocks[pu.chType].lumaSize().height >> 1 ); Position refPos = topLeftPos.offset( pu.blocks[pu.chType].lumaSize().width >> 1, pu.blocks[pu.chType].lumaSize().height >> 1 );
const PredictionUnit *lumaPU = CS::isDualITree( *pu.cs ) ? pu.cs->picture->cs->getPU( refPos, CHANNEL_TYPE_LUMA ) : &pu; const PredictionUnit *lumaPU = CS::isDualITree( *pu.cs ) ? pu.cs->picture->cs->getPU( refPos, CHANNEL_TYPE_LUMA ) : &pu;
#else
const PredictionUnit *lumaPU = CS::isDualITree( *pu.cs ) ? pu.cs->picture->cs->getPU( pu.blocks[pu.chType].lumaPos(), CHANNEL_TYPE_LUMA ) : &pu;
#endif
const uint32_t lumaMode = lumaPU->intraDir[CHANNEL_TYPE_LUMA]; const uint32_t lumaMode = lumaPU->intraDir[CHANNEL_TYPE_LUMA];
for( int i = 0; i < 4; i++ ) for( int i = 0; i < 4; i++ )
{ {
...@@ -731,13 +727,9 @@ uint32_t PU::getFinalIntraMode( const PredictionUnit &pu, const ChannelType &chT ...@@ -731,13 +727,9 @@ uint32_t PU::getFinalIntraMode( const PredictionUnit &pu, const ChannelType &chT
if( uiIntraMode == DM_CHROMA_IDX && !isLuma( chType ) ) if( uiIntraMode == DM_CHROMA_IDX && !isLuma( chType ) )
{ {
#if JVET_L0053_L0272_DM
Position topLeftPos = pu.blocks[pu.chType].lumaPos(); Position topLeftPos = pu.blocks[pu.chType].lumaPos();
Position refPos = topLeftPos.offset( pu.blocks[pu.chType].lumaSize().width >> 1, pu.blocks[pu.chType].lumaSize().height >> 1 ); Position refPos = topLeftPos.offset( pu.blocks[pu.chType].lumaSize().width >> 1, pu.blocks[pu.chType].lumaSize().height >> 1 );
const PredictionUnit &lumaPU = CS::isDualITree( *pu.cs ) ? *pu.cs->picture->cs->getPU( refPos, CHANNEL_TYPE_LUMA ) : *pu.cs->getPU( topLeftPos, CHANNEL_TYPE_LUMA ); const PredictionUnit &lumaPU = CS::isDualITree( *pu.cs ) ? *pu.cs->picture->cs->getPU( refPos, CHANNEL_TYPE_LUMA ) : *pu.cs->getPU( topLeftPos, CHANNEL_TYPE_LUMA );
#else
const PredictionUnit &lumaPU = CS::isDualITree( *pu.cs ) ? *pu.cs->picture->cs->getPU( pu.blocks[chType].lumaPos(), CHANNEL_TYPE_LUMA ) : *pu.cs->getPU( pu.blocks[chType].lumaPos(), CHANNEL_TYPE_LUMA );
#endif
uiIntraMode = lumaPU.intraDir[0]; uiIntraMode = lumaPU.intraDir[0];
} }
......
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