diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 82bf71de50cb8a9786b8a8826957b157e2af6e23..99a0accfc1c82332738121c3c58236120036bb76 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -53,9 +53,7 @@ Slice::Slice()
, m_iAssociatedIRAPType ( NAL_UNIT_INVALID )
, m_rpl0Idx ( -1 )
, m_rpl1Idx ( -1 )
-#if JVET_Q0155_COLOUR_ID
, m_colourPlaneId ( 0 )
-#endif
, m_eNalUnitType ( NAL_UNIT_CODED_SLICE_IDR_W_RADL )
#if JVET_Q0775_PH_IN_SH
, m_pictureHeaderInSliceHeader ( false )
@@ -167,9 +165,7 @@ void Slice::initSlice()
m_aiNumRefIdx[i] = 0;
}
m_colFromL0Flag = true;
-#if JVET_Q0155_COLOUR_ID
m_colourPlaneId = 0;
-#endif
m_colRefIdx = 0;
#if JVET_Q0346_LMCS_ENABLE_IN_SH
m_lmcsEnabledFlag = 0;
@@ -2205,9 +2201,6 @@ PicHeader::PicHeader()
, m_virtualBoundariesPresentFlag ( 0 )
, m_numVerVirtualBoundaries ( 0 )
, m_numHorVirtualBoundaries ( 0 )
-#if !JVET_Q0155_COLOUR_ID
-, m_colourPlaneId ( 0 )
-#endif
, m_picOutputFlag ( true )
, m_pRPL0 ( 0 )
, m_pRPL1 ( 0 )
@@ -2306,9 +2299,6 @@ void PicHeader::initPicHeader()
m_virtualBoundariesPresentFlag = 0;
m_numVerVirtualBoundaries = 0;
m_numHorVirtualBoundaries = 0;
-#if !JVET_Q0155_COLOUR_ID
- m_colourPlaneId = 0;
-#endif
m_picOutputFlag = true;
m_pRPL0 = 0;
m_pRPL1 = 0;
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 7a0efd80a29bc95ec7d1fbf21fffe6eff33b755d..34b58a56a4168df094e76d8bf019e16cded63248 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2242,9 +2242,6 @@ private:
unsigned m_numHorVirtualBoundaries; //!< number of horizontal virtual boundaries
unsigned m_virtualBoundariesPosX[3]; //!< horizontal virtual boundary positions
unsigned m_virtualBoundariesPosY[3]; //!< vertical virtual boundary positions
-#if !JVET_Q0155_COLOUR_ID
- unsigned m_colourPlaneId; //!< 4:4:4 colour plane ID
-#endif
bool m_picOutputFlag; //!< picture output flag
const ReferencePictureList
*m_pRPL0; //!< pointer to RPL for L0, either in the SPS or the local RPS in the picture header
@@ -2353,10 +2350,6 @@ public:
unsigned getVirtualBoundariesPosX(unsigned idx) const { CHECK( idx >= 3, "boundary index exceeds valid range" ); return m_virtualBoundariesPosX[idx];}
void setVirtualBoundariesPosY(unsigned u, unsigned idx) { CHECK( idx >= 3, "boundary index exceeds valid range" ); m_virtualBoundariesPosY[idx] = u; }
unsigned getVirtualBoundariesPosY(unsigned idx) const { CHECK( idx >= 3, "boundary index exceeds valid range" ); return m_virtualBoundariesPosY[idx];}
-#if !JVET_Q0155_COLOUR_ID
- void setColourPlaneId(unsigned u) { m_colourPlaneId = u; }
- unsigned getColourPlaneId() const { return m_colourPlaneId; }
-#endif
void setPicOutputFlag( bool b ) { m_picOutputFlag = b; }
bool getPicOutputFlag() const { return m_picOutputFlag; }
void setRPL( bool b, const ReferencePictureList *pcRPL) { if(b==1) { m_pRPL1 = pcRPL; } else { m_pRPL0 = pcRPL; } }
@@ -2549,9 +2542,7 @@ private:
ReferencePictureList m_localRPL1; //< RPL for L1 when present in slice header
int m_rpl0Idx; //< index of used RPL in the SPS or -1 for local RPL in the slice header
int m_rpl1Idx; //< index of used RPL in the SPS or -1 for local RPL in the slice header
-#if JVET_Q0155_COLOUR_ID
int m_colourPlaneId; //!< 4:4:4 colour plane ID
-#endif
NalUnitType m_eNalUnitType; ///< Nal unit type for the slice
#if JVET_Q0775_PH_IN_SH
bool m_pictureHeaderInSliceHeader;
@@ -2813,10 +2804,8 @@ public:
bool isPocRestrictedByDRAP( int poc, bool precedingDRAPinDecodingOrder );
bool isPOCInRefPicList( const ReferencePictureList *rpl, int poc );
void checkConformanceForDRAP( uint32_t temporalId );
-#if JVET_Q0155_COLOUR_ID
void setColourPlaneId( int id ) { m_colourPlaneId = id; }
int getColourPlaneId() const { return m_colourPlaneId; }
-#endif
void setLambdas( const double lambdas[MAX_NUM_COMPONENT] ) { for (int component = 0; component < MAX_NUM_COMPONENT; component++) m_lambdas[component] = lambdas[component]; }
const double* getLambdas() const { return m_lambdas; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 11edc332800189e02155139ebe0aee633dfabb44..73a7190e4e9af18886ac6dfdecb569c87727022a 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -129,7 +129,6 @@
-#define JVET_Q0155_COLOUR_ID 1 // JVET-Q0155: move colour_plane_id from PH to SH
#define JVET_Q0444_AMVR_SIGNALLING 1 // JVET-Q0444: Conditional signaling of sps_affine_amvr_enabled_flag based on sps_amvr_enabled_flag
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 92b31be27d5194036443a67a96c795a857ac9d58..c617951b5151d9ae1282564d263bafd27005db00 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2638,18 +2638,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
}
}
-#if !JVET_Q0155_COLOUR_ID
- // 4:4:4 colour plane ID
- if( sps->getSeparateColourPlaneFlag() )
- {
- READ_CODE( 2, uiCode, "colour_plane_id" ); picHeader->setColourPlaneId( uiCode );
- CHECK(uiCode > 2, "colour_plane_id exceeds valid range");
- }
- else
- {
- picHeader->setColourPlaneId( 0 );
- }
-#endif
// picture output flag
if( pps->getOutputFlagPresentFlag() )
@@ -3465,7 +3453,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
#endif
}
-#if JVET_Q0155_COLOUR_ID
// 4:4:4 colour plane ID
if( sps->getSeparateColourPlaneFlag() )
{
@@ -3476,7 +3463,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
pcSlice->setColourPlaneId( 0 );
}
-#endif
if( pps->getRplInfoInPhFlag() )
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index cd9c370787a36fdb01cfe54ccce33b28b007730e..f703aece3d127b0fbcf54ea3208f6d9050416cc1 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1730,17 +1730,6 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
}
}
-#if !JVET_Q0155_COLOUR_ID
- // 4:4:4 colour plane ID
- if( sps->getSeparateColourPlaneFlag() )
- {
- WRITE_CODE( picHeader->getColourPlaneId(), 2, "colour_plane_id" );
- }
- else
- {
- picHeader->setColourPlaneId( 0 );
- }
-#endif
// picture output flag
if( pps->getOutputFlagPresentFlag() )
@@ -2249,13 +2238,11 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
}
}
-#if JVET_Q0155_COLOUR_ID
// 4:4:4 colour plane ID
if( pcSlice->getSPS()->getSeparateColourPlaneFlag() )
{
WRITE_CODE( pcSlice->getColourPlaneId(), 2, "colour_plane_id" );
}
-#endif
if( !pcSlice->getPPS()->getRplInfoInPhFlag() && (!pcSlice->getIdrPicFlag() || pcSlice->getSPS()->getIDRRefParamListPresent()))
{