Commit 6981f879 authored by Karsten Suehring's avatar Karsten Suehring

remove macro JVET_L0124_L0208_TRIANGLE

parent 77e8c485
...@@ -258,9 +258,7 @@ void EncApp::xInitLibCfg() ...@@ -258,9 +258,7 @@ void EncApp::xInitLibCfg()
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
m_cEncLib.setUseMHIntra ( m_MHIntra ); m_cEncLib.setUseMHIntra ( m_MHIntra );
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
m_cEncLib.setUseTriangle ( m_Triangle ); m_cEncLib.setUseTriangle ( m_Triangle );
#endif
#if JVET_L0293_CPR #if JVET_L0293_CPR
m_cEncLib.setCPRMode ( m_CPRMode ); m_cEncLib.setCPRMode ( m_CPRMode );
......
...@@ -859,9 +859,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) ...@@ -859,9 +859,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
("MHIntra", m_MHIntra, false, "Enable MHIntra mode") ("MHIntra", m_MHIntra, false, "Enable MHIntra mode")
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
("Triangle", m_Triangle, false, "Enable triangular shape motion vector prediction (0:off, 1:on)") ("Triangle", m_Triangle, false, "Enable triangular shape motion vector prediction (0:off, 1:on)")
#endif
#if JVET_L0293_CPR #if JVET_L0293_CPR
( "CPR", m_CPRMode, 0u, "CPRMode (0x1:enabled, 0x0:disabled) [default: disabled]") ( "CPR", m_CPRMode, 0u, "CPRMode (0x1:enabled, 0x0:disabled) [default: disabled]")
...@@ -1950,9 +1948,7 @@ bool EncAppCfg::xCheckParameter() ...@@ -1950,9 +1948,7 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara( m_GBi, "GBi is only allowed with NEXT profile" ); xConfirmPara( m_GBi, "GBi is only allowed with NEXT profile" );
xConfirmPara( m_GBiFast, "GBiFast is only allowed with NEXT profile" ); xConfirmPara( m_GBiFast, "GBiFast is only allowed with NEXT profile" );
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
xConfirmPara( m_Triangle, "Triangle is only allowed with NEXT profile" ); xConfirmPara( m_Triangle, "Triangle is only allowed with NEXT profile" );
#endif
// ADD_NEW_TOOL : (parameter check) add a check for next tools here // ADD_NEW_TOOL : (parameter check) add a check for next tools here
} }
else else
...@@ -3151,9 +3147,7 @@ void EncAppCfg::xPrintParameter() ...@@ -3151,9 +3147,7 @@ void EncAppCfg::xPrintParameter()
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
msg(VERBOSE, "MHIntra:%d ", m_MHIntra); msg(VERBOSE, "MHIntra:%d ", m_MHIntra);
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
msg( VERBOSE, "Triangle:%d ", m_Triangle ); msg( VERBOSE, "Triangle:%d ", m_Triangle );
#endif
} }
#if JVET_L0293_CPR #if JVET_L0293_CPR
msg(VERBOSE, "CPR:%d ", m_CPRMode); msg(VERBOSE, "CPR:%d ", m_CPRMode);
......
...@@ -239,9 +239,7 @@ protected: ...@@ -239,9 +239,7 @@ protected:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
bool m_MHIntra; bool m_MHIntra;
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
bool m_Triangle; bool m_Triangle;
#endif
#if JVET_L0293_CPR #if JVET_L0293_CPR
......
...@@ -106,10 +106,8 @@ enum CodingStatisticsType ...@@ -106,10 +106,8 @@ enum CodingStatisticsType
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
STATS__CABAC_BITS__MH_INTRA_FLAG, STATS__CABAC_BITS__MH_INTRA_FLAG,
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
STATS__CABAC_BITS__TRIANGLE_FLAG, STATS__CABAC_BITS__TRIANGLE_FLAG,
STATS__CABAC_BITS__TRIANGLE_INDEX, STATS__CABAC_BITS__TRIANGLE_INDEX,
#endif
#if JVET_L0283_MULTI_REF_LINE #if JVET_L0283_MULTI_REF_LINE
STATS__CABAC_BITS__MULTI_REF_LINE, STATS__CABAC_BITS__MULTI_REF_LINE,
#endif #endif
...@@ -193,10 +191,8 @@ static inline const char* getName(CodingStatisticsType name) ...@@ -193,10 +191,8 @@ static inline const char* getName(CodingStatisticsType name)
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
"CABAC_BITS__MH_INTRA_FLAG", "CABAC_BITS__MH_INTRA_FLAG",
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
"CABAC_BITS__TRIANGLE_FLAG", "CABAC_BITS__TRIANGLE_FLAG",
"CABAC_BITS__TRIANGLE_INDEX", "CABAC_BITS__TRIANGLE_INDEX",
#endif
#if JVET_L0283_MULTI_REF_LINE #if JVET_L0283_MULTI_REF_LINE
"CABAC_BITS__MULTI_REF_LINE", "CABAC_BITS__MULTI_REF_LINE",
#endif #endif
......
...@@ -420,13 +420,11 @@ static const int NTAPS_BILINEAR = 2; ///< Numb ...@@ -420,13 +420,11 @@ static const int NTAPS_BILINEAR = 2; ///< Numb
#if JVET_L0198_L0468_L0104_ATMVP_8x8SUB_BLOCK #if JVET_L0198_L0468_L0104_ATMVP_8x8SUB_BLOCK
static const int ATMVP_SUB_BLOCK_SIZE = 3; ///< sub-block size for ATMVP static const int ATMVP_SUB_BLOCK_SIZE = 3; ///< sub-block size for ATMVP
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
static const int TRIANGLE_MAX_NUM_UNI_CANDS = 5; 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_MEM = 7;
static const int TRIANGLE_MAX_NUM_CANDS = 40; static const int TRIANGLE_MAX_NUM_CANDS = 40;
static const int TRIANGLE_MAX_NUM_SATD_CANDS = 3; static const int TRIANGLE_MAX_NUM_SATD_CANDS = 3;
static const int TRIANGLE_MIN_SIZE = 8 * 8; static const int TRIANGLE_MIN_SIZE = 8 * 8;
#endif
#if JVET_L0293_CPR #if JVET_L0293_CPR
static const int CPR_MAX_CAND_SIZE = 16; // max block size for cpr search static const int CPR_MAX_CAND_SIZE = 16; // max block size for cpr search
......
...@@ -330,7 +330,6 @@ unsigned DeriveCtx::CtxBTsplit(const CodingStructure& cs, Partitioner& partition ...@@ -330,7 +330,6 @@ unsigned DeriveCtx::CtxBTsplit(const CodingStructure& cs, Partitioner& partition
return ctx; return ctx;
} }
#if JVET_L0124_L0208_TRIANGLE
unsigned DeriveCtx::CtxTriangleFlag( const CodingUnit& cu ) unsigned DeriveCtx::CtxTriangleFlag( const CodingUnit& cu )
{ {
const CodingStructure *cs = cu.cs; const CodingStructure *cs = cu.cs;
...@@ -344,7 +343,6 @@ unsigned DeriveCtx::CtxTriangleFlag( const CodingUnit& cu ) ...@@ -344,7 +343,6 @@ unsigned DeriveCtx::CtxTriangleFlag( const CodingUnit& cu )
return ctxId; return ctxId;
} }
#endif
void MergeCtx::setMergeInfo( PredictionUnit& pu, int candIdx ) void MergeCtx::setMergeInfo( PredictionUnit& pu, int candIdx )
......
...@@ -349,9 +349,7 @@ unsigned CtxInterDir ( const PredictionUnit& pu ); ...@@ -349,9 +349,7 @@ unsigned CtxInterDir ( const PredictionUnit& pu );
unsigned CtxSkipFlag ( const CodingUnit& cu ); unsigned CtxSkipFlag ( const CodingUnit& cu );
unsigned CtxIMVFlag ( const CodingUnit& cu ); unsigned CtxIMVFlag ( const CodingUnit& cu );
unsigned CtxAffineFlag( const CodingUnit& cu ); unsigned CtxAffineFlag( const CodingUnit& cu );
#if JVET_L0124_L0208_TRIANGLE
unsigned CtxTriangleFlag( const CodingUnit& cu ); unsigned CtxTriangleFlag( const CodingUnit& cu );
#endif
} }
#endif // __CONTEXTMODELLING__ #endif // __CONTEXTMODELLING__
...@@ -1138,7 +1138,6 @@ const CtxSet ContextSetCfg::MHIntraPredMode = ContextSetCfg::addCtxSet ...@@ -1138,7 +1138,6 @@ const CtxSet ContextSetCfg::MHIntraPredMode = ContextSetCfg::addCtxSet
}); });
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
const CtxSet ContextSetCfg::TriangleFlag = ContextSetCfg::addCtxSet const CtxSet ContextSetCfg::TriangleFlag = ContextSetCfg::addCtxSet
({ ({
#if TRAINED_CABAC_INIT_TABLES #if TRAINED_CABAC_INIT_TABLES
...@@ -1164,7 +1163,6 @@ const CtxSet ContextSetCfg::TriangleIdx = ContextSetCfg::addCtxSet ...@@ -1164,7 +1163,6 @@ const CtxSet ContextSetCfg::TriangleIdx = ContextSetCfg::addCtxSet
{ CNU, }, { CNU, },
#endif #endif
}); });
#endif
const unsigned ContextSetCfg::NumberOfContexts = (unsigned)ContextSetCfg::sm_InitTables[0].size(); const unsigned ContextSetCfg::NumberOfContexts = (unsigned)ContextSetCfg::sm_InitTables[0].size();
......
...@@ -210,10 +210,8 @@ public: ...@@ -210,10 +210,8 @@ public:
static const CtxSet MHIntraFlag; static const CtxSet MHIntraFlag;
static const CtxSet MHIntraPredMode; static const CtxSet MHIntraPredMode;
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
static const CtxSet TriangleFlag; static const CtxSet TriangleFlag;
static const CtxSet TriangleIdx; static const CtxSet TriangleIdx;
#endif
static const unsigned NumberOfContexts; static const unsigned NumberOfContexts;
// combined sets for less complex copying // combined sets for less complex copying
......
...@@ -120,9 +120,7 @@ void InterPrediction::destroy() ...@@ -120,9 +120,7 @@ void InterPrediction::destroy()
} }
} }
#if JVET_L0124_L0208_TRIANGLE
m_triangleBuf.destroy(); m_triangleBuf.destroy();
#endif
#if JVET_L0265_AFF_MINIMUM4X4 #if JVET_L0265_AFF_MINIMUM4X4
if (m_storedMv != nullptr) if (m_storedMv != nullptr)
...@@ -180,9 +178,7 @@ void InterPrediction::init( RdCost* pcRdCost, ChromaFormat chromaFormatIDC ) ...@@ -180,9 +178,7 @@ 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))); m_triangleBuf.create(UnitArea(chromaFormatIDC, Area(0, 0, MAX_CU_SIZE, MAX_CU_SIZE)));
#endif
m_iRefListIdx = -1; m_iRefListIdx = -1;
...@@ -574,7 +570,6 @@ void InterPrediction::xPredInterBi(PredictionUnit& pu, PelUnitBuf &pcYuvPred) ...@@ -574,7 +570,6 @@ void InterPrediction::xPredInterBi(PredictionUnit& pu, PelUnitBuf &pcYuvPred)
} }
else else
{ {
#if JVET_L0124_L0208_TRIANGLE
xPredInterUni( pu, eRefPicList, pcMbBuf, pu.cu->triangle xPredInterUni( pu, eRefPicList, pcMbBuf, pu.cu->triangle
#if JVET_L0256_BIO #if JVET_L0256_BIO
, bioApplied , bioApplied
...@@ -583,16 +578,6 @@ void InterPrediction::xPredInterBi(PredictionUnit& pu, PelUnitBuf &pcYuvPred) ...@@ -583,16 +578,6 @@ void InterPrediction::xPredInterBi(PredictionUnit& pu, PelUnitBuf &pcYuvPred)
, true, true , true, true
#endif #endif
); );
#else
xPredInterUni ( pu, eRefPicList, pcMbBuf, false
#if JVET_L0256_BIO
, bioApplied
#endif
#if JVET_L0293_CPR
, true, true
#endif
);
#endif
} }
} }
} }
...@@ -1349,24 +1334,20 @@ void InterPrediction::xWeightedAverage( const PredictionUnit& pu, const CPelUnit ...@@ -1349,24 +1334,20 @@ void InterPrediction::xWeightedAverage( const PredictionUnit& pu, const CPelUnit
} }
else if( iRefIdx0 >= 0 && iRefIdx1 < 0 ) else if( iRefIdx0 >= 0 && iRefIdx1 < 0 )
{ {
#if JVET_L0124_L0208_TRIANGLE
if( pu.cu->triangle ) if( pu.cu->triangle )
{ {
pcYuvDst.copyFrom( pcYuvSrc0 ); pcYuvDst.copyFrom( pcYuvSrc0 );
} }
else else
#endif
pcYuvDst.copyClip( pcYuvSrc0, clpRngs ); pcYuvDst.copyClip( pcYuvSrc0, clpRngs );
} }
else if( iRefIdx0 < 0 && iRefIdx1 >= 0 ) else if( iRefIdx0 < 0 && iRefIdx1 >= 0 )
{ {
#if JVET_L0124_L0208_TRIANGLE
if( pu.cu->triangle ) if( pu.cu->triangle )
{ {
pcYuvDst.copyFrom( pcYuvSrc1 ); pcYuvDst.copyFrom( pcYuvSrc1 );
} }
else else
#endif
pcYuvDst.copyClip( pcYuvSrc1, clpRngs ); pcYuvDst.copyClip( pcYuvSrc1, clpRngs );
} }
} }
...@@ -1508,7 +1489,6 @@ int InterPrediction::rightShiftMSB(int numer, int denom) ...@@ -1508,7 +1489,6 @@ int InterPrediction::rightShiftMSB(int numer, int denom)
} }
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
void InterPrediction::motionCompensation4Triangle( CodingUnit &cu, MergeCtx &triangleMrgCtx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1 ) void InterPrediction::motionCompensation4Triangle( CodingUnit &cu, MergeCtx &triangleMrgCtx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1 )
{ {
for( auto &pu : CU::traversePUs( cu ) ) for( auto &pu : CU::traversePUs( cu ) )
...@@ -1618,7 +1598,6 @@ void InterPrediction::xWeightedTriangleBlk( const PredictionUnit &pu, const uint ...@@ -1618,7 +1598,6 @@ void InterPrediction::xWeightedTriangleBlk( const PredictionUnit &pu, const uint
weightedEndPos += weightedPosoffset; weightedEndPos += weightedPosoffset;
} }
} }
#endif
#if JVET_J0090_MEMORY_BANDWITH_MEASURE #if JVET_J0090_MEMORY_BANDWITH_MEASURE
void InterPrediction::cacheAssign( CacheModel *cache ) void InterPrediction::cacheAssign( CacheModel *cache )
......
...@@ -91,9 +91,7 @@ protected: ...@@ -91,9 +91,7 @@ protected:
RdCost* m_pcRdCost; RdCost* m_pcRdCost;
int m_iRefListIdx; int m_iRefListIdx;
#if JVET_L0124_L0208_TRIANGLE
PelStorage m_triangleBuf; PelStorage m_triangleBuf;
#endif
#if JVET_L0265_AFF_MINIMUM4X4 #if JVET_L0265_AFF_MINIMUM4X4
Mv* m_storedMv; Mv* m_storedMv;
#endif #endif
...@@ -140,9 +138,7 @@ protected: ...@@ -140,9 +138,7 @@ protected:
#endif #endif
void xPredAffineBlk( const ComponentID& compID, const PredictionUnit& pu, const Picture* refPic, const Mv* _mv, PelUnitBuf& dstPic, const bool& bi, const ClpRng& clpRng ); 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 ); 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 ); static bool xCheckIdenticalMotion( const PredictionUnit& pu );
...@@ -180,10 +176,8 @@ public: ...@@ -180,10 +176,8 @@ public:
#endif #endif
); );
#if JVET_L0124_L0208_TRIANGLE
void motionCompensation4Triangle( CodingUnit &cu, MergeCtx &triangleMrgCtx, const bool splitDir, const uint8_t candIdx0, const uint8_t candIdx1 ); 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 ); 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 #if JVET_J0090_MEMORY_BANDWITH_MEASURE
void cacheAssign( CacheModel *cache ); void cacheAssign( CacheModel *cache );
......
...@@ -529,7 +529,6 @@ void initROM() ...@@ -529,7 +529,6 @@ void initROM()
} }
} }
#if JVET_L0124_L0208_TRIANGLE
for( int idxH = MAX_CU_DEPTH - MIN_CU_LOG2; idxH >= 0; --idxH ) for( int idxH = MAX_CU_DEPTH - MIN_CU_LOG2; idxH >= 0; --idxH )
{ {
for( int idxW = MAX_CU_DEPTH - MIN_CU_LOG2; idxW >= 0; --idxW ) for( int idxW = MAX_CU_DEPTH - MIN_CU_LOG2; idxW >= 0; --idxW )
...@@ -551,7 +550,6 @@ void initROM() ...@@ -551,7 +550,6 @@ void initROM()
} }
} }
} }
#endif
} }
void destroyROM() void destroyROM()
...@@ -883,7 +881,6 @@ const uint8_t g_NonMPM[257] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, ...@@ -883,7 +881,6 @@ 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, 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 }; 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] = const Pel g_trianglePelWeightedLuma[TRIANGLE_DIR_NUM][2][7] =
{ {
{ // TRIANGLE_DIR_135 { // TRIANGLE_DIR_135
...@@ -943,5 +940,4 @@ const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS] = ...@@ -943,5 +940,4 @@ const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS] =
8, 8, 8, 8, 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 10, 10, 10, 10, 10, 10, 10, 10, 10, 10
}; };
#endif
//! \} //! \}
...@@ -257,7 +257,6 @@ constexpr uint8_t g_tbMax[257] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, ...@@ -257,7 +257,6 @@ 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_trianglePelWeightedLuma[TRIANGLE_DIR_NUM][2][7];
extern const Pel g_trianglePelWeightedChroma[2][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_triangleWeightLengthLuma[2];
...@@ -265,7 +264,6 @@ extern const uint8_t g_triangleWeightLengthChroma[2][2]; ...@@ -265,7 +264,6 @@ 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 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_triangleCombination[TRIANGLE_MAX_NUM_CANDS][3];
extern const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS]; extern const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS];
#endif
#endif //__TCOMROM__ #endif //__TCOMROM__
...@@ -1687,9 +1687,7 @@ void Slice::updateMotionLUTs(LutMotionCand* lutMC, CodingUnit & cu) ...@@ -1687,9 +1687,7 @@ void Slice::updateMotionLUTs(LutMotionCand* lutMC, CodingUnit & cu)
{ {
PredictionUnit *selectedPU = cu.firstPU; PredictionUnit *selectedPU = cu.firstPU;
if (cu.affine) { return; } if (cu.affine) { return; }
#if JVET_L0124_L0208_TRIANGLE
if (cu.triangle) { return; } if (cu.triangle) { return; }
#endif
MotionInfo newMi = selectedPU->getMotionInfo(); MotionInfo newMi = selectedPU->getMotionInfo();
addMotionInfoToLUTs(lutMC, newMi); addMotionInfoToLUTs(lutMC, newMi);
...@@ -1792,9 +1790,7 @@ SPSNext::SPSNext( SPS& sps ) ...@@ -1792,9 +1790,7 @@ SPSNext::SPSNext( SPS& sps )
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
, m_MHIntra ( false ) , m_MHIntra ( false )
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
, m_Triangle ( false ) , m_Triangle ( false )
#endif
#if ENABLE_WPP_PARALLELISM #if ENABLE_WPP_PARALLELISM
, m_NextDQP ( false ) , m_NextDQP ( false )
#endif #endif
......
...@@ -819,9 +819,7 @@ private: ...@@ -819,9 +819,7 @@ private:
#if JVET_L0100_MULTI_HYPOTHESIS_INTRA #if JVET_L0100_MULTI_HYPOTHESIS_INTRA
bool m_MHIntra; bool m_MHIntra;
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
bool m_Triangle; bool m_Triangle;
#endif
#if ENABLE_WPP_PARALLELISM #if ENABLE_WPP_PARALLELISM
bool m_NextDQP; bool m_NextDQP;
#endif #endif
...@@ -978,10 +976,8 @@ public: ...@@ -978,10 +976,8 @@ public:
void setUseMHIntra ( bool b ) { m_MHIntra = b; } void setUseMHIntra ( bool b ) { m_MHIntra = b; }
bool getUseMHIntra () const { return m_MHIntra; } bool getUseMHIntra () const { return m_MHIntra; }
#endif #endif
#if JVET_L0124_L0208_TRIANGLE
void setUseTriangle ( bool b ) { m_Triangle = b; } void setUseTriangle ( bool b ) { m_Triangle = b; }
bool getUseTriangle () const { return m_Triangle; } bool getUseTriangle () const { return m_Triangle; }
#endif
#if JVET_L0293_CPR #if JVET_L0293_CPR
void setCPRMode (unsigned CPRMode) { m_CPRMode = CPRMode; } void setCPRMode (unsigned CPRMode) { m_CPRMode = CPRMode; }
unsigned getCPRMode () const { return m_CPRMode; } unsigned getCPRMode () const { return m_CPRMode; }
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#define TRAINED_CABAC_INIT_TABLES 1 // Trained values for VTM3 #define TRAINED_CABAC_INIT_TABLES 1 // Trained values for VTM3
#define JVET_L0124_L0208_TRIANGLE 1 // triangular shape prediction unit
#define JVET_L0059_MTS_SIMP 1 // Simpification on MTS signaling #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 #define JVET_L0100_MULTI_HYPOTHESIS_INTRA 1 // Combine intra mode with an extra merge indexed prediction
...@@ -942,14 +941,12 @@ enum MergeType ...@@ -942,14 +941,12 @@ enum MergeType
NUM_MRG_TYPE // 5 NUM_MRG_TYPE // 5
}; };
#if JVET_L0124_L0208_TRIANGLE
enum TriangleSplit enum TriangleSplit
{ {
TRIANGLE_DIR_135 = 0, TRIANGLE_DIR_135 = 0,
TRIANGLE_DIR_45, TRIANGLE_DIR_45,
TRIANGLE_DIR_NUM TRIANGLE_DIR_NUM
}; };
#endif
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Encoder modes to try out // Encoder modes to try out
......
...@@ -257,9 +257,7 @@ CodingUnit& CodingUnit::operator=( const CodingUnit& other ) ...@@ -257,9 +257,7 @@ CodingUnit& CodingUnit::operator=( const CodingUnit& other )
#endif #endif
affine = other.affine; affine = other.affine;
affineType = other.affineType; affineType = other.affineType;
#if JVET_L0124_L0208_TRIANGLE
triangle = other.triangle; triangle = other.triangle;
#endif
transQuantBypass = other.transQuantBypass; transQuantBypass = other.transQuantBypass;
ipcm = other.ipcm; ipcm = other.ipcm;
qp = other.qp; qp = other.qp;
...@@ -296,9 +294,7 @@ void CodingUnit::initData() ...@@ -296,9 +294,7 @@ void CodingUnit::initData()
#endif