Commit 4ac61c0a authored by Frank Bossen's avatar Frank Bossen

Merge branch 'JVET-O0541' into 'master'

JVET-O0541: Decouple the intra implicit transform selection from an inter MTS related SPS flag

See merge request jvet/VVCSoftware_VTM!659
parents 7b8d4604 98d6df67
Pipeline #1876 passed with stage
......@@ -979,7 +979,11 @@ public:
bool getCclmCollocatedChromaFlag() const { return m_cclmCollocatedChromaFlag; }
void setUseMTS ( bool b ) { m_MTS = b; }
bool getUseMTS () const { return m_MTS; }
#if JVET_O0541_IMPLICIT_MTS_CONDITION
bool getUseImplicitMTS () const { return m_MTS && !m_IntraMTS; }
#else
bool getUseImplicitMTS () const { return m_MTS && !m_IntraMTS && !m_InterMTS; }
#endif
void setUseIntraMTS ( bool b ) { m_IntraMTS = b; }
bool getUseIntraMTS () const { return m_IntraMTS; }
void setUseInterMTS ( bool b ) { m_InterMTS = b; }
......
......@@ -60,6 +60,8 @@
#define JVET_O0669_REMOVE_ALF_COEFF_PRED 1 // JVET-O0425/O0427/O0669: remove prediction in ALF coefficients coding
#define JVET_O0541_IMPLICIT_MTS_CONDITION 1 // JVET_O0541: Decouple the intra implicit transform selection from an inter MTS related SPS flag
#define JVET_O0655_422_CHROMA_DM_MAPPING_FIX 1 // JVET-O0655: modify chroma DM derivation table for 4:2:2 chroma format
#define JVET_O1109_UNFIY_CRS 1 // JVET-O1109: Unified CRS derivation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment