diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg
index 2e9644e55279a9aa6b47d7f7869839f1435a35c2..04f5162bb32143178abeb7f528c3831c85cad6c7 100644
--- a/cfg/encoder_lowdelay_vtm.cfg
+++ b/cfg/encoder_lowdelay_vtm.cfg
@@ -130,6 +130,7 @@ ALF : 1
GBi : 1
GBiFast : 1
MHIntra : 1
+Triangle : 1
# Fast tools
PBIntraFast : 1
diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg
index 0bce5026353f659f813953a3a0bbdb8da98c8345..7e8715098d3ba50270ef06cc844ca593cf4a3272 100644
--- a/cfg/encoder_randomaccess_vtm.cfg
+++ b/cfg/encoder_randomaccess_vtm.cfg
@@ -145,6 +145,7 @@ GBi : 1
GBiFast : 1
BIO : 1
MHIntra : 1
+Triangle : 1
# Fast tools
PBIntraFast : 1
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 9648f03c03c30349f44bd21e7d3b883e998c3768..92c6553243a3c9a2904de05520b68cc95026367c 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -265,6 +265,9 @@ void EncApp::xInitLibCfg()
#endif
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
m_cEncLib.setUseMHIntra ( m_MHIntra );
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ m_cEncLib.setUseTriangle ( m_Triangle );
#endif
// ADD_NEW_TOOL : (encoder app) add setting of tool enabling flags and associated parameters here
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 61ef4ebaa7cd82bbb43a32e39dec4f51c1bd556c..308a838595d2753c8262cf93b45a987f976cb392 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -870,6 +870,9 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#endif
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
("MHIntra", m_MHIntra, false, "Enable MHIntra mode")
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ ("Triangle", m_Triangle, false, "Enable triangular shape motion vector prediction (0:off, 1:on)")
#endif
// ADD_NEW_TOOL : (encoder app) add parsing parameters here
@@ -1968,6 +1971,9 @@ bool EncAppCfg::xCheckParameter()
#if JVET_L0646_GBI
xConfirmPara( m_GBi, "GBi is only allowed with NEXT profile" );
xConfirmPara( m_GBiFast, "GBiFast is only allowed with NEXT profile" );
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ xConfirmPara( m_Triangle, "Triangle is only allowed with NEXT profile" );
#endif
// ADD_NEW_TOOL : (parameter check) add a check for next tools here
}
@@ -3197,6 +3203,9 @@ void EncAppCfg::xPrintParameter()
#endif
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
msg(VERBOSE, "MHIntra:%d ", m_MHIntra);
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ msg( VERBOSE, "Triangle:%d ", m_Triangle );
#endif
}
// ADD_NEW_TOOL (add some output indicating the usage of tools)
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index f71a85b0aacc33f679224e4fef13c831a17c4a59..2ef4e2e32a18aa9a58de8b2e8ca579c47ecb6423 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -242,6 +242,9 @@ protected:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
bool m_MHIntra;
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ bool m_Triangle;
#endif
// ADD_NEW_TOOL : (encoder app) add tool enabling flags and associated parameters here
diff --git a/source/Lib/CommonLib/CodingStatistics.h b/source/Lib/CommonLib/CodingStatistics.h
index 3c82f4abe427a601accff05b0727b5253c64edec..a00a49b10802ccd7c733f7be961b5aef31f84d95 100644
--- a/source/Lib/CommonLib/CodingStatistics.h
+++ b/source/Lib/CommonLib/CodingStatistics.h
@@ -108,6 +108,10 @@ enum CodingStatisticsType
STATS__TOOL_EMT,
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
STATS__CABAC_BITS__MH_INTRA_FLAG,
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ STATS__CABAC_BITS__TRIANGLE_FLAG,
+ STATS__CABAC_BITS__TRIANGLE_INDEX,
#endif
STATS__TOOL_TOTAL,
STATS__NUM_STATS
@@ -183,6 +187,10 @@ static inline const char* getName(CodingStatisticsType name)
"CABAC_BITS__EMT_TU_INDX",
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
"CABAC_BITS__MH_INTRA_FLAG",
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ "CABAC_BITS__TRIANGLE_FLAG",
+ "CABAC_BITS__TRIANGLE_INDEX",
#endif
"CABAC_BITS__OTHER",
"CABAC_BITS__INVALID",
diff --git a/source/Lib/CommonLib/CommonDef.h b/source/Lib/CommonLib/CommonDef.h
index a75d7eb89385e4b98595249c57766ddfb3d74245..7e979bfa9d3f6291760e964bff6e4334285d968f 100644
--- a/source/Lib/CommonLib/CommonDef.h
+++ b/source/Lib/CommonLib/CommonDef.h
@@ -421,6 +421,14 @@ static const int NTAPS_BILINEAR = 2; ///< Numb
#if JVET_L0198_L0468_L0104_ATMVP_8x8SUB_BLOCK
static const int ATMVP_SUB_BLOCK_SIZE = 3; ///< sub-block size for ATMVP
#endif
+#if JVET_L0124_L0208_TRIANGLE
+static const int TRIANGLE_MAX_NUM_UNI_CANDS = 5;
+static const int TRIANGLE_MAX_NUM_CANDS_MEM = 7;
+static const int TRIANGLE_MAX_NUM_CANDS = 40;
+static const int TRIANGLE_MAX_NUM_SATD_CANDS = 3;
+static const int TRIANGLE_MIN_SIZE = 8 * 8;
+#endif
+
// ====================================================================================================================
// Macro functions
// ====================================================================================================================
diff --git a/source/Lib/CommonLib/ContextModelling.cpp b/source/Lib/CommonLib/ContextModelling.cpp
index 300e861c353bcc1df0c66440dbf597703be6218d..f2787ae42e8e46772458ec93d9761e096f0212f2 100644
--- a/source/Lib/CommonLib/ContextModelling.cpp
+++ b/source/Lib/CommonLib/ContextModelling.cpp
@@ -359,6 +359,22 @@ unsigned DeriveCtx::CtxBTsplit(const CodingStructure& cs, Partitioner& partition
return ctx;
}
+#if JVET_L0124_L0208_TRIANGLE
+unsigned DeriveCtx::CtxTriangleFlag( const CodingUnit& cu )
+{
+ const CodingStructure *cs = cu.cs;
+ unsigned ctxId = 0;
+
+ const CodingUnit *cuLeft = cs->getCURestricted( cu.lumaPos().offset( -1, 0 ), cu, CH_L );
+ ctxId = ( cuLeft && cuLeft->triangle ) ? 1 : 0;
+
+ const CodingUnit *cuAbove = cs->getCURestricted( cu.lumaPos().offset( 0, -1 ), cu, CH_L );
+ ctxId += ( cuAbove && cuAbove->triangle ) ? 1 : 0;
+
+ return ctxId;
+}
+#endif
+
void MergeCtx::setMergeInfo( PredictionUnit& pu, int candIdx )
{
diff --git a/source/Lib/CommonLib/ContextModelling.h b/source/Lib/CommonLib/ContextModelling.h
index 2e03bc1b47438c1a70d8f388a8d7c2e89d624ea8..806b6cc577d9747f07f4d6b07e8cad960ee6420d 100644
--- a/source/Lib/CommonLib/ContextModelling.h
+++ b/source/Lib/CommonLib/ContextModelling.h
@@ -353,6 +353,9 @@ unsigned CtxInterDir ( const PredictionUnit& pu );
unsigned CtxSkipFlag ( const CodingUnit& cu );
unsigned CtxIMVFlag ( const CodingUnit& cu );
unsigned CtxAffineFlag( const CodingUnit& cu );
+#if JVET_L0124_L0208_TRIANGLE
+unsigned CtxTriangleFlag( const CodingUnit& cu );
+#endif
}
#endif // __CONTEXTMODELLING__
diff --git a/source/Lib/CommonLib/Contexts.cpp b/source/Lib/CommonLib/Contexts.cpp
index 7fd0d1de7e2fa8afcfe2ed1927042b49666cdd88..4130a64624c5ce1c4569267d6aebd5cf197a2358 100644
--- a/source/Lib/CommonLib/Contexts.cpp
+++ b/source/Lib/CommonLib/Contexts.cpp
@@ -823,6 +823,22 @@ const CtxSet ContextSetCfg::MHIntraPredMode = ContextSetCfg::addCtxSet
});
#endif
+#if JVET_L0124_L0208_TRIANGLE
+const CtxSet ContextSetCfg::TriangleFlag = ContextSetCfg::addCtxSet
+({
+ { 151, 137, 154, },
+ { 151, 137, 154, },
+ { CNU, CNU, CNU, },
+});
+
+const CtxSet ContextSetCfg::TriangleIdx = ContextSetCfg::addCtxSet
+({
+ { 140, },
+ { 140, },
+ { CNU, },
+});
+#endif
+
const unsigned ContextSetCfg::NumberOfContexts = (unsigned)ContextSetCfg::sm_InitTables[0].size();
diff --git a/source/Lib/CommonLib/Contexts.h b/source/Lib/CommonLib/Contexts.h
index 31b4bafe13982f50e6aa9f528b0ad637b5486737..718a8b2341f47cffe95ab659dc08f0122cfa964e 100644
--- a/source/Lib/CommonLib/Contexts.h
+++ b/source/Lib/CommonLib/Contexts.h
@@ -206,6 +206,10 @@ public:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
static const CtxSet MHIntraFlag;
static const CtxSet MHIntraPredMode;
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ static const CtxSet TriangleFlag;
+ static const CtxSet TriangleIdx;
#endif
static const unsigned NumberOfContexts;
diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index 52eb710aa8a30bf8df8e98cf73da557540c0c9e0..bfc4b47599020c6ea68b829935566cd0c6c56758 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -120,6 +120,10 @@ void InterPrediction::destroy()
}
}
+#if JVET_L0124_L0208_TRIANGLE
+ m_triangleBuf.destroy();
+#endif
+
#if JVET_L0265_AFF_MINIMUM4X4
if (m_storedMv != nullptr)
{
@@ -175,6 +179,9 @@ void InterPrediction::init( RdCost* pcRdCost, ChromaFormat chromaFormatIDC )
}
}
+#if JVET_L0124_L0208_TRIANGLE
+ m_triangleBuf.create(UnitArea(chromaFormatIDC, Area(0, 0, MAX_CU_SIZE, MAX_CU_SIZE)));
+#endif
m_iRefListIdx = -1;
@@ -488,7 +495,11 @@ void InterPrediction::xPredInterBi(PredictionUnit& pu, PelUnitBuf &pcYuvPred)
}
else
{
+#if JVET_L0124_L0208_TRIANGLE
+ xPredInterUni ( pu, eRefPicList, pcMbBuf, pu.cu->triangle, false );
+#else
xPredInterUni ( pu, eRefPicList, pcMbBuf, false );
+#endif
}
}
}
@@ -1076,10 +1087,24 @@ void InterPrediction::xWeightedAverage( const PredictionUnit& pu, const CPelUnit
}
else if( iRefIdx0 >= 0 && iRefIdx1 < 0 )
{
+#if JVET_L0124_L0208_TRIANGLE
+ if( pu.cu->triangle )
+ {
+ pcYuvDst.copyFrom( pcYuvSrc0 );
+ }
+ else
+#endif
pcYuvDst.copyClip( pcYuvSrc0, clpRngs );
}
else if( iRefIdx0 < 0 && iRefIdx1 >= 0 )
{
+#if JVET_L0124_L0208_TRIANGLE
+ if( pu.cu->triangle )
+ {
+ pcYuvDst.copyFrom( pcYuvSrc1 );
+ }
+ else
+#endif
pcYuvDst.copyClip( pcYuvSrc1, clpRngs );
}
}
@@ -1159,6 +1184,118 @@ int InterPrediction::rightShiftMSB(int numer, int denom)
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+void InterPrediction::motionCompensation4Triangle( CodingUnit &cu, MergeCtx &triangleMrgCtx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1 )
+{
+ for( auto &pu : CU::traversePUs( cu ) )
+ {
+ const UnitArea localUnitArea( cu.cs->area.chromaFormat, Area( 0, 0, pu.lwidth(), pu.lheight() ) );
+ PelUnitBuf tmpTriangleBuf = m_triangleBuf.getBuf( localUnitArea );
+ PelUnitBuf predBuf = cu.cs->getPredBuf( pu );
+
+ triangleMrgCtx.setMergeInfo( pu, candIdx0 );
+ PU::spanMotionInfo( pu );
+ motionCompensation( pu, tmpTriangleBuf );
+
+ triangleMrgCtx.setMergeInfo( pu, candIdx1 );
+ PU::spanMotionInfo( pu );
+ motionCompensation( pu, predBuf );
+
+ weightedTriangleBlk( pu, PU::getTriangleWeights(pu, triangleMrgCtx, candIdx0, candIdx1), splitDir, MAX_NUM_CHANNEL_TYPE, predBuf, tmpTriangleBuf, predBuf );
+ }
+}
+
+void InterPrediction::weightedTriangleBlk( PredictionUnit &pu, bool weights, const bool splitDir, int32_t channel, PelUnitBuf& predDst, PelUnitBuf& predSrc0, PelUnitBuf& predSrc1 )
+{
+ if( channel == CHANNEL_TYPE_LUMA )
+ {
+ xWeightedTriangleBlk( pu, pu.lumaSize().width, pu.lumaSize().height, COMPONENT_Y, splitDir, weights, predDst, predSrc0, predSrc1 );
+ }
+ else if( channel == CHANNEL_TYPE_CHROMA )
+ {
+ xWeightedTriangleBlk( pu, pu.chromaSize().width, pu.chromaSize().height, COMPONENT_Cb, splitDir, weights, predDst, predSrc0, predSrc1 );
+ xWeightedTriangleBlk( pu, pu.chromaSize().width, pu.chromaSize().height, COMPONENT_Cr, splitDir, weights, predDst, predSrc0, predSrc1 );
+ }
+ else
+ {
+ xWeightedTriangleBlk( pu, pu.lumaSize().width, pu.lumaSize().height, COMPONENT_Y, splitDir, weights, predDst, predSrc0, predSrc1 );
+ xWeightedTriangleBlk( pu, pu.chromaSize().width, pu.chromaSize().height, COMPONENT_Cb, splitDir, weights, predDst, predSrc0, predSrc1 );
+ xWeightedTriangleBlk( pu, pu.chromaSize().width, pu.chromaSize().height, COMPONENT_Cr, splitDir, weights, predDst, predSrc0, predSrc1 );
+ }
+}
+
+void InterPrediction::xWeightedTriangleBlk( const PredictionUnit &pu, const uint32_t width, const uint32_t height, const ComponentID compIdx, const bool splitDir, const bool weights, PelUnitBuf& predDst, PelUnitBuf& predSrc0, PelUnitBuf& predSrc1 )
+{
+ Pel* dst = predDst .get(compIdx).buf;
+ Pel* src0 = predSrc0.get(compIdx).buf;
+ Pel* src1 = predSrc1.get(compIdx).buf;
+ int32_t strideDst = predDst .get(compIdx).stride - width;
+ int32_t strideSrc0 = predSrc0.get(compIdx).stride - width;
+ int32_t strideSrc1 = predSrc1.get(compIdx).stride - width;
+
+ const char log2WeightBase = 3;
+ const ClpRng clipRng = pu.cu->slice->clpRngs().comp[compIdx];
+ const int32_t clipbd = clipRng.bd;
+ const int32_t shiftDefault = std::max<int>(2, (IF_INTERNAL_PREC - clipbd));
+ const int32_t offsetDefault = (1<<(shiftDefault-1)) + IF_INTERNAL_OFFS;
+ const int32_t shiftWeighted = std::max<int>(2, (IF_INTERNAL_PREC - clipbd)) + log2WeightBase;
+ const int32_t offsetWeighted = (1 << (shiftWeighted - 1)) + (IF_INTERNAL_OFFS << log2WeightBase);
+
+ const int32_t ratioWH = (width > height) ? (width / height) : 1;
+ const int32_t ratioHW = (width > height) ? 1 : (height / width);
+ const Pel* pelWeighted = (compIdx == COMPONENT_Y) ? g_trianglePelWeightedLuma[splitDir][weights] : g_trianglePelWeightedChroma[predDst.chromaFormat == CHROMA_444 ? 0 : 1][splitDir][weights];
+ const int32_t weightedLength = (compIdx == COMPONENT_Y) ? g_triangleWeightLengthLuma[weights] : g_triangleWeightLengthChroma[predDst.chromaFormat == CHROMA_444 ? 0 : 1][weights];
+ int32_t weightedStartPos = ( splitDir == 0 ) ? ( 0 - (weightedLength >> 1) * ratioWH ) : ( width - ((weightedLength + 1) >> 1) * ratioWH );
+ int32_t weightedEndPos = weightedStartPos + weightedLength * ratioWH - 1;
+ int32_t weightedPosoffset =( splitDir == 0 ) ? ratioWH : -ratioWH;
+
+ const Pel* tmpPelWeighted;
+ int32_t x, y, tmpX, tmpY, tmpWeightedStart, tmpWeightedEnd;
+
+ for( y = 0; y < height; y+= ratioHW )
+ {
+ for( tmpY = ratioHW; tmpY > 0; tmpY-- )
+ {
+ for( x = 0; x < weightedStartPos; x++ )
+ {
+ *dst++ = ClipPel( rightShift( (splitDir == 0 ? *src1 : *src0) + offsetDefault, shiftDefault), clipRng );
+ src0++;
+ src1++;
+ }
+
+ tmpWeightedStart = std::max((int32_t)0, weightedStartPos);
+ tmpWeightedEnd = std::min(weightedEndPos, (int32_t)(width - 1));
+ tmpPelWeighted = pelWeighted;
+ if( weightedStartPos < 0 )
+ {
+ tmpPelWeighted += abs(weightedStartPos) / ratioWH;
+ }
+ for( x = tmpWeightedStart; x <= tmpWeightedEnd; x+= ratioWH )
+ {
+ for( tmpX = ratioWH; tmpX > 0; tmpX-- )
+ {
+ *dst++ = ClipPel( rightShift( ((*tmpPelWeighted)*(*src0++) + ((8 - (*tmpPelWeighted)) * (*src1++)) + offsetWeighted), shiftWeighted ), clipRng );
+ }
+ tmpPelWeighted++;
+ }
+
+ for( x = weightedEndPos + 1; x < width; x++ )
+ {
+ *dst++ = ClipPel( rightShift( (splitDir == 0 ? *src0 : *src1) + offsetDefault, shiftDefault ), clipRng );
+ src0++;
+ src1++;
+ }
+
+ dst += strideDst;
+ src0 += strideSrc0;
+ src1 += strideSrc1;
+ }
+ weightedStartPos += weightedPosoffset;
+ weightedEndPos += weightedPosoffset;
+ }
+}
+#endif
+
#if JVET_J0090_MEMORY_BANDWITH_MEASURE
void InterPrediction::cacheAssign( CacheModel *cache )
{
diff --git a/source/Lib/CommonLib/InterPrediction.h b/source/Lib/CommonLib/InterPrediction.h
index eb7cf48ddb00103e77765fe5bdb7aab4d35ef198..0f61defe0ddfcb662aac1e3924354d91f11b7936 100644
--- a/source/Lib/CommonLib/InterPrediction.h
+++ b/source/Lib/CommonLib/InterPrediction.h
@@ -91,6 +91,9 @@ protected:
RdCost* m_pcRdCost;
int m_iRefListIdx;
+#if JVET_L0124_L0208_TRIANGLE
+ PelStorage m_triangleBuf;
+#endif
#if JVET_L0265_AFF_MINIMUM4X4
Mv* m_storedMv;
#endif
@@ -127,6 +130,10 @@ protected:
#endif
void xPredAffineBlk( const ComponentID& compID, const PredictionUnit& pu, const Picture* refPic, const Mv* _mv, PelUnitBuf& dstPic, const bool& bi, const ClpRng& clpRng );
+#if JVET_L0124_L0208_TRIANGLE
+ void xWeightedTriangleBlk ( const PredictionUnit &pu, const uint32_t width, const uint32_t height, const ComponentID compIdx, const bool splitDir, const bool weights, PelUnitBuf& predDst, PelUnitBuf& predSrc0, PelUnitBuf& predSrc1 );
+#endif
+
static bool xCheckIdenticalMotion( const PredictionUnit& pu );
void xSubPuMC(PredictionUnit& pu, PelUnitBuf& predBuf, const RefPicList &eRefPicList = REF_PIC_LIST_X);
@@ -149,6 +156,11 @@ public:
void motionCompensation (CodingUnit &cu, const RefPicList &eRefPicList = REF_PIC_LIST_X
);
+#if JVET_L0124_L0208_TRIANGLE
+ void motionCompensation4Triangle( CodingUnit &cu, MergeCtx &triangleMrgCtx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1 );
+ void weightedTriangleBlk ( PredictionUnit &pu, bool weights, const bool splitDir, int32_t channel, PelUnitBuf& predDst, PelUnitBuf& predSrc0, PelUnitBuf& predSrc1 );
+#endif
+
#if JVET_J0090_MEMORY_BANDWITH_MEASURE
void cacheAssign( CacheModel *cache );
#endif
diff --git a/source/Lib/CommonLib/Rom.cpp b/source/Lib/CommonLib/Rom.cpp
index e9972bf93357d10e5c46ee4c78d857561c3b3a3b..2c25d72c14c8d4d72970135808ab4f3d6272862e 100644
--- a/source/Lib/CommonLib/Rom.cpp
+++ b/source/Lib/CommonLib/Rom.cpp
@@ -528,6 +528,30 @@ void initROM()
//--------------------------------------------------------------------------------------------------
}
}
+
+#if JVET_L0124_L0208_TRIANGLE
+ for( int idxH = MAX_CU_DEPTH - MIN_CU_LOG2; idxH >= 0; --idxH )
+ {
+ for( int idxW = MAX_CU_DEPTH - MIN_CU_LOG2; idxW >= 0; --idxW )
+ {
+ int numW = 1 << idxW;
+ int numH = 1 << idxH;
+ int ratioW = std::max( 0, idxW - idxH );
+ int ratioH = std::max( 0, idxH - idxW );
+ int sum = std::max( (numW >> ratioW), (numH >> ratioH) ) - 1;
+ for( int y = 0; y < numH; y++ )
+ {
+ int idxY = y >> ratioH;
+ for( int x = 0; x < numW; x++ )
+ {
+ int idxX = x >> ratioW;
+ g_triangleMvStorage[TRIANGLE_DIR_135][idxH][idxW][y][x] = (idxX == idxY) ? 2 : (idxX > idxY ? 0 : 1);
+ g_triangleMvStorage[TRIANGLE_DIR_45][idxH][idxW][y][x] = (idxX + idxY == sum) ? 2 : (idxX + idxY > sum ? 1 : 0);
+ }
+ }
+ }
+ }
+#endif
}
void destroyROM()
@@ -883,5 +907,65 @@ const uint8_t g_NonMPM[257] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8 };
+#if JVET_L0124_L0208_TRIANGLE
+const Pel g_trianglePelWeightedLuma[TRIANGLE_DIR_NUM][2][7] =
+{
+ { // TRIANGLE_DIR_135
+ { 1, 2, 4, 6, 7, 0, 0 },
+ { 1, 2, 3, 4, 5, 6, 7 }
+ },
+ { // TRIANGLE_DIR_45
+ { 7, 6, 4, 2, 1, 0, 0 },
+ { 7, 6, 5, 4, 3, 2, 1 }
+ }
+};
+const Pel g_trianglePelWeightedChroma[2][TRIANGLE_DIR_NUM][2][7] =
+{
+ { // 444 format
+ { // TRIANGLE_DIR_135
+ { 1, 2, 4, 6, 7, 0, 0 },
+ { 1, 2, 3, 4, 5, 6, 7 }
+ },
+ { // TRIANGLE_DIR_45
+ { 7, 6, 4, 2, 1, 0, 0 },
+ { 7, 6, 5, 4, 3, 2, 1 }
+ }
+ },
+ { // 420 format
+ { // TRIANGLE_DIR_135
+ { 1, 4, 7, 0, 0, 0, 0 },
+ { 2, 4, 6, 0, 0, 0, 0 }
+ },
+ { // TRIANGLE_DIR_45
+ { 7, 4, 1, 0, 0, 0, 0 },
+ { 6, 4, 2, 0, 0, 0, 0 }
+ }
+ }
+};
+
+const uint8_t g_triangleWeightLengthLuma[2] = { 5, 7 };
+const uint8_t g_triangleWeightLengthChroma[2][2] = { { 5, 7 }, { 3, 3 } };
+
+ uint8_t g_triangleMvStorage[TRIANGLE_DIR_NUM][MAX_CU_DEPTH - MIN_CU_LOG2 + 1][MAX_CU_DEPTH - MIN_CU_LOG2 + 1][MAX_CU_SIZE >> MIN_CU_LOG2][MAX_CU_SIZE >> MIN_CU_LOG2];
+const uint8_t g_triangleCombination[TRIANGLE_MAX_NUM_CANDS][3] =
+{
+ { 0, 1, 0 }, { 1, 0, 1 }, { 1, 0, 2 }, { 0, 0, 1 }, { 0, 2, 0 },
+ { 1, 0, 3 }, { 1, 0, 4 }, { 1, 1, 0 }, { 0, 3, 0 }, { 0, 4, 0 },
+ { 0, 0, 2 }, { 0, 1, 2 }, { 1, 1, 2 }, { 0, 0, 4 }, { 0, 0, 3 },
+ { 0, 1, 3 }, { 0, 1, 4 }, { 1, 1, 4 }, { 1, 1, 3 }, { 1, 2, 1 },
+ { 1, 2, 0 }, { 0, 2, 1 }, { 0, 4, 3 }, { 1, 3, 0 }, { 1, 3, 2 },
+ { 1, 3, 4 }, { 1, 4, 0 }, { 1, 3, 1 }, { 1, 2, 3 }, { 1, 4, 1 },
+ { 0, 4, 1 }, { 0, 2, 3 }, { 1, 4, 2 }, { 0, 3, 2 }, { 1, 4, 3 },
+ { 0, 3, 1 }, { 0, 2, 4 }, { 1, 2, 4 }, { 0, 4, 2 }, { 0, 3, 4 },
+};
+
+const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS] =
+{
+ 2, 2, 4, 4, 4, 4, 6, 6, 6, 6,
+ 6, 6, 6, 6, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10
+};
+#endif
//! \}
diff --git a/source/Lib/CommonLib/Rom.h b/source/Lib/CommonLib/Rom.h
index ba99b1608285405bd837b834e17481f9adc61fc5..825126095943bbfaba9379e3424549c7224873ea 100644
--- a/source/Lib/CommonLib/Rom.h
+++ b/source/Lib/CommonLib/Rom.h
@@ -270,5 +270,15 @@ constexpr uint8_t g_tbMax[257] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
//! \}
+#if JVET_L0124_L0208_TRIANGLE
+extern const Pel g_trianglePelWeightedLuma[TRIANGLE_DIR_NUM][2][7];
+extern const Pel g_trianglePelWeightedChroma[2][TRIANGLE_DIR_NUM][2][7];
+extern const uint8_t g_triangleWeightLengthLuma[2];
+extern const uint8_t g_triangleWeightLengthChroma[2][2];
+extern uint8_t g_triangleMvStorage[TRIANGLE_DIR_NUM][MAX_CU_DEPTH - MIN_CU_LOG2 + 1][MAX_CU_DEPTH - MIN_CU_LOG2 + 1][MAX_CU_SIZE >> MIN_CU_LOG2][MAX_CU_SIZE >> MIN_CU_LOG2];
+extern const uint8_t g_triangleCombination[TRIANGLE_MAX_NUM_CANDS][3];
+extern const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS];
+#endif
+
#endif //__TCOMROM__
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index d0010f49a2ea6a7d3e264304b413459a5d4a89a2..9b0b776ba301d23b102322761c404bc9578f8789 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -1657,6 +1657,9 @@ void Slice::updateMotionLUTs(LutMotionCand* lutMC, CodingUnit & cu)
{
PredictionUnit *selectedPU = cu.firstPU;
if (cu.affine) { return; }
+#if JVET_L0124_L0208_TRIANGLE
+ if (cu.triangle) { return; }
+#endif
MotionInfo newMi = selectedPU->getMotionInfo();
addMotionInfoToLUTs(lutMC, newMi);
@@ -1763,6 +1766,9 @@ SPSNext::SPSNext( SPS& sps )
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
, m_MHIntra ( false )
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ , m_Triangle ( false )
+#endif
#if ENABLE_WPP_PARALLELISM
, m_NextDQP ( false )
#endif
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index c0dc3d739b36c354cfdcd6e35823643fb2085ce0..5bda75a751cf51c8b5a54d96c930f658a18a5471 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -823,6 +823,9 @@ private:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
bool m_MHIntra;
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ bool m_Triangle;
+#endif
#if ENABLE_WPP_PARALLELISM
bool m_NextDQP;
#endif
@@ -976,6 +979,10 @@ public:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
void setUseMHIntra ( bool b ) { m_MHIntra = b; }
bool getUseMHIntra () const { return m_MHIntra; }
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ void setUseTriangle ( bool b ) { m_Triangle = b; }
+ bool getUseTriangle () const { return m_Triangle; }
#endif
// ADD_NEW_TOOL : (sps extension) add access functions for tool enabling flags and associated parameters here
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 3e1ab50bfc0cd9f50e07ed17b0a458aa5b2c4fb8..e6e7ff8eb8f2eedc447bd8bcd469d196a64489d8 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -53,6 +53,7 @@
#define JVET_L0410_TC_TAB 1 // Change TC table for QP 51-63
#define JVET_L0136_L0085_LM_RESTRICTED_LINEBUFFER 1 // line buffer restriction in LM prediction
+#define JVET_L0124_L0208_TRIANGLE 1 // triangular shape prediction unit
#define JVET_L0059_MTS_SIMP 1 // Simpification on MTS signaling
#define JVET_L0100_MULTI_HYPOTHESIS_INTRA 1 // Combine intra mode with an extra merge indexed prediction
@@ -950,6 +951,14 @@ enum MergeType
NUM_MRG_TYPE // 5
};
+#if JVET_L0124_L0208_TRIANGLE
+enum TriangleSplit
+{
+ TRIANGLE_DIR_135 = 0,
+ TRIANGLE_DIR_45,
+ TRIANGLE_DIR_NUM
+};
+#endif
//////////////////////////////////////////////////////////////////////////
// Encoder modes to try out
diff --git a/source/Lib/CommonLib/Unit.cpp b/source/Lib/CommonLib/Unit.cpp
index 710868551a3ff96a04b571618ed7848f20bb0760..098732295cef633a568eb54b362b13bc77f64139 100644
--- a/source/Lib/CommonLib/Unit.cpp
+++ b/source/Lib/CommonLib/Unit.cpp
@@ -258,6 +258,9 @@ CodingUnit& CodingUnit::operator=( const CodingUnit& other )
#endif
affine = other.affine;
affineType = other.affineType;
+#if JVET_L0124_L0208_TRIANGLE
+ triangle = other.triangle;
+#endif
transQuantBypass = other.transQuantBypass;
ipcm = other.ipcm;
qp = other.qp;
@@ -292,6 +295,9 @@ void CodingUnit::initData()
#endif
affine = false;
affineType = 0;
+#if JVET_L0124_L0208_TRIANGLE
+ triangle = false;
+#endif
transQuantBypass = false;
ipcm = false;
qp = 0;
diff --git a/source/Lib/CommonLib/Unit.h b/source/Lib/CommonLib/Unit.h
index 48496a8e620479ec8ae890433148b4a1d52044e3..976dfdf1f9620351bfc109b7717aa33c7e3c499c 100644
--- a/source/Lib/CommonLib/Unit.h
+++ b/source/Lib/CommonLib/Unit.h
@@ -300,6 +300,9 @@ struct CodingUnit : public UnitArea
#endif
bool affine;
int affineType;
+#if JVET_L0124_L0208_TRIANGLE
+ bool triangle;
+#endif
bool transQuantBypass;
bool ipcm;
uint8_t imv;
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index fec4d894ded4b6edbd08623701c9266fc03d8775..509d3e7971aed4f02a573e1a61a27f4ac2419397 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -4073,6 +4073,495 @@ void PU::restrictBiPredMergeCands( const PredictionUnit &pu, MergeCtx& mergeCtx
}
}
+#if JVET_L0124_L0208_TRIANGLE
+void PU::getTriangleMergeCandidates( const PredictionUnit &pu, MergeCtx& triangleMrgCtx )
+{
+ const CodingStructure &cs = *pu.cs;
+ const Slice &slice = *pu.cs->slice;
+ const int32_t maxNumMergeCand = TRIANGLE_MAX_NUM_UNI_CANDS;
+ triangleMrgCtx.numValidMergeCand = 0;
+
+ for( int32_t i = 0; i < maxNumMergeCand; i++ )
+ {
+ triangleMrgCtx.interDirNeighbours[i] = 0;
+ triangleMrgCtx.mrgTypeNeighbours [i] = MRG_TYPE_DEFAULT_N;
+ triangleMrgCtx.mvFieldNeighbours[(i << 1) ].refIdx = NOT_VALID;
+ triangleMrgCtx.mvFieldNeighbours[(i << 1) + 1].refIdx = NOT_VALID;
+ triangleMrgCtx.mvFieldNeighbours[(i << 1) ].mv = Mv();
+ triangleMrgCtx.mvFieldNeighbours[(i << 1) + 1].mv = Mv();
+ }
+
+ MotionInfo candidate[TRIANGLE_MAX_NUM_CANDS_MEM];
+ int32_t candCount = 0;
+
+ const Position posLT = pu.Y().topLeft();
+ const Position posRT = pu.Y().topRight();
+ const Position posLB = pu.Y().bottomLeft();
+
+ MotionInfo miAbove, miLeft, miAboveLeft, miAboveRight, miBelowLeft;
+
+ //left
+ const PredictionUnit* puLeft = cs.getPURestricted( posLB.offset( -1, 0 ), pu, pu.chType );
+ const bool isAvailableA1 = puLeft && isDiffMER( pu, *puLeft ) && pu.cu != puLeft->cu && CU::isInter( *puLeft->cu );
+ if( isAvailableA1 )
+ {
+ miLeft = puLeft->getMotionInfo( posLB.offset(-1, 0) );
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = miLeft.interDir;
+ candidate[candCount].mv[0] = miLeft.mv[0];
+ candidate[candCount].mv[1] = miLeft.mv[1];
+ candidate[candCount].refIdx[0] = miLeft.refIdx[0];
+ candidate[candCount].refIdx[1] = miLeft.refIdx[1];
+ candCount++;
+ }
+
+ // above
+ const PredictionUnit *puAbove = cs.getPURestricted( posRT.offset( 0, -1 ), pu, pu.chType );
+ bool isAvailableB1 = puAbove && isDiffMER( pu, *puAbove ) && pu.cu != puAbove->cu && CU::isInter( *puAbove->cu );
+ if( isAvailableB1 )
+ {
+ miAbove = puAbove->getMotionInfo( posRT.offset( 0, -1 ) );
+
+ if( !isAvailableA1 || ( miAbove != miLeft ) )
+ {
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = miAbove.interDir;
+ candidate[candCount].mv[0] = miAbove.mv[0];
+ candidate[candCount].mv[1] = miAbove.mv[1];
+ candidate[candCount].refIdx[0] = miAbove.refIdx[0];
+ candidate[candCount].refIdx[1] = miAbove.refIdx[1];
+ candCount++;
+ }
+ }
+
+ // above right
+ const PredictionUnit *puAboveRight = cs.getPURestricted( posRT.offset( 1, -1 ), pu, pu.chType );
+ bool isAvailableB0 = puAboveRight && isDiffMER( pu, *puAboveRight ) && CU::isInter( *puAboveRight->cu );
+
+ if( isAvailableB0 )
+ {
+ miAboveRight = puAboveRight->getMotionInfo( posRT.offset( 1, -1 ) );
+
+ if( ( !isAvailableB1 || ( miAbove != miAboveRight ) ) && ( !isAvailableA1 || ( miLeft != miAboveRight ) ) )
+ {
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = miAboveRight.interDir;
+ candidate[candCount].mv[0] = miAboveRight.mv[0];
+ candidate[candCount].mv[1] = miAboveRight.mv[1];
+ candidate[candCount].refIdx[0] = miAboveRight.refIdx[0];
+ candidate[candCount].refIdx[1] = miAboveRight.refIdx[1];
+ candCount++;
+ }
+ }
+
+ //left bottom
+ const PredictionUnit *puLeftBottom = cs.getPURestricted( posLB.offset( -1, 1 ), pu, pu.chType );
+ bool isAvailableA0 = puLeftBottom && isDiffMER( pu, *puLeftBottom ) && CU::isInter( *puLeftBottom->cu );
+ if( isAvailableA0 )
+ {
+ miBelowLeft = puLeftBottom->getMotionInfo( posLB.offset( -1, 1 ) );
+
+ if( ( !isAvailableA1 || ( miBelowLeft != miLeft ) ) && ( !isAvailableB1 || ( miBelowLeft != miAbove ) ) && ( !isAvailableB0 || ( miBelowLeft != miAboveRight ) ) )
+ {
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = miBelowLeft.interDir;
+ candidate[candCount].mv[0] = miBelowLeft.mv[0];
+ candidate[candCount].mv[1] = miBelowLeft.mv[1];
+ candidate[candCount].refIdx[0] = miBelowLeft.refIdx[0];
+ candidate[candCount].refIdx[1] = miBelowLeft.refIdx[1];
+ candCount++;
+ }
+ }
+
+ // above left
+ const PredictionUnit *puAboveLeft = cs.getPURestricted( posLT.offset( -1, -1 ), pu, pu.chType );
+ bool isAvailableB2 = puAboveLeft && isDiffMER( pu, *puAboveLeft ) && CU::isInter( *puAboveLeft->cu );
+
+ if( isAvailableB2 )
+ {
+ miAboveLeft = puAboveLeft->getMotionInfo( posLT.offset( -1, -1 ) );
+
+ if( ( !isAvailableA1 || ( miLeft != miAboveLeft ) ) && ( !isAvailableB1 || ( miAbove != miAboveLeft ) ) && ( !isAvailableA0 || ( miBelowLeft != miAboveLeft ) ) && ( !isAvailableB0 || ( miAboveRight != miAboveLeft ) ) )
+ {
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = miAboveLeft.interDir;
+ candidate[candCount].mv[0] = miAboveLeft.mv[0];
+ candidate[candCount].mv[1] = miAboveLeft.mv[1];
+ candidate[candCount].refIdx[0] = miAboveLeft.refIdx[0];
+ candidate[candCount].refIdx[1] = miAboveLeft.refIdx[1];
+ candCount++;
+ }
+ }
+
+ if( slice.getEnableTMVPFlag() )
+ {
+ Position posRB = pu.Y().bottomRight().offset(-3, -3);
+
+ const PreCalcValues& pcv = *cs.pcv;
+
+ Position posC0;
+ Position posC1 = pu.Y().center();
+ bool isAvailableC0 = false;
+
+ if (((posRB.x + pcv.minCUWidth) < pcv.lumaWidth) && ((posRB.y + pcv.minCUHeight) < pcv.lumaHeight))
+ {
+ Position posInCtu( posRB.x & pcv.maxCUWidthMask, posRB.y & pcv.maxCUHeightMask );
+
+ if( ( posInCtu.x + 4 < pcv.maxCUWidth ) && // is not at the last column of CTU
+ ( posInCtu.y + 4 < pcv.maxCUHeight ) ) // is not at the last row of CTU
+ {
+ posC0 = posRB.offset( 4, 4 );
+ isAvailableC0 = true;
+ }
+ else if( posInCtu.x + 4 < pcv.maxCUWidth ) // is not at the last column of CTU But is last row of CTU
+ {
+ posC0 = posRB.offset( 4, 4 );
+ // in the reference the CTU address is not set - thus probably resulting in no using this C0 possibility
+ }
+ else if( posInCtu.y + 4 < pcv.maxCUHeight ) // is not at the last row of CTU But is last column of CTU
+ {
+ posC0 = posRB.offset( 4, 4 );
+ isAvailableC0 = true;
+ }
+ else //is the right bottom corner of CTU
+ {
+ posC0 = posRB.offset( 4, 4 );
+ // same as for last column but not last row
+ }
+ }
+
+ // C0
+ Mv cColMv;
+ int32_t refIdx = 0;
+ bool existMV = ( isAvailableC0 && getColocatedMVP( pu, REF_PIC_LIST_0, posC0, cColMv, refIdx ) );
+ MotionInfo temporalMv;
+ temporalMv.interDir = 0;
+ if( existMV )
+ {
+ temporalMv.isInter = true;
+ temporalMv.interDir |= 1;
+ temporalMv.mv[0] = cColMv;
+ temporalMv.refIdx[0] = refIdx;
+ }
+ existMV = ( isAvailableC0 && getColocatedMVP( pu, REF_PIC_LIST_1, posC0, cColMv, refIdx ) );
+ if( existMV )
+ {
+ temporalMv.interDir |= 2;
+ temporalMv.mv[1] = cColMv;
+ temporalMv.refIdx[1] = refIdx;
+ }
+
+ if( temporalMv.interDir != 0 )
+ {
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = temporalMv.interDir;
+ candidate[candCount].mv[0] = temporalMv.mv[0];
+ candidate[candCount].mv[1] = temporalMv.mv[1];
+ candidate[candCount].refIdx[0] = temporalMv.refIdx[0];
+ candidate[candCount].refIdx[1] = temporalMv.refIdx[1];
+ candCount++;
+ }
+
+ // C1
+ temporalMv.interDir = 0;
+ existMV = getColocatedMVP(pu, REF_PIC_LIST_0, posC1, cColMv, refIdx );
+ if( existMV )
+ {
+ temporalMv.isInter = true;
+ temporalMv.interDir |= 1;
+ temporalMv.mv[0] = cColMv;
+ temporalMv.refIdx[0] = refIdx;
+ }
+ existMV = getColocatedMVP(pu, REF_PIC_LIST_1, posC1, cColMv, refIdx );
+ if( existMV )
+ {
+ temporalMv.interDir |= 2;
+ temporalMv.mv[1] = cColMv;
+ temporalMv.refIdx[1] = refIdx;
+ }
+
+ if( temporalMv.interDir != 0 )
+ {
+ candidate[candCount].isInter = true;
+ candidate[candCount].interDir = temporalMv.interDir;
+ candidate[candCount].mv[0] = temporalMv.mv[0];
+ candidate[candCount].mv[1] = temporalMv.mv[1];
+ candidate[candCount].refIdx[0] = temporalMv.refIdx[0];
+ candidate[candCount].refIdx[1] = temporalMv.refIdx[1];
+ candCount++;
+ }
+ }
+
+ // put uni-prediction candidate to the triangle candidate list
+ for( int32_t i = 0; i < candCount; i++ )
+ {
+ if( candidate[i].interDir != 3 )
+ {
+ triangleMrgCtx.interDirNeighbours[triangleMrgCtx.numValidMergeCand] = candidate[i].interDir;
+ triangleMrgCtx.mrgTypeNeighbours [triangleMrgCtx.numValidMergeCand] = MRG_TYPE_DEFAULT_N;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].mv = candidate[i].mv[0];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].mv = candidate[i].mv[1];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].refIdx = candidate[i].refIdx[0];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].refIdx = candidate[i].refIdx[1];
+ triangleMrgCtx.numValidMergeCand += isUniqueTriangleCandidates(pu, triangleMrgCtx);
+ if( triangleMrgCtx.numValidMergeCand == TRIANGLE_MAX_NUM_UNI_CANDS )
+ {
+ return;
+ }
+ }
+ }
+
+ // put L0 mv of bi-prediction candidate to the triangle candidate list
+ for( int32_t i = 0; i < candCount; i++ )
+ {
+ if( candidate[i].interDir == 3 )
+ {
+ triangleMrgCtx.interDirNeighbours[triangleMrgCtx.numValidMergeCand] = 1;
+ triangleMrgCtx.mrgTypeNeighbours [triangleMrgCtx.numValidMergeCand] = MRG_TYPE_DEFAULT_N;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].mv = candidate[i].mv[0];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].mv = Mv(0, 0);
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].refIdx = candidate[i].refIdx[0];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].refIdx = -1;
+ triangleMrgCtx.numValidMergeCand += isUniqueTriangleCandidates(pu, triangleMrgCtx);
+ if( triangleMrgCtx.numValidMergeCand == TRIANGLE_MAX_NUM_UNI_CANDS )
+ {
+ return;
+ }
+ }
+ }
+
+ // put L1 mv of bi-prediction candidate to the triangle candidate list
+ for( int32_t i = 0; i < candCount; i++ )
+ {
+ if( candidate[i].interDir == 3 )
+ {
+ triangleMrgCtx.interDirNeighbours[triangleMrgCtx.numValidMergeCand] = 2;
+ triangleMrgCtx.mrgTypeNeighbours [triangleMrgCtx.numValidMergeCand] = MRG_TYPE_DEFAULT_N;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].mv = Mv(0, 0);
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].mv = candidate[i].mv[1];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].refIdx = -1;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].refIdx = candidate[i].refIdx[1];
+ triangleMrgCtx.numValidMergeCand += isUniqueTriangleCandidates(pu, triangleMrgCtx);
+ if( triangleMrgCtx.numValidMergeCand == TRIANGLE_MAX_NUM_UNI_CANDS )
+ {
+ return;
+ }
+ }
+ }
+
+ // put average of L0 and L1 mvs of bi-prediction candidate to the triangle candidate list
+ for( int32_t i = 0; i < candCount; i++ )
+ {
+ if( candidate[i].interDir == 3 )
+ {
+ int32_t curPicPoc = slice.getPOC();
+ int32_t refPicPocL0 = slice.getRefPOC(REF_PIC_LIST_0, candidate[i].refIdx[0]);
+ int32_t refPicPocL1 = slice.getRefPOC(REF_PIC_LIST_1, candidate[i].refIdx[1]);
+ Mv aveMv = candidate[i].mv[1];
+ aveMv = aveMv.scaleMv( xGetDistScaleFactor( curPicPoc, refPicPocL0, curPicPoc, refPicPocL1 ) ); // scaling to L0
+ aveMv.setHor( ( aveMv.getHor() + candidate[i].mv[0].getHor() + 1 ) >> 1 );
+ aveMv.setVer( ( aveMv.getVer() + candidate[i].mv[0].getVer() + 1 ) >> 1 );
+
+ triangleMrgCtx.interDirNeighbours[triangleMrgCtx.numValidMergeCand] = 1;
+ triangleMrgCtx.mrgTypeNeighbours [triangleMrgCtx.numValidMergeCand] = MRG_TYPE_DEFAULT_N;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].mv = aveMv;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].mv = Mv(0, 0);
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) ].refIdx = candidate[i].refIdx[0];
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1].refIdx = -1;
+ triangleMrgCtx.numValidMergeCand += isUniqueTriangleCandidates(pu, triangleMrgCtx);
+ if( triangleMrgCtx.numValidMergeCand == TRIANGLE_MAX_NUM_UNI_CANDS )
+ {
+ return;
+ }
+ }
+ }
+
+ // fill with Mv(0, 0)
+ int32_t numRefIdx = std::min( slice.getNumRefIdx(REF_PIC_LIST_0), slice.getNumRefIdx(REF_PIC_LIST_1) );
+ int32_t cnt = 0;
+ while( triangleMrgCtx.numValidMergeCand < TRIANGLE_MAX_NUM_UNI_CANDS )
+ {
+ if( cnt < numRefIdx )
+ {
+ triangleMrgCtx.interDirNeighbours[triangleMrgCtx.numValidMergeCand] = 1;
+ triangleMrgCtx.mvFieldNeighbours[triangleMrgCtx.numValidMergeCand << 1].setMvField(Mv(0, 0), cnt);
+ triangleMrgCtx.numValidMergeCand++;
+
+ if( triangleMrgCtx.numValidMergeCand == TRIANGLE_MAX_NUM_UNI_CANDS )
+ {
+ return;
+ }
+
+ triangleMrgCtx.interDirNeighbours[triangleMrgCtx.numValidMergeCand] = 2;
+ triangleMrgCtx.mvFieldNeighbours [(triangleMrgCtx.numValidMergeCand << 1) + 1 ].setMvField(Mv(0, 0), cnt);
+ triangleMrgCtx.numValidMergeCand++;
+
+ cnt = (cnt + 1) % numRefIdx;
+ }
+ }
+}
+
+bool PU::isUniqueTriangleCandidates( const PredictionUnit &pu, MergeCtx& triangleMrgCtx )
+{
+ int newCand = triangleMrgCtx.numValidMergeCand;
+ for( int32_t i = 0; i < newCand; i++ )
+ {
+ int32_t predFlagCur = triangleMrgCtx.interDirNeighbours[i] == 1 ? 0 : 1;
+ int32_t predFlagNew = triangleMrgCtx.interDirNeighbours[newCand] == 1 ? 0 : 1;
+ int32_t refPicPocCur = pu.cs->slice->getRefPOC( (RefPicList)predFlagCur, triangleMrgCtx.mvFieldNeighbours[(i << 1) + predFlagCur].refIdx );
+ int32_t refPicPocNew = pu.cs->slice->getRefPOC( (RefPicList)predFlagNew, triangleMrgCtx.mvFieldNeighbours[(newCand << 1) + predFlagNew].refIdx);
+ if( refPicPocCur == refPicPocNew && triangleMrgCtx.mvFieldNeighbours[(i << 1) + predFlagCur].mv == triangleMrgCtx.mvFieldNeighbours[(newCand << 1) + predFlagNew].mv )
+ {
+ return false;
+ }
+ }
+ return true;
+}
+
+bool PU::getTriangleWeights( const PredictionUnit& pu, MergeCtx &triangleMrgCtx, const uint8_t candIdx0, const uint8_t candIdx1 )
+{
+ RefPicList refPicListCand0 = triangleMrgCtx.interDirNeighbours[candIdx0] == 1 ? REF_PIC_LIST_0 : REF_PIC_LIST_1;
+ RefPicList refPicListCand1 = triangleMrgCtx.interDirNeighbours[candIdx1] == 1 ? REF_PIC_LIST_0 : REF_PIC_LIST_1;
+ int32_t refPicPoc0 = pu.cs->slice->getRefPOC( refPicListCand0, triangleMrgCtx.mvFieldNeighbours[ (candIdx0 << 1) + refPicListCand0 ].refIdx );
+ int32_t refPicPoc1 = pu.cs->slice->getRefPOC( refPicListCand1, triangleMrgCtx.mvFieldNeighbours[ (candIdx1 << 1) + refPicListCand1 ].refIdx );
+
+ if( refPicPoc0 != refPicPoc1 )
+ {
+ // different reference picture
+ return true;
+ }
+
+ // same reference picture, but mv difference is larger than 16 pel
+ int32_t threshold = 16 << 4;
+ Mv diffMv = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + refPicListCand0].mv - triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + refPicListCand1].mv;
+
+ if( diffMv.getAbsHor() > threshold || diffMv.getAbsVer() > threshold )
+ {
+ return true;
+ }
+
+ return false;
+}
+
+void PU::spanTriangleMotionInfo( PredictionUnit &pu, MergeCtx &triangleMrgCtx, const uint8_t mergeIdx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1 )
+{
+ pu.mergeIdx = mergeIdx;
+ MotionBuf mb = pu.getMotionBuf();
+
+ MotionInfo biMv;
+ biMv.isInter = true;
+
+ if( triangleMrgCtx.interDirNeighbours[candIdx0] == 1 && triangleMrgCtx.interDirNeighbours[candIdx1] == 2 )
+ {
+ biMv.interDir = 3;
+ biMv.mv[0] = triangleMrgCtx.mvFieldNeighbours[ candIdx0 << 1 ].mv;
+ biMv.mv[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].mv;
+ biMv.refIdx[0] = triangleMrgCtx.mvFieldNeighbours[ candIdx0 << 1 ].refIdx;
+ biMv.refIdx[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].refIdx;
+ }
+ else if( triangleMrgCtx.interDirNeighbours[candIdx0] == 2 && triangleMrgCtx.interDirNeighbours[candIdx1] == 1 )
+ {
+ biMv.interDir = 3;
+ biMv.mv[0] = triangleMrgCtx.mvFieldNeighbours[ candIdx1 << 1 ].mv;
+ biMv.mv[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].mv;
+ biMv.refIdx[0] = triangleMrgCtx.mvFieldNeighbours[ candIdx1 << 1 ].refIdx;
+ biMv.refIdx[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].refIdx;
+ }
+ else if( triangleMrgCtx.interDirNeighbours[candIdx0] == 1 && triangleMrgCtx.interDirNeighbours[candIdx1] == 1 )
+ {
+ int32_t refIdx = mappingRefPic( pu, pu.cs->slice->getRefPOC( REF_PIC_LIST_0, triangleMrgCtx.mvFieldNeighbours[candIdx1 << 1].refIdx ), REF_PIC_LIST_1 );
+ if( refIdx != -1 )
+ {
+ biMv.interDir = 3;
+ biMv.mv[0] = triangleMrgCtx.mvFieldNeighbours[candIdx0 << 1].mv;
+ biMv.mv[1] = triangleMrgCtx.mvFieldNeighbours[candIdx1 << 1].mv;
+ biMv.refIdx[0] = triangleMrgCtx.mvFieldNeighbours[candIdx0 << 1].refIdx;
+ biMv.refIdx[1] = refIdx;
+ }
+ else
+ {
+ refIdx = mappingRefPic( pu, pu.cs->slice->getRefPOC( REF_PIC_LIST_0, triangleMrgCtx.mvFieldNeighbours[candIdx0 << 1].refIdx), REF_PIC_LIST_1 );
+ biMv.interDir = ( refIdx != -1 ) ? 3 : 1;
+ biMv.mv[0] = ( refIdx != -1 ) ? triangleMrgCtx.mvFieldNeighbours[candIdx1 << 1].mv : triangleMrgCtx.mvFieldNeighbours[candIdx0 << 1].mv;
+ biMv.mv[1] = ( refIdx != -1 ) ? triangleMrgCtx.mvFieldNeighbours[candIdx0 << 1].mv : Mv(0, 0);
+ biMv.refIdx[0] = ( refIdx != -1 ) ? triangleMrgCtx.mvFieldNeighbours[candIdx1 << 1].refIdx : triangleMrgCtx.mvFieldNeighbours[candIdx0 << 1].refIdx;
+ biMv.refIdx[1] = ( refIdx != -1 ) ? refIdx : -1;
+ }
+ }
+ else if( triangleMrgCtx.interDirNeighbours[candIdx0] == 2 && triangleMrgCtx.interDirNeighbours[candIdx1] == 2 )
+ {
+ int32_t refIdx = mappingRefPic( pu, pu.cs->slice->getRefPOC( REF_PIC_LIST_1, triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].refIdx ), REF_PIC_LIST_0 );
+ if( refIdx != -1 )
+ {
+ biMv.interDir = 3;
+ biMv.mv[0] = triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].mv;
+ biMv.mv[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].mv;
+ biMv.refIdx[0] = refIdx;
+ biMv.refIdx[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].refIdx;
+ }
+ else
+ {
+ refIdx = mappingRefPic( pu, pu.cs->slice->getRefPOC( REF_PIC_LIST_1, triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].refIdx ), REF_PIC_LIST_0 );
+ biMv.interDir = ( refIdx != -1 ) ? 3 : 2;
+ biMv.mv[0] = ( refIdx != -1 ) ? triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].mv : Mv(0, 0);
+ biMv.mv[1] = ( refIdx != -1 ) ? triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].mv : triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].mv;
+ biMv.refIdx[0] = ( refIdx != -1 ) ? refIdx : -1;
+ biMv.refIdx[1] = ( refIdx != -1 ) ? triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].refIdx : triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].refIdx;
+ }
+ }
+
+ int32_t idxW = (int32_t)(g_aucLog2[pu.lwidth() ] - MIN_CU_LOG2);
+ int32_t idxH = (int32_t)(g_aucLog2[pu.lheight()] - MIN_CU_LOG2);
+ for( int32_t y = 0; y < mb.height; y++ )
+ {
+ for( int32_t x = 0; x < mb.width; x++ )
+ {
+ if( g_triangleMvStorage[splitDir][idxH][idxW][y][x] == 2 )
+ {
+ mb.at( x, y ).isInter = true;
+ mb.at( x, y ).interDir = biMv.interDir;
+ mb.at( x, y ).refIdx[0] = biMv.refIdx[0];
+ mb.at( x, y ).refIdx[1] = biMv.refIdx[1];
+ mb.at( x, y ).mv [0] = biMv.mv [0];
+ mb.at( x, y ).mv [1] = biMv.mv [1];
+ }
+ else if( g_triangleMvStorage[splitDir][idxH][idxW][y][x] == 0 )
+ {
+ mb.at( x, y ).isInter = true;
+ mb.at( x, y ).interDir = triangleMrgCtx.interDirNeighbours[candIdx0];
+ mb.at( x, y ).refIdx[0] = triangleMrgCtx.mvFieldNeighbours[ candIdx0 << 1 ].refIdx;
+ mb.at( x, y ).refIdx[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].refIdx;
+ mb.at( x, y ).mv [0] = triangleMrgCtx.mvFieldNeighbours[ candIdx0 << 1 ].mv;
+ mb.at( x, y ).mv [1] = triangleMrgCtx.mvFieldNeighbours[(candIdx0 << 1) + 1].mv;
+ }
+ else
+ {
+ mb.at( x, y ).isInter = true;
+ mb.at( x, y ).interDir = triangleMrgCtx.interDirNeighbours[candIdx1];
+ mb.at( x, y ).refIdx[0] = triangleMrgCtx.mvFieldNeighbours[ candIdx1 << 1 ].refIdx;
+ mb.at( x, y ).refIdx[1] = triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].refIdx;
+ mb.at( x, y ).mv [0] = triangleMrgCtx.mvFieldNeighbours[ candIdx1 << 1 ].mv;
+ mb.at( x, y ).mv [1] = triangleMrgCtx.mvFieldNeighbours[(candIdx1 << 1) + 1].mv;
+ }
+ }
+ }
+}
+
+int32_t PU::mappingRefPic( const PredictionUnit &pu, int32_t refPicPoc, bool targetRefPicList )
+{
+ int32_t numRefIdx = pu.cs->slice->getNumRefIdx( (RefPicList)targetRefPicList );
+
+ for( int32_t i = 0; i < numRefIdx; i++ )
+ {
+ if( pu.cs->slice->getRefPOC( (RefPicList)targetRefPicList, i ) == refPicPoc )
+ {
+ return i;
+ }
+ }
+ return -1;
+}
+#endif
+
void CU::resetMVDandMV2Int( CodingUnit& cu, InterPrediction *interPred )
{
for( auto &pu : CU::traversePUs( cu ) )
diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h
index 9645cd77397d84a13a370566eaf63c325870e918..2b517549724865c6326351b0fc351d64a1876d2b 100644
--- a/source/Lib/CommonLib/UnitTools.h
+++ b/source/Lib/CommonLib/UnitTools.h
@@ -173,6 +173,13 @@ namespace PU
int getMHIntraMPMs (const PredictionUnit &pu, unsigned *mpm, const ChannelType &channelType = CHANNEL_TYPE_LUMA, const bool isChromaMDMS = false, const unsigned startIdx = 0);
int getNarrowShape (const int width, const int height);
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ void getTriangleMergeCandidates (const PredictionUnit &pu, MergeCtx &triangleMrgCtx);
+ bool isUniqueTriangleCandidates (const PredictionUnit &pu, MergeCtx &triangleMrgCtx);
+ bool getTriangleWeights (const PredictionUnit &pu, MergeCtx &triangleMrgCtx, const uint8_t candIdx0, const uint8_t candIdx1);
+ void spanTriangleMotionInfo ( PredictionUnit &pu, MergeCtx &triangleMrgCtx, const uint8_t mergeIdx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1);
+ int32_t mappingRefPic (const PredictionUnit &pu, int32_t refPicPoc, bool targetRefPicList);
+#endif
}
// TU tools
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index 10b6febe124a4a91f4935cc80f1109534bb8d144..a4404254d4dcc5279e51691228bf5b248a260418 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -1217,6 +1217,9 @@ void CABACReader::prediction_unit( PredictionUnit& pu, MergeCtx& mrgCtx )
pu.intraDir[1] = DM_CHROMA_IDX;
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ triangle_mode( *pu.cu );
+#endif
#if JVET_L0054_MMVD
if (pu.mmvdMergeFlag)
{
@@ -1458,6 +1461,25 @@ void CABACReader::merge_idx( PredictionUnit& pu )
#endif
int numCandminus1 = int( pu.cs->slice->getMaxNumMergeCand() ) - 1;
pu.mergeIdx = 0;
+
+#if JVET_L0124_L0208_TRIANGLE
+ if( pu.cu->triangle )
+ {
+ RExt__DECODER_DEBUG_BIT_STATISTICS_CREATE_SET( STATS__CABAC_BITS__TRIANGLE_INDEX );
+ if( m_BinDecoder.decodeBin( Ctx::TriangleIdx() ) == 0 )
+ {
+ pu.mergeIdx += m_BinDecoder.decodeBinEP();
+ }
+ else
+ {
+ pu.mergeIdx += exp_golomb_eqprob( 2 ) + 2;
+ }
+
+ DTRACE( g_trace_ctx, D_SYNTAX, "merge_idx() triangle_idx=%d\n", pu.mergeIdx );
+ return;
+ }
+#endif
+
if( numCandminus1 > 0 )
{
if( m_BinDecoder.decodeBin( Ctx::MergeIdx() ) )
@@ -1778,6 +1800,23 @@ void CABACReader::MHIntra_luma_pred_modes(CodingUnit &cu)
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+void CABACReader::triangle_mode( CodingUnit& cu )
+{
+ RExt__DECODER_DEBUG_BIT_STATISTICS_CREATE_SET( STATS__CABAC_BITS__TRIANGLE_FLAG );
+
+ if( !cu.cs->slice->getSPS()->getSpsNext().getUseTriangle() || !cu.cs->slice->isInterB() || cu.lwidth() * cu.lheight() < TRIANGLE_MIN_SIZE || cu.affine )
+ {
+ return;
+ }
+
+ unsigned flag_idx = DeriveCtx::CtxTriangleFlag( cu );
+ cu.triangle = m_BinDecoder.decodeBin( Ctx::TriangleFlag(flag_idx) );
+
+
+ DTRACE( g_trace_ctx, D_SYNTAX, "triangle_mode() triangle_mode=%d pos=(%d,%d) size: %dx%d\n", cu.triangle, cu.Y().x, cu.Y().y, cu.lumaSize().width, cu.lumaSize().height );
+}
+#endif
//================================================================================
// clause 7.3.8.7
diff --git a/source/Lib/DecoderLib/CABACReader.h b/source/Lib/DecoderLib/CABACReader.h
index 153f356be96d8cb92c5342ee6badeba54c5ddd40..16699dcdf16d6bfa201ac7caebb89e50e8e5264a 100644
--- a/source/Lib/DecoderLib/CABACReader.h
+++ b/source/Lib/DecoderLib/CABACReader.h
@@ -111,6 +111,9 @@ public:
void MHIntra_flag ( PredictionUnit& pu );
void MHIntra_luma_pred_modes ( CodingUnit& cu );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ void triangle_mode ( CodingUnit& cu );
+#endif
// pcm samples (clause 7.3.8.7)
void pcm_samples ( TransformUnit& tu );
diff --git a/source/Lib/DecoderLib/DecCu.cpp b/source/Lib/DecoderLib/DecCu.cpp
index 7cfd907efdd0dfd4754c04aea147d654868cd947..f1ccaae1b0830c3314dd0d66a0d43730d30b586b 100644
--- a/source/Lib/DecoderLib/DecCu.cpp
+++ b/source/Lib/DecoderLib/DecCu.cpp
@@ -314,12 +314,28 @@ void DecCu::xFillPCMBuffer(CodingUnit &cu)
void DecCu::xReconInter(CodingUnit &cu)
{
+#if JVET_L0124_L0208_TRIANGLE
+ if( cu.triangle )
+ {
+ const uint8_t mergeIdx = cu.firstPU->mergeIdx;
+ const bool splitDir = g_triangleCombination[mergeIdx][0];
+ const uint8_t candIdx0 = g_triangleCombination[mergeIdx][1];
+ const uint8_t candIdx1 = g_triangleCombination[mergeIdx][2];
+ m_pcInterPred->motionCompensation4Triangle( cu, m_triangleMrgCtx, splitDir, candIdx0, candIdx1 );
+ PU::spanTriangleMotionInfo( *cu.firstPU, m_triangleMrgCtx, mergeIdx, splitDir, candIdx0, candIdx1 );
+ }
+ else
+ {
+#endif
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
m_pcIntraPred->geneIntrainterPred(cu);
#endif
// inter prediction
m_pcInterPred->motionCompensation( cu );
+#if JVET_L0124_L0208_TRIANGLE
+ }
+#endif
#if JVET_L0266_HMVP
cu.slice->updateMotionLUTs(cu.slice->getMotionLUTs(), cu);
#endif
@@ -486,6 +502,14 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
{
#endif
{
+#if JVET_L0124_L0208_TRIANGLE
+ if( pu.cu->triangle )
+ {
+ PU::getTriangleMergeCandidates( pu, m_triangleMrgCtx );
+ }
+ else
+ {
+#endif
if( pu.cu->affine )
{
#if JVET_L0632_AFFINE_MERGE
@@ -593,6 +617,9 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
PU::spanMotionInfo( pu, mrgCtx );
}
+#if JVET_L0124_L0208_TRIANGLE
+ }
+#endif
}
#if JVET_L0054_MMVD
}
diff --git a/source/Lib/DecoderLib/DecCu.h b/source/Lib/DecoderLib/DecCu.h
index 2a61f26cc368bace2522e105a58fec042edc1c89..3a9f46d909e2ff7c9a1ba27dcecba802977a71f9 100644
--- a/source/Lib/DecoderLib/DecCu.h
+++ b/source/Lib/DecoderLib/DecCu.h
@@ -92,6 +92,10 @@ private:
MotionInfo m_SubPuMiBuf[(MAX_CU_SIZE * MAX_CU_SIZE) >> (MIN_CU_LOG2 << 1)];
+
+#if JVET_L0124_L0208_TRIANGLE
+ MergeCtx m_triangleMrgCtx;
+#endif
};
//! \}
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index aa7b342be6fd1b706fb30a77d078b1a08b606e07..992ae745a17a7ea28f9da241513b6dd0c6095817 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -818,6 +818,9 @@ void HLSyntaxReader::parseSPSNext( SPSNext& spsNext, const bool usePCM )
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
READ_FLAG( symbol, "mhintra_flag" ); spsNext.setUseMHIntra ( symbol != 0 );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ READ_FLAG( symbol, "triangle_flag" ); spsNext.setUseTriangle ( symbol != 0 );
+#endif
#if ENABLE_WPP_PARALLELISM
READ_FLAG( symbol, "next_dqp_enabled_flag" ); spsNext.setUseNextDQP ( symbol != 0 );
#else
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index d7b8ce61ed09b9157887c4754918f32d2bd45655..4f3ec1ddd969d0daa4b297a34b5fb1606eba148b 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -1209,6 +1209,9 @@ void CABACWriter::prediction_unit( const PredictionUnit& pu )
MHIntra_luma_pred_modes( *pu.cu );
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ triangle_mode( *pu.cu );
+#endif
#if JVET_L0054_MMVD
if (pu.mmvdMergeFlag)
{
@@ -1431,6 +1434,24 @@ void CABACWriter::merge_idx( const PredictionUnit& pu )
}
else
{
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ if( pu.cu->triangle )
+ {
+ if( pu.mergeIdx < 2 )
+ {
+ m_BinEncoder.encodeBin( 0, Ctx::TriangleIdx() );
+ m_BinEncoder.encodeBinEP( pu.mergeIdx );
+ }
+ else
+ {
+ m_BinEncoder.encodeBin( 1, Ctx::TriangleIdx() );
+ exp_golomb_eqprob( pu.mergeIdx - 2, 2 );
+ }
+
+ DTRACE( g_trace_ctx, D_SYNTAX, "merge_idx() triangle_idx=%d\n", pu.mergeIdx );
+ return;
+ }
#endif
int numCandminus1 = int( pu.cs->slice->getMaxNumMergeCand() ) - 1;
if( numCandminus1 > 0 )
@@ -1700,6 +1721,22 @@ void CABACWriter::MHIntra_luma_pred_modes(const CodingUnit& cu)
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+void CABACWriter::triangle_mode( const CodingUnit& cu )
+{
+ if( !cu.cs->slice->getSPS()->getSpsNext().getUseTriangle() || !cu.cs->slice->isInterB() || cu.lwidth() * cu.lheight() < TRIANGLE_MIN_SIZE || cu.affine )
+ {
+ return;
+ }
+
+ unsigned flag_idx = DeriveCtx::CtxTriangleFlag( cu );
+
+ m_BinEncoder.encodeBin( cu.triangle, Ctx::TriangleFlag(flag_idx) );
+
+ DTRACE( g_trace_ctx, D_SYNTAX, "triangle_mode() triangle_mode=%d pos=(%d,%d) size: %dx%d\n", cu.triangle, cu.Y().x, cu.Y().y, cu.lumaSize().width, cu.lumaSize().height );
+}
+#endif
+
//================================================================================
// clause 7.3.8.7
//--------------------------------------------------------------------------------
diff --git a/source/Lib/EncoderLib/CABACWriter.h b/source/Lib/EncoderLib/CABACWriter.h
index d01a8d06017066384df72a61fd6581ceef97b0ac..2e25dcac24ec79910d933bb84b769415002a7a14 100644
--- a/source/Lib/EncoderLib/CABACWriter.h
+++ b/source/Lib/EncoderLib/CABACWriter.h
@@ -125,6 +125,9 @@ public:
void MHIntra_flag ( const PredictionUnit& pu );
void MHIntra_luma_pred_modes ( const CodingUnit& cu );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ void triangle_mode ( const CodingUnit& cu );
+#endif
// pcm samples (clause 7.3.8.7)
void pcm_samples ( const TransformUnit& tu );
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index d346ec04c147b9679c350633b2ba812a1b3e9b7a..610e00bb93dca60a3536f7deb5988caae6e82b10 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -225,6 +225,9 @@ protected:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
bool m_MHIntra;
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ bool m_Triangle;
#endif
// ADD_NEW_TOOL : (encoder lib) add tool enabling flags and associated parameters here
@@ -699,6 +702,10 @@ public:
void setUseMHIntra ( bool b ) { m_MHIntra = b; }
bool getUseMHIntra () const { return m_MHIntra; }
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ void setUseTriangle ( bool b ) { m_Triangle = b; }
+ bool getUseTriangle () const { return m_Triangle; }
+#endif
// ADD_NEW_TOOL : (encoder lib) add access functions here
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 23a755c29d257852cb5aef781eed7826eda1fecf..d459e98d14eca69498d786bf70caa3090f33f9be 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -197,6 +197,12 @@ void EncCu::create( EncCfg* encCfg )
m_acRealMergeBuffer[ui].create(chromaFormat, Area(0, 0, uiMaxWidth, uiMaxHeight));
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ for( unsigned ui = 0; ui < TRIANGLE_MAX_NUM_CANDS; ui++ )
+ {
+ m_acTriangleWeightedBuffer[ui].create( chromaFormat, Area( 0, 0, uiMaxWidth, uiMaxHeight ) );
+ }
+#endif
m_CtxBuffer.resize( maxDepth );
m_CurrCtx = 0;
@@ -301,6 +307,12 @@ void EncCu::destroy()
m_acRealMergeBuffer[ui].destroy();
}
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ for( unsigned ui = 0; ui < TRIANGLE_MAX_NUM_CANDS; ui++ )
+ {
+ m_acTriangleWeightedBuffer[ui].destroy();
+ }
+#endif
}
@@ -741,6 +753,12 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
cu->mmvdSkip = cu->skip == false ? false : cu->mmvdSkip;
#endif
}
+#if JVET_L0124_L0208_TRIANGLE
+ else if( currTestMode.type == ETM_MERGE_TRIANGLE )
+ {
+ xCheckRDCostMergeTriangle2Nx2N( tempCS, bestCS, partitioner, currTestMode );
+ }
+#endif
else if( currTestMode.type == ETM_INTRA )
{
xCheckRDCostIntra( tempCS, bestCS, partitioner, currTestMode );
@@ -1611,6 +1629,10 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
mergeCtx.subPuMvpMiBuf = MotionBuf( m_SubPuMiBuf, bufSize );
}
+#if JVET_L0124_L0208_TRIANGLE
+ setMergeBestSATDCost( MAX_DOUBLE );
+#endif
+
{
// first get merge candidates
CodingUnit cu( tempCS->area );
@@ -1781,6 +1803,9 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
cu.skip = false;
#if JVET_L0054_MMVD
cu.mmvdSkip = false;
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ cu.triangle = false;
#endif
cu.partSize = SIZE_2Nx2N;
//cu.affine
@@ -2075,6 +2100,10 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
}
}
+#if JVET_L0124_L0208_TRIANGLE
+ setMergeBestSATDCost( candCostList[0] );
+#endif
+
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
if (isIntrainterEnabled)
{
@@ -2172,6 +2201,9 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
cu.skip = false;
#if JVET_L0054_MMVD
cu.mmvdSkip = false;
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ cu.triangle = false;
#endif
cu.partSize = SIZE_2Nx2N;
//cu.affine
@@ -2338,6 +2370,233 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
}
}
+#if JVET_L0124_L0208_TRIANGLE
+void EncCu::xCheckRDCostMergeTriangle2Nx2N( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &partitioner, const EncTestMode& encTestMode )
+{
+ const Slice &slice = *tempCS->slice;
+ const SPS &sps = *tempCS->sps;
+
+ CHECK( slice.getSliceType() != B_SLICE, "Triangle mode is only applied to B-slices" );
+
+ tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
+
+ bool trianglecandHasNoResidual[TRIANGLE_MAX_NUM_CANDS];
+ for( int mergeCand = 0; mergeCand < TRIANGLE_MAX_NUM_CANDS; mergeCand++ )
+ {
+ trianglecandHasNoResidual[mergeCand] = false;
+ }
+
+ bool bestIsSkip = m_pcEncCfg->getUseFastDecisionForMerge() ? bestCS->getCU( partitioner.chType )->rootCbf == 0 : false;
+ uint8_t numTriangleCandidate = TRIANGLE_MAX_NUM_CANDS;
+ uint8_t triangleNumMrgSATDCand = TRIANGLE_MAX_NUM_SATD_CANDS;
+ PelUnitBuf triangleBuffer[TRIANGLE_MAX_NUM_UNI_CANDS];
+ PelUnitBuf triangleWeightedBuffer[TRIANGLE_MAX_NUM_CANDS];
+ static_vector<uint8_t, TRIANGLE_MAX_NUM_CANDS> triangleRdModeList;
+ static_vector<double, TRIANGLE_MAX_NUM_CANDS> tianglecandCostList;
+
+ if( auto blkCache = dynamic_cast< CacheBlkInfoCtrl* >( m_modeCtrl ) )
+ {
+ bestIsSkip |= blkCache->isSkip( tempCS->area );
+ }
+
+ DistParam distParam;
+ const bool useHadamard = !encTestMode.lossless;
+ m_pcRdCost->setDistParam( distParam, tempCS->getOrgBuf().Y(), m_acMergeBuffer[0].Y(), sps.getBitDepth( CHANNEL_TYPE_LUMA ), COMPONENT_Y, useHadamard );
+
+ const UnitArea localUnitArea( tempCS->area.chromaFormat, Area( 0, 0, tempCS->area.Y().width, tempCS->area.Y().height) );
+
+ const double sqrtLambdaForFirstPass = m_pcRdCost->getMotionLambda(encTestMode.lossless);
+
+ MergeCtx triangleMrgCtx;
+ {
+ CodingUnit cu( tempCS->area );
+ cu.cs = tempCS;
+ cu.partSize = SIZE_2Nx2N;
+ cu.predMode = MODE_INTER;
+ cu.slice = tempCS->slice;
+ cu.triangle = true;
+#if JVET_L0054_MMVD
+ cu.mmvdSkip = false;
+#endif
+#if JVET_L0646_GBI
+ cu.GBiIdx = GBI_DEFAULT;
+#endif
+
+ PredictionUnit pu( tempCS->area );
+ pu.cu = &cu;
+ pu.cs = tempCS;
+
+
+ PU::getTriangleMergeCandidates( pu, triangleMrgCtx );
+ for( uint8_t mergeCand = 0; mergeCand < TRIANGLE_MAX_NUM_UNI_CANDS; mergeCand++ )
+ {
+ triangleBuffer[mergeCand] = m_acMergeBuffer[mergeCand].getBuf(localUnitArea);
+ triangleMrgCtx.setMergeInfo( pu, mergeCand );
+ PU::spanMotionInfo( pu, triangleMrgCtx );
+
+ m_pcInterSearch->motionCompensation( pu, triangleBuffer[mergeCand] );
+ }
+ }
+
+ bool tempBufSet = bestIsSkip ? false : true;
+ triangleNumMrgSATDCand = bestIsSkip ? TRIANGLE_MAX_NUM_CANDS : TRIANGLE_MAX_NUM_SATD_CANDS;
+ if( bestIsSkip )
+ {
+ for( uint8_t i = 0; i < TRIANGLE_MAX_NUM_CANDS; i++ )
+ {
+ triangleRdModeList.push_back(i);
+ }
+ }
+ else
+ {
+ CodingUnit &cu = tempCS->addCU( tempCS->area, partitioner.chType );
+
+ partitioner.setCUData( cu );
+ cu.slice = tempCS->slice;
+ cu.skip = false;
+ cu.partSize = SIZE_2Nx2N;
+ cu.predMode = MODE_INTER;
+ cu.transQuantBypass = encTestMode.lossless;
+ cu.chromaQpAdj = cu.transQuantBypass ? 0 : m_cuChromaQpOffsetIdxPlus1;
+ cu.qp = encTestMode.qp;
+ cu.triangle = true;
+#if JVET_L0054_MMVD
+ cu.mmvdSkip = false;
+#endif
+#if JVET_L0646_GBI
+ cu.GBiIdx = GBI_DEFAULT;
+#endif
+
+ PredictionUnit &pu = tempCS->addPU( cu, partitioner.chType );
+
+ if( abs(g_aucLog2[cu.lwidth()] - g_aucLog2[cu.lheight()]) >= 2 )
+ {
+ numTriangleCandidate = 30;
+ }
+ else
+ {
+ numTriangleCandidate = TRIANGLE_MAX_NUM_CANDS;
+ }
+
+ for( uint8_t mergeCand = 0; mergeCand < numTriangleCandidate; mergeCand++ )
+ {
+ bool splitDir = g_triangleCombination[mergeCand][0];
+ uint8_t candIdx0 = g_triangleCombination[mergeCand][1];
+ uint8_t candIdx1 = g_triangleCombination[mergeCand][2];
+
+ pu.mergeIdx = mergeCand;
+ pu.mergeFlag = true;
+ triangleWeightedBuffer[mergeCand] = m_acTriangleWeightedBuffer[mergeCand].getBuf( localUnitArea );
+ triangleBuffer[candIdx0] = m_acMergeBuffer[candIdx0].getBuf( localUnitArea );
+ triangleBuffer[candIdx1] = m_acMergeBuffer[candIdx1].getBuf( localUnitArea );
+
+ m_pcInterSearch->weightedTriangleBlk( pu, PU::getTriangleWeights(pu, triangleMrgCtx, candIdx0, candIdx1), splitDir, CHANNEL_TYPE_LUMA, triangleWeightedBuffer[mergeCand], triangleBuffer[candIdx0], triangleBuffer[candIdx1] );
+
+ distParam.cur = triangleWeightedBuffer[mergeCand].Y();
+
+ Distortion uiSad = distParam.distFunc( distParam );
+
+ uint32_t uiBitsCand = g_triangleIdxBins[mergeCand];
+
+ double cost = (double)uiSad + (double)uiBitsCand * sqrtLambdaForFirstPass;
+
+ updateCandList( mergeCand, cost, triangleRdModeList, tianglecandCostList, triangleNumMrgSATDCand );
+ }
+
+ // limit number of candidates using SATD-costs
+ for( uint8_t i = 0; i < triangleNumMrgSATDCand; i++ )
+ {
+ if( tianglecandCostList[i] > MRG_FAST_RATIO * tianglecandCostList[0] || tianglecandCostList[i] > getMergeBestSATDCost() )
+ {
+ triangleNumMrgSATDCand = i;
+ break;
+ }
+ }
+
+ // perform chroma weighting process
+ for( uint8_t i = 0; i < triangleNumMrgSATDCand; i++ )
+ {
+ uint8_t mergeCand = triangleRdModeList[i];
+ bool splitDir = g_triangleCombination[mergeCand][0];
+ uint8_t candIdx0 = g_triangleCombination[mergeCand][1];
+ uint8_t candIdx1 = g_triangleCombination[mergeCand][2];
+
+ pu.mergeIdx = mergeCand;
+ pu.mergeFlag = true;
+
+ m_pcInterSearch->weightedTriangleBlk( pu, PU::getTriangleWeights(pu, triangleMrgCtx, candIdx0, candIdx1), splitDir, CHANNEL_TYPE_CHROMA, triangleWeightedBuffer[mergeCand], triangleBuffer[candIdx0], triangleBuffer[candIdx1] );
+ }
+
+ tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
+ }
+
+ {
+ const uint8_t iteration = encTestMode.lossless ? 1 : 2;
+ for( uint8_t noResidualPass = 0; noResidualPass < iteration; noResidualPass++ )
+ {
+ for( uint8_t mrgHADIdx = 0; mrgHADIdx < triangleNumMrgSATDCand; mrgHADIdx++ )
+ {
+ uint8_t mergeCand = triangleRdModeList[mrgHADIdx];
+
+ if ( ( (noResidualPass != 0) && trianglecandHasNoResidual[mergeCand] )
+ || ( (noResidualPass == 0) && bestIsSkip ) )
+ {
+ continue;
+ }
+
+ bool splitDir = g_triangleCombination[mergeCand][0];
+ uint8_t candIdx0 = g_triangleCombination[mergeCand][1];
+ uint8_t candIdx1 = g_triangleCombination[mergeCand][2];
+
+ CodingUnit &cu = tempCS->addCU(tempCS->area, partitioner.chType);
+
+ partitioner.setCUData(cu);
+ cu.slice = tempCS->slice;
+ cu.skip = false;
+ cu.partSize = SIZE_2Nx2N;
+ cu.predMode = MODE_INTER;
+ cu.transQuantBypass = encTestMode.lossless;
+ cu.chromaQpAdj = cu.transQuantBypass ? 0 : m_cuChromaQpOffsetIdxPlus1;
+ cu.qp = encTestMode.qp;
+ cu.triangle = true;
+#if JVET_L0054_MMVD
+ cu.mmvdSkip = false;
+#endif
+#if JVET_L0646_GBI
+ cu.GBiIdx = GBI_DEFAULT;
+#endif
+ PredictionUnit &pu = tempCS->addPU(cu, partitioner.chType);
+
+ pu.mergeIdx = mergeCand;
+ pu.mergeFlag = true;
+
+ PU::spanTriangleMotionInfo(pu, triangleMrgCtx, mergeCand, splitDir, candIdx0, candIdx1 );
+
+ if( tempBufSet )
+ {
+ tempCS->getPredBuf().copyFrom( triangleWeightedBuffer[mergeCand] );
+ }
+ else
+ {
+ triangleBuffer[candIdx0] = m_acMergeBuffer[candIdx0].getBuf( localUnitArea );
+ triangleBuffer[candIdx1] = m_acMergeBuffer[candIdx1].getBuf( localUnitArea );
+ PelUnitBuf predBuf = tempCS->getPredBuf();
+ m_pcInterSearch->weightedTriangleBlk( pu, PU::getTriangleWeights(pu, triangleMrgCtx, candIdx0, candIdx1), splitDir, MAX_NUM_CHANNEL_TYPE, predBuf, triangleBuffer[candIdx0], triangleBuffer[candIdx1] );
+ }
+
+ xEncodeInterResidual( tempCS, bestCS, partitioner, encTestMode, noResidualPass, NULL, true, ( (noResidualPass == 0 ) ? &trianglecandHasNoResidual[mergeCand] : NULL ) );
+
+ if (m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip)
+ {
+ bestIsSkip = bestCS->getCU(partitioner.chType)->rootCbf == 0;
+ }
+ tempCS->initStructData(encTestMode.qp, encTestMode.lossless);
+ }// end loop mrgHADIdx
+ }
+ }
+}
+#endif
+
void EncCu::xCheckRDCostAffineMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &partitioner, const EncTestMode& encTestMode )
{
if( m_modeCtrl->getFastDeltaQp() )
diff --git a/source/Lib/EncoderLib/EncCu.h b/source/Lib/EncoderLib/EncCu.h
index fbc2b7603b387a6a7672c4409e4a34090a5f00f5..570dd4bdd0886a4ad6bfd4030fc51e294f2e7148 100644
--- a/source/Lib/EncoderLib/EncCu.h
+++ b/source/Lib/EncoderLib/EncCu.h
@@ -119,6 +119,10 @@ private:
#endif
#else
PelStorage m_acMergeBuffer[MRG_MAX_NUM_CANDS];
+#endif
+#if JVET_L0124_L0208_TRIANGLE
+ PelStorage m_acTriangleWeightedBuffer[TRIANGLE_MAX_NUM_CANDS]; // to store weighted prediction pixles
+ double m_mergeBestSATDCost;
#endif
MotionInfo m_SubPuMiBuf [( MAX_CU_SIZE * MAX_CU_SIZE ) >> ( MIN_CU_LOG2 << 1 )];
unsigned int m_subMergeBlkSize[10];
@@ -177,6 +181,11 @@ public:
bool getClearSubMergeStatic() { return m_clearSubMergeStatic; }
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ void setMergeBestSATDCost(double cost) { m_mergeBestSATDCost = cost; }
+ double getMergeBestSATDCost() { return m_mergeBestSATDCost; }
+#endif
+
~EncCu();
protected:
@@ -221,6 +230,10 @@ protected:
void xCheckRDCostMerge2Nx2N ( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &pm, const EncTestMode& encTestMode );
+#if JVET_L0124_L0208_TRIANGLE
+ void xCheckRDCostMergeTriangle2Nx2N( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &pm, const EncTestMode& encTestMode );
+#endif
+
void xEncodeInterResidual ( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &partitioner, const EncTestMode& encTestMode, int residualPass = 0
, CodingStructure* imvCS = NULL
, int emtMode = 1
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index d46b5e17bc818c45b301fe91159d4d277a20de2b..82ea0cdae7a1c354ef863dc52346a34afa627c82 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -880,6 +880,9 @@ void EncLib::xInitSPS(SPS &sps)
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
sps.getSpsNext().setUseMHIntra ( m_MHIntra );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ sps.getSpsNext().setUseTriangle ( m_Triangle );
+#endif
// ADD_NEW_TOOL : (encoder lib) set tool enabling flags and associated parameters here
diff --git a/source/Lib/EncoderLib/EncModeCtrl.cpp b/source/Lib/EncoderLib/EncModeCtrl.cpp
index 0aba5bc5b6dbe667cfa422f3f1ba358b6aa06bb6..c4e07119aacb5dfa41221d77a18effcb99b80c22 100644
--- a/source/Lib/EncoderLib/EncModeCtrl.cpp
+++ b/source/Lib/EncoderLib/EncModeCtrl.cpp
@@ -1077,6 +1077,12 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru
// add inter modes
if( m_pcEncCfg->getUseEarlySkipDetection() )
{
+#if JVET_L0124_L0208_TRIANGLE
+ if( cs.sps->getSpsNext().getUseTriangle() && cs.slice->isInterB() )
+ {
+ m_ComprCUCtxList.back().testModes.push_back( { ETM_MERGE_TRIANGLE, SIZE_2Nx2N, ETO_STANDARD, qp, lossless } );
+ }
+#endif
m_ComprCUCtxList.back().testModes.push_back( { ETM_MERGE_SKIP, SIZE_2Nx2N, ETO_STANDARD, qp, lossless } );
#if JVET_L0369_SUBBLOCK_MERGE
if ( cs.sps->getSpsNext().getUseAffine() || cs.sps->getSpsNext().getUseSubPuMvp() )
@@ -1091,7 +1097,12 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru
else
{
m_ComprCUCtxList.back().testModes.push_back( { ETM_INTER_ME, SIZE_2Nx2N, ETO_STANDARD, qp, lossless } );
-
+#if JVET_L0124_L0208_TRIANGLE
+ if( cs.sps->getSpsNext().getUseTriangle() && cs.slice->isInterB() )
+ {
+ m_ComprCUCtxList.back().testModes.push_back( { ETM_MERGE_TRIANGLE, SIZE_2Nx2N, ETO_STANDARD, qp, lossless } );
+ }
+#endif
m_ComprCUCtxList.back().testModes.push_back( { ETM_MERGE_SKIP, SIZE_2Nx2N, ETO_STANDARD, qp, lossless } );
#if JVET_L0369_SUBBLOCK_MERGE
if ( cs.sps->getSpsNext().getUseAffine() || cs.sps->getSpsNext().getUseSubPuMvp() )
@@ -1313,6 +1324,12 @@ bool EncModeCtrlMTnoRQT::tryMode( const EncTestMode& encTestmode, const CodingSt
{
return false;
}
+#if JVET_L0124_L0208_TRIANGLE
+ if( encTestmode.type == ETM_MERGE_TRIANGLE && ( partitioner.currArea().lumaSize().area() < TRIANGLE_MIN_SIZE || relatedCU.isIntra ) )
+ {
+ return false;
+ }
+#endif
return true;
}
else if( isModeSplit( encTestmode ) )
diff --git a/source/Lib/EncoderLib/EncModeCtrl.h b/source/Lib/EncoderLib/EncModeCtrl.h
index f56fceb06b1435025bced67fcf32150c1a4c7253..988ba51c4d8821c484d076b6d726748b810a81a3 100644
--- a/source/Lib/EncoderLib/EncModeCtrl.h
+++ b/source/Lib/EncoderLib/EncModeCtrl.h
@@ -57,6 +57,9 @@ enum EncTestModeType
ETM_MERGE_SKIP,
ETM_INTER_ME,
ETM_AFFINE,
+#if JVET_L0124_L0208_TRIANGLE
+ ETM_MERGE_TRIANGLE,
+#endif
ETM_INTRA,
ETM_IPCM,
ETM_SPLIT_QT,
@@ -134,6 +137,9 @@ inline bool isModeInter( const EncTestMode& encTestmode ) // perhaps remove
return ( encTestmode.type == ETM_INTER_ME
|| encTestmode.type == ETM_MERGE_SKIP
|| encTestmode.type == ETM_AFFINE
+#if JVET_L0124_L0208_TRIANGLE
+ || encTestmode.type == ETM_MERGE_TRIANGLE
+#endif
);
}
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
index 8d6f8cb2462ae1c88aacd74d48f0a01fd1c15452..5258a13df78387ee96e99054846377000876789e 100644
--- a/source/Lib/EncoderLib/InterSearch.cpp
+++ b/source/Lib/EncoderLib/InterSearch.cpp
@@ -4860,6 +4860,9 @@ void InterSearch::encodeResAndCalcRdInterCU(CodingStructure &cs, Partitioner &pa
#else
m_CABACEstimator->affine_flag( cu );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ m_CABACEstimator->triangle_mode ( cu );
+#endif
#if JVET_L0054_MMVD
if (cu.mmvdSkip)
{
@@ -4995,6 +4998,9 @@ uint64_t InterSearch::xGetSymbolFracBitsInter(CodingStructure &cs, Partitioner &
#else
m_CABACEstimator->affine_flag ( cu );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ m_CABACEstimator->triangle_mode ( cu );
+#endif
#if JVET_L0054_MMVD
if (cu.mmvdSkip)
{
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 4feff09a66c72f945903b1a9e48562bc1887806d..685fd3ab5005cd5160ce5b2fd84d44ded21b4ba5 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -559,6 +559,9 @@ void HLSWriter::codeSPSNext( const SPSNext& spsNext, const bool usePCM )
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
WRITE_FLAG( spsNext.getUseMHIntra() ? 1 : 0, "mhintra_flag" );
#endif
+#if JVET_L0124_L0208_TRIANGLE
+ WRITE_FLAG( spsNext.getUseTriangle() ? 1: 0, "triangle_flag" );
+#endif
#if ENABLE_WPP_PARALLELISM
WRITE_FLAG( spsNext.getUseNextDQP(), "next_dqp_enabled_flag" );
#else