diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 9b7364e25bed551835b18440df3eef810a2d8b03..e29345ba920aec29aab74d952448e1d04e6ab1d6 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2317,9 +2317,6 @@ private:
int m_numAlfAps; //!< number of alf aps active for the picture
std::vector<int> m_alfApsId; //!< list of alf aps for the picture
int m_alfChromaApsId; //!< chroma alf aps ID
-#if !JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
- int m_alfChromaIdc; //!< alf chroma idc
-#endif
bool m_ccalfEnabledFlag[MAX_NUM_COMPONENT];
int m_ccalfCbApsId;
int m_ccalfCrApsId;
@@ -2451,10 +2448,6 @@ public:
int getNumAlfAps() const { return m_numAlfAps; }
void setAlfApsIdChroma(int i) { m_alfChromaApsId = i; }
int getAlfApsIdChroma() const { return m_alfChromaApsId; }
-#if !JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
- void setAlfChromaIdc(int i) { m_alfChromaIdc = i; }
- int getAlfChromaIdc() const { return m_alfChromaIdc; }
-#endif
void setCcAlfEnabledFlag(ComponentID compId, bool b) { m_ccalfEnabledFlag[compId] = b; }
bool getCcAlfEnabledFlag(ComponentID compId) const { return m_ccalfEnabledFlag[compId]; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 575d36122b67355d6db26dc071e40c09f5d14936..68d5d72a8d00c178c3ed297829ed8c22431a37f9 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -105,7 +105,6 @@
-#define JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA 1 // Use two separate flags (one for Cb, one for Cr) to replace ph_alf_chroma_idc in PH and sh_alf_chroma_idc in SH
#define JVET_R0266_DESC 1 // JVET-R0266: change the signalling of the PPS ID from ue(v) to u(6); Code virtual boundary positions using ue(v)
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 071ca845a9523166690e8ea3d3557024a0a13511..4cc83be45ba5b7fb3889650ea3eeb600bab9cb83 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2616,12 +2616,8 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
READ_FLAG(uiCode, "ph_alf_enabled_flag");
picHeader->setAlfEnabledFlag(COMPONENT_Y, uiCode);
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
int alfCbEnabledFlag = 0;
int alfCrEnabledFlag = 0;
-#else
- int alfChromaIdc = 0;
-#endif
if (uiCode)
{
READ_CODE(3, uiCode, "ph_num_alf_aps_ids_luma");
@@ -2638,29 +2634,15 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
if (sps->getChromaFormatIdc() != CHROMA_400)
{
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
READ_CODE(1, uiCode, "ph_alf_cb_enabled_flag"); alfCbEnabledFlag = uiCode;
READ_CODE(1, uiCode, "ph_alf_cr_enabled_flag"); alfCrEnabledFlag = uiCode;
-#else
- READ_CODE(2, uiCode, "ph_alf_chroma_idc");
- alfChromaIdc = uiCode;
-#endif
}
else
{
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
alfCbEnabledFlag = 0;
alfCrEnabledFlag = 0;
-#else
- alfChromaIdc = 0;
-#endif
}
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
if (alfCbEnabledFlag || alfCrEnabledFlag)
-#else
- picHeader->setAlfChromaIdc(alfChromaIdc);
- if (alfChromaIdc)
-#endif
{
READ_CODE(3, uiCode, "ph_alf_aps_id_chroma");
picHeader->setAlfApsIdChroma(uiCode);
@@ -2692,13 +2674,8 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
{
picHeader->setNumAlfAps(0);
}
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
picHeader->setAlfEnabledFlag(COMPONENT_Cb, alfCbEnabledFlag);
picHeader->setAlfEnabledFlag(COMPONENT_Cr, alfCrEnabledFlag);
-#else
- picHeader->setAlfEnabledFlag(COMPONENT_Cb, alfChromaIdc & 1);
- picHeader->setAlfEnabledFlag(COMPONENT_Cr, alfChromaIdc >> 1);
-#endif
}
else
{
@@ -3471,11 +3448,7 @@ void HLSyntaxReader::checkAlfNaluTidAndPicTid(Slice* pcSlice, PicHeader* picHea
}
}
//chroma
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
if (picHeader->getAlfEnabledFlag(COMPONENT_Cb) || picHeader->getAlfEnabledFlag(COMPONENT_Cr))
-#else
- if (picHeader->getAlfChromaIdc())
-#endif
{
int chromaAlfApsId = picHeader->getAlfApsIdChroma();
aps = parameterSetManager->getAPS(chromaAlfApsId, ALF_APS);
@@ -3714,12 +3687,8 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
READ_FLAG(uiCode, "slice_alf_enabled_flag");
pcSlice->setTileGroupAlfEnabledFlag(COMPONENT_Y, uiCode);
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
int alfCbEnabledFlag = 0;
int alfCrEnabledFlag = 0;
-#else
- int alfChromaIdc = 0;
-#endif
if (uiCode)
{
@@ -3740,27 +3709,15 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setAlfAPSs(apsId);
if (bChroma)
{
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
READ_CODE(1, uiCode, "slice_alf_cb_enabled_flag"); alfCbEnabledFlag = uiCode;
READ_CODE(1, uiCode, "slice_alf_cr_enabled_flag"); alfCrEnabledFlag = uiCode;
-#else
- READ_CODE(2, uiCode, "slice_alf_chroma_idc"); alfChromaIdc = uiCode;
-#endif
}
else
{
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
alfCbEnabledFlag = 0;
alfCrEnabledFlag = 0;
-#else
- alfChromaIdc = 0;
-#endif
}
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
if (alfCbEnabledFlag || alfCrEnabledFlag)
-#else
- if (alfChromaIdc)
-#endif
{
READ_CODE(3, uiCode, "slice_alf_aps_id_chroma");
pcSlice->setTileGroupApsIdChroma(uiCode);
@@ -3773,13 +3730,8 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
pcSlice->setTileGroupNumAps(0);
}
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
pcSlice->setTileGroupAlfEnabledFlag(COMPONENT_Cb, alfCbEnabledFlag);
pcSlice->setTileGroupAlfEnabledFlag(COMPONENT_Cr, alfCrEnabledFlag);
-#else
- pcSlice->setTileGroupAlfEnabledFlag(COMPONENT_Cb, alfChromaIdc & 1);
- pcSlice->setTileGroupAlfEnabledFlag(COMPONENT_Cr, alfChromaIdc >> 1);
-#endif
CcAlfFilterParam &filterParam = pcSlice->m_ccAlfFilterParam;
if (sps->getCCALFEnabledFlag() && pcSlice->getTileGroupAlfEnabledFlag(COMPONENT_Y))
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index e127ef0f5376885c1dc17a7eeb621f8abf1abc06..133e593a0da3f80b2df1e7e947af9cea5e338014 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1630,12 +1630,8 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader, bool writeRbspTrailingB
const int alfChromaIdc = picHeader->getAlfEnabledFlag(COMPONENT_Cb) + picHeader->getAlfEnabledFlag(COMPONENT_Cr) * 2 ;
if (sps->getChromaFormatIdc() != CHROMA_400)
{
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
WRITE_CODE(picHeader->getAlfEnabledFlag(COMPONENT_Cb), 1, "ph_alf_cb_enabled_flag");
WRITE_CODE(picHeader->getAlfEnabledFlag(COMPONENT_Cr), 1, "ph_alf_cr_enabled_flag");
-#else
- WRITE_CODE(alfChromaIdc, 2, "ph_alf_chroma_idc");
-#endif
}
if (alfChromaIdc)
{
@@ -2244,12 +2240,8 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
const int alfChromaIdc = pcSlice->getTileGroupAlfEnabledFlag(COMPONENT_Cb) + pcSlice->getTileGroupAlfEnabledFlag(COMPONENT_Cr) * 2;
if (chromaEnabled)
{
-#if JVET_R0225_SEPERATE_FLAGS_ALF_CHROMA
WRITE_CODE(pcSlice->getTileGroupAlfEnabledFlag(COMPONENT_Cb), 1, "slice_alf_cb_enabled_flag");
WRITE_CODE(pcSlice->getTileGroupAlfEnabledFlag(COMPONENT_Cr), 1, "slice_alf_cr_enabled_flag");
-#else
- WRITE_CODE(alfChromaIdc, 2, "slice_alf_chroma_idc");
-#endif
}
if (alfChromaIdc)
{