Commit 76e3aee8 authored by Xiang Li's avatar Xiang Li

Merge branch 'o0364-pdpc-dc' into 'master'

JVET-O0364 part 4: align PDPC process for DC with the one for Planar

See merge request jvet/VVCSoftware_VTM!668
parents 34bbb220 809de035
Pipeline #1872 passed with stage
......@@ -323,7 +323,11 @@ void IntraPrediction::predIntraAng( const ComponentID compId, PelBuf &piPred, co
const int scale = ((g_aucLog2[iWidth] - 2 + g_aucLog2[iHeight] - 2 + 2) >> 2);
CHECK(scale < 0 || scale > 31, "PDPC: scale < 0 || scale > 31");
#if JVET_O0364_PDPC_DC
if (uiDirMode == PLANAR_IDX || uiDirMode == DC_IDX)
#else
if (uiDirMode == PLANAR_IDX)
#endif
{
for (int y = 0; y < iHeight; y++)
{
......@@ -337,6 +341,7 @@ void IntraPrediction::predIntraAng( const ComponentID compId, PelBuf &piPred, co
}
}
}
#if !JVET_O0364_PDPC_DC
else if (uiDirMode == DC_IDX)
{
const Pel topLeft = srcBuf.at(0, 0);
......@@ -353,6 +358,7 @@ void IntraPrediction::predIntraAng( const ComponentID compId, PelBuf &piPred, co
}
}
}
#endif
else if (uiDirMode == HOR_IDX)
{
const Pel topLeft = srcBuf.at(0, 0);
......
......@@ -76,6 +76,8 @@
#define JVET_O0280_SIMD_TRIANGLE_WEIGHTING 1 // JVET-O0280: SIMD implementation for weighted sample prediction process of triangle prediction mode
#define JVET_O0364_PDPC_DC 1 // JVET-O0364 Part 4: align PDPC process for DC with the one for Planar
#define FIX_DB_MAX_TRANSFORM_SIZE 1
#define MRG_SHARELIST_SHARSIZE 32
......
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