diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index ed905526d08a76aa8906de0d168a707ceecaae93..c054640b7dbb8e3bb19993c7fb544931b50a5bd1 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -223,6 +223,9 @@ void EncApp::xInitLibCfg()
m_cEncLib.setDisableMotionCompression ( m_DisableMotionCompression );
m_cEncLib.setMTTMode ( m_MTT );
m_cEncLib.setUseLMChroma ( m_LMChroma );
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ m_cEncLib.setCclmCollocatedChromaFlag ( m_cclmCollocatedChromaFlag );
+#endif
#if ENABLE_WPP_PARALLELISM
m_cEncLib.setUseAltDQPCoding ( m_AltDQPCoding );
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 0a7490dfa2a690215f7703acd5d176cb0120b129..79fb683c9e103052f66f4c2e609d0cf307c0c3b9 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -828,6 +828,11 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("LMChroma", m_LMChroma, 1, " LMChroma prediction "
"\t0: Disable LMChroma\n"
"\t1: Enable LMChroma\n")
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ ("CclmCollocatedChroma", m_cclmCollocatedChromaFlag, false, "Specifies the location of the top-left downsampled luma sample in cross-component linear model intra prediction relative to the top-left luma sample\n"
+ "\t0: horizontally co-sited, vertically shifted by 0.5 units of luma samples\n"
+ "\t1: collocated\n")
+#endif
#if JVET_M0464_UNI_MTS
("MTS", m_MTS, 0, "Multiple Transform Set (MTS)\n"
"\t0: Disable MTS\n"
@@ -3121,6 +3126,12 @@ void EncAppCfg::xPrintParameter()
msg( VERBOSE, "AltDQPCoding:%d ", m_AltDQPCoding );
#endif
msg( VERBOSE, "LMChroma:%d ", m_LMChroma );
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ if( m_LMChroma && m_chromaFormatIDC == CHROMA_420 )
+ {
+ msg( VERBOSE, "CclmCollocatedChroma:%d ", m_cclmCollocatedChromaFlag );
+ }
+#endif
#if JVET_M0464_UNI_MTS
msg( VERBOSE, "MTS: %1d(intra) %1d(inter) ", m_MTS & 1, ( m_MTS >> 1 ) & 1 );
#else
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 55eb9608ce14548928dc4e5d19d230ef40964c93..f45545f23622db2d9efd2f060db5ceae23c88df6 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -213,6 +213,9 @@ protected:
bool m_AltDQPCoding;
#endif
int m_LMChroma;
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ bool m_cclmCollocatedChromaFlag;
+#endif
#if JVET_M0464_UNI_MTS
int m_MTS; ///< XZ: Multiple Transform Set
int m_MTSIntraMaxCand; ///< XZ: Number of additional candidates to test
diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp
index 3745b4bcc71eed36c838a90c714dccd25cd290d8..9f033184e61b96c3b8db9a597460430134892644 100644
--- a/source/Lib/CommonLib/IntraPrediction.cpp
+++ b/source/Lib/CommonLib/IntraPrediction.cpp
@@ -1563,6 +1563,24 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
pDst[i] = ( piSrc[2 * i] * 2 + piSrc[2 * i - 1] + piSrc[2 * i + 1] + 2 ) >> 2;
}
}
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ else if( pu.cs->sps->getSpsNext().getCclmCollocatedChromaFlag() )
+ {
+ piSrc = pRecSrc0 - iRecStride2;
+
+ if( i == 0 && !bLeftAvaillable )
+ {
+ pDst[i] = ( piSrc[2 * i] * 2 + piSrc[2 * i - iRecStride] + piSrc[2 * i + iRecStride] + 2 ) >> 2;
+ }
+ else
+ {
+ pDst[i] = ( piSrc[2 * i - iRecStride]
+ + piSrc[2 * i ] * 4 + piSrc[2 * i - 1] + piSrc[2 * i + 1]
+ + piSrc[2 * i + iRecStride]
+ + 4 ) >> 3;
+ }
+ }
+#endif
else
{
piSrc = pRecSrc0 - iRecStride2;
@@ -1592,9 +1610,30 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
}
for (int j = 0; j < uiCHeight + addedLeftBelow; j++)
{
- pDst[0] = ( ( piSrc[1 ] * 2 + piSrc[0 ] + piSrc[2 ] )
- + ( piSrc[1 + iRecStride] * 2 + piSrc[iRecStride] + piSrc[2 + iRecStride] )
- + 4 ) >> 3;
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ if( pu.cs->sps->getSpsNext().getCclmCollocatedChromaFlag() )
+ {
+ if( j == 0 && !bAboveAvaillable )
+ {
+ pDst[0] = ( piSrc[1] * 2 + piSrc[0] + piSrc[2] + 2 ) >> 2;
+ }
+ else
+ {
+ pDst[0] = ( piSrc[1 - iRecStride]
+ + piSrc[1 ] * 4 + piSrc[0] + piSrc[2]
+ + piSrc[1 + iRecStride]
+ + 4 ) >> 3;
+ }
+ }
+ else
+ {
+#endif
+ pDst[0] = ( ( piSrc[1 ] * 2 + piSrc[0 ] + piSrc[2 ] )
+ + ( piSrc[1 + iRecStride] * 2 + piSrc[iRecStride] + piSrc[2 + iRecStride] )
+ + 4 ) >> 3;
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ }
+#endif
piSrc += iRecStride2;
pDst += iDstStride;
@@ -1607,16 +1646,48 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
{
for( int i = 0; i < uiCWidth; i++ )
{
- if( i == 0 && !bLeftAvaillable )
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ if( pu.cs->sps->getSpsNext().getCclmCollocatedChromaFlag() )
{
- pDst0[i] = ( pRecSrc0[2 * i] + pRecSrc0[2 * i + iRecStride] + 1 ) >> 1;
+ if( i == 0 && !bLeftAvaillable )
+ {
+ if( j == 0 && !bAboveAvaillable )
+ {
+ pDst0[i] = pRecSrc0[2 * i];
+ }
+ else
+ {
+ pDst0[i] = ( pRecSrc0[2 * i] * 2 + pRecSrc0[2 * i - iRecStride] + pRecSrc0[2 * i + iRecStride] + 2 ) >> 2;
+ }
+ }
+ else if( j == 0 && !bAboveAvaillable )
+ {
+ pDst0[i] = ( pRecSrc0[2 * i] * 2 + pRecSrc0[2 * i - 1] + pRecSrc0[2 * i + 1] + 2 ) >> 2;
+ }
+ else
+ {
+ pDst0[i] = ( pRecSrc0[2 * i - iRecStride]
+ + pRecSrc0[2 * i ] * 4 + pRecSrc0[2 * i - 1] + pRecSrc0[2 * i + 1]
+ + pRecSrc0[2 * i + iRecStride]
+ + 4 ) >> 3;
+ }
}
else
{
- pDst0[i] = ( pRecSrc0[2 * i ] * 2 + pRecSrc0[2 * i + 1 ] + pRecSrc0[2 * i - 1 ]
- + pRecSrc0[2 * i + iRecStride] * 2 + pRecSrc0[2 * i + 1 + iRecStride] + pRecSrc0[2 * i - 1 + iRecStride]
- + 4 ) >> 3;
+#endif
+ if( i == 0 && !bLeftAvaillable )
+ {
+ pDst0[i] = ( pRecSrc0[2 * i] + pRecSrc0[2 * i + iRecStride] + 1 ) >> 1;
+ }
+ else
+ {
+ pDst0[i] = ( pRecSrc0[2 * i ] * 2 + pRecSrc0[2 * i + 1 ] + pRecSrc0[2 * i - 1 ]
+ + pRecSrc0[2 * i + iRecStride] * 2 + pRecSrc0[2 * i + 1 + iRecStride] + pRecSrc0[2 * i - 1 + iRecStride]
+ + 4 ) >> 3;
+ }
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
}
+#endif
}
pDst0 += iDstStride;
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index ef0a5f0a462f792753d3f00b5fc731953337a905..d8d34437478fe4f0aa18a0fe71372a03096dade8 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -1736,6 +1736,9 @@ SPSNext::SPSNext( SPS& sps )
, m_IMV ( false )
, m_DisableMotionCompression ( false )
, m_LMChroma ( false )
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ , m_cclmCollocatedChromaFlag ( false )
+#endif
#if JVET_M0464_UNI_MTS
, m_IntraMTS ( false )
, m_InterMTS ( false )
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index cdc6d343d2634def9a44b69eefa4874c6a7791fa..47ba73064de90a171fad754909387eda2b23d9ef 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -804,6 +804,9 @@ private:
bool m_IMV; // 9
bool m_DisableMotionCompression; // 13
bool m_LMChroma; // 17
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ bool m_cclmCollocatedChromaFlag;
+#endif
#if JVET_M0464_UNI_MTS
bool m_IntraMTS; // 18
bool m_InterMTS; // 19
@@ -867,6 +870,10 @@ public:
#endif
void setUseLMChroma ( bool b ) { m_LMChroma = b; }
bool getUseLMChroma () const { return m_LMChroma; }
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ void setCclmCollocatedChromaFlag( bool b ) { m_cclmCollocatedChromaFlag = b; }
+ bool getCclmCollocatedChromaFlag() const { return m_cclmCollocatedChromaFlag; }
+#endif
#if JVET_M0464_UNI_MTS
void setUseIntraMTS ( bool b ) { m_IntraMTS = b; }
bool getUseIntraMTS () const { return m_IntraMTS; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 7029ef42ad544a0142db17b439aed082bfcd5a63..9c267b21e671fab3bd5d8d0b788244c32e90cbdf 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
+#define JVET_M0142_CCLM_COLLOCATED_CHROMA 1 // Adding support for chroma sample location type 2 in CCLM
+
#define JVET_M0479_18BITS_MV_CLIP 1
#define JVET_M0502_PRED_MODE_CTX 1
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 205f40dd008648fa26bd45f2f578d5e2d9732ea8..9ad45078c5d8d3a7046cea35f17f5e56b726ee56 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -792,6 +792,12 @@ void HLSyntaxReader::parseSPSNext( SPSNext& spsNext, const bool usePCM )
READ_FLAG( symbol, "imv_enable_flag" ); spsNext.setUseIMV ( symbol != 0 );
READ_FLAG( symbol, "disable_motion_compression_flag" ); spsNext.setDisableMotCompress ( symbol != 0 );
READ_FLAG( symbol, "lm_chroma_enabled_flag" ); spsNext.setUseLMChroma ( symbol != 0 );
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ if ( spsNext.getUseLMChroma() && spsNext.getSPS().getChromaFormatIdc() == CHROMA_420 )
+ {
+ READ_FLAG( symbol, "sps_cclm_collocated_chroma_flag" ); spsNext.setCclmCollocatedChromaFlag( symbol != 0 );
+ }
+#endif
#if JVET_M0464_UNI_MTS
READ_FLAG( symbol, "mts_intra_enabled_flag" ); spsNext.setUseIntraMTS ( symbol != 0 );
READ_FLAG( symbol, "mts_inter_enabled_flag" ); spsNext.setUseInterMTS ( symbol != 0 );
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 90fe26e0abf35ca73287fc19b8d381389512fb61..46bd3778de475d6ab1b492076cf63a9e41a29d8f 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -201,6 +201,9 @@ protected:
unsigned m_log2DiffMaxMinCodingBlockSize;
int m_LMChroma;
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ bool m_cclmCollocatedChromaFlag;
+#endif
#if JVET_M0464_UNI_MTS
int m_IntraMTS;
int m_InterMTS;
@@ -680,6 +683,10 @@ public:
void setUseLMChroma ( int n ) { m_LMChroma = n; }
int getUseLMChroma() const { return m_LMChroma; }
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ void setCclmCollocatedChromaFlag ( bool b ) { m_cclmCollocatedChromaFlag = b; }
+ bool getCclmCollocatedChromaFlag () const { return m_cclmCollocatedChromaFlag; }
+#endif
void setSubPuMvpMode(int n) { m_SubPuMvpMode = n; }
bool getSubPuMvpMode() const { return m_SubPuMvpMode; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 4b5b824d12c00624df937ffc884a97513aab95e8..a59d52d29645c60ab5dcb572d37de94f461e8db4 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -860,6 +860,9 @@ void EncLib::xInitSPS(SPS &sps)
sps.getSpsNext().setDisableMotCompress ( m_DisableMotionCompression );
sps.getSpsNext().setMTTMode ( m_MTTMode );
sps.getSpsNext().setUseLMChroma ( m_LMChroma ? true : false );
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ sps.getSpsNext().setCclmCollocatedChromaFlag( m_cclmCollocatedChromaFlag );
+#endif
#if ENABLE_WPP_PARALLELISM
sps.getSpsNext().setUseNextDQP ( m_AltDQPCoding );
#endif
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index ee01e5c32bb5c3d42305a5ec723afa8e6326842e..9932e7dba782316cfa59b6d8f8f9e6d963803341 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -532,6 +532,12 @@ void HLSWriter::codeSPSNext( const SPSNext& spsNext, const bool usePCM )
WRITE_FLAG( spsNext.getUseIMV() ? 1 : 0, "imv_enable_flag" );
WRITE_FLAG( spsNext.getDisableMotCompress() ? 1 : 0, "disable_motion_compression_flag" );
WRITE_FLAG( spsNext.getUseLMChroma() ? 1 : 0, "lm_chroma_enabled_flag" );
+#if JVET_M0142_CCLM_COLLOCATED_CHROMA
+ if ( spsNext.getUseLMChroma() && spsNext.getSPS().getChromaFormatIdc() == CHROMA_420 )
+ {
+ WRITE_FLAG( spsNext.getCclmCollocatedChromaFlag() ? 1 : 0, "sps_cclm_collocated_chroma_flag" );
+ }
+#endif
#if JVET_M0464_UNI_MTS
WRITE_FLAG( spsNext.getUseIntraMTS() ? 1 : 0, "mts_intra_enabled_flag" );
WRITE_FLAG( spsNext.getUseInterMTS() ? 1 : 0, "mts_inter_enabled_flag" );