diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg
index b8f56a639be226f930cb7f1116f836b8035e5e7a..7676e21f1f6af487cc05626cd1f635789f7f86fc 100644
--- a/cfg/encoder_randomaccess_vtm.cfg
+++ b/cfg/encoder_randomaccess_vtm.cfg
@@ -45,7 +45,7 @@ FEN : 1 # Fast encoder decision
FDM : 1 # Fast Decision for Merge RD cost
#======== Quantization =============
-QP : 32 # Quantization parameter(0-51)
+QP : 42 # Quantization parameter(0-51)
MaxDeltaQP : 0 # CU-based multi-QP optimization
MaxCuDQPSubdiv : 0 # Maximum subdiv for CU luma Qp adjustment
DeltaQpRD : 0 # Slice-based multi-QP optimization
@@ -92,7 +92,12 @@ InitialQP : 0 # Rate control: initial Q
RCForceIntraQP : 0 # Rate control: force intra QP to be equal to initial QP
#============ VTM settings ======================
+<<<<<<< HEAD
SEIDecodedPictureHash : 0
+=======
+LoopFilterTcOffset_div2 : 0
+SEIDecodedPictureHash : 1
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
CbQpOffset : 0
CrQpOffset : 0
SameCQPTablesForAllChroma : 1
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 410e7fbf61fb711cbf35e9fc4ffb43806c6a65fd..f4303ee086c6de4be748961621b56b0135f55b48 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -880,10 +880,15 @@ public:
const ProfileTierLevel& getProfileTierLevel(int idx) const { return m_profileTierLevel[idx]; }
};
<<<<<<< HEAD
+<<<<<<< HEAD
=======
#endif
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+#endif
+
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
class VPS
{
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index f54d4a9b7fae9da62b2717b17feaf44a16f04e5a..9690fd43cf5a7c99525d79e7380750a627f6cebf 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -144,6 +144,7 @@
#define JVET_Q0820_ACT 1 // JVET-Q0820: ACT bug fixes and reversible ACT transform
+<<<<<<< HEAD
<<<<<<< HEAD
#define JVET_Q0814_DPB 1 // JVET-Q0814: DPB capacity is based on picture units regardless of the resoltuion
#define ENABLING_MULTI_SPS 1 // Bug fix to enable multiple SPS
@@ -151,6 +152,9 @@
=======
#define JVET_Q0117_PARAMETER_SETS_CLEANUP 1 // JVET-Q0117: cleanups on parameter sets
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+#define JVET_Q0117_PARAMETER_SETS_CLEANUP 1 // JVET-Q0117: cleanups on parameter sets
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
#define JVET_Q0353_ACT_SW_FIX 1 // JVET-Q0353: Bug fix of ACT
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 68730ab9527392d54ca9a7608277aab6ef29fc6c..13f08cb8c4c63a95e7bd42c82fc786ff193af25f 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -716,13 +716,19 @@ protected:
#if !JVET_Q0814_DPB
VPS m_cVPS;
<<<<<<< HEAD
+<<<<<<< HEAD
#endif
=======
+=======
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
#if JVET_Q0117_PARAMETER_SETS_CLEANUP
DCI m_dci;
bool m_DCIEnabled; ///< enable DCI
#else
+<<<<<<< HEAD
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
DPS m_dps;
bool m_decodingParameterSetEnabled; ///< enable decoding parameter set
#endif
@@ -1849,14 +1855,20 @@ public:
void setVPS(VPS *p) { m_cVPS = *p; }
VPS * getVPS() { return &m_cVPS; }
<<<<<<< HEAD
+<<<<<<< HEAD
#endif
=======
+=======
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
#if JVET_Q0117_PARAMETER_SETS_CLEANUP
void setDCI(DCI *p) { m_dci = *p; }
DCI* getDCI() { return &m_dci; }
#else
+<<<<<<< HEAD
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
void setDPS(DPS *p) { m_dps = *p; }
DPS* getDPS() { return &m_dps; }
#endif
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index d6752b2cf7566b671e088531152ff9e894a2e971..2fde5d20ce3ce746c2a5b06fd07da2c0314f3b1d 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -412,9 +412,12 @@ int EncGOP::xWriteParameterSets(AccessUnit &accessUnit, Slice *slice, const bool
actualTotalBits += xWriteDPS( accessUnit, m_pcEncLib->getDPS() );
#endif
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
if( m_pcEncLib->SPSNeedsWriting( slice->getSPS()->getSPSId() ) ) // Note this assumes that all changes to the SPS are made at the EncLib level prior to picture creation (EncLib::xGetNewPicBuffer).
{
CHECK( !( bSeqFirst ), "Unspecified error" ); // Implementations that use more than 1 SPS need to be aware of activation issues.
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 0f73677b929107ec820bfd9adede76576fb52cef..0b3dee4fcfb7a268c033f40ff5c684900839e394 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -239,6 +239,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
xInitSPS( sps0, m_cVPS );
xInitVPS(m_cVPS, sps0);
<<<<<<< HEAD
+<<<<<<< HEAD
#endif
=======
@@ -246,6 +247,12 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
xInitDCI(m_dci, sps0);
#else
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+#if JVET_Q0117_PARAMETER_SETS_CLEANUP
+ int dciId = getDCIEnabled() ? 1 : 0;
+ xInitDCI(m_dci, sps0);
+#else
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
int dpsId = getDecodingParameterSetEnabled() ? 1 : 0;
xInitDPS(m_dps, sps0, dpsId);
sps0.setDecodingParameterSetId(m_dps.getDecodingParameterSetId());
diff --git a/source/Lib/EncoderLib/EncLib.h b/source/Lib/EncoderLib/EncLib.h
index 6fe267ae39a078b0cdc815199f4100834b563707..8538855cccc5dc611882d868ec101c4556856bbc 100644
--- a/source/Lib/EncoderLib/EncLib.h
+++ b/source/Lib/EncoderLib/EncLib.h
@@ -184,7 +184,10 @@ protected:
#else
void xInitDPS (DPS &dps, const SPS &sps, const int dpsId); ///< initialize DPS from encoder options
#endif
+<<<<<<< HEAD
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
void xInitSPS ( SPS& sps, VPS& vps ); ///< initialize SPS from encoder options
#endif
void xInitPPS (PPS &pps, const SPS &sps); ///< initialize PPS from encoder options
diff --git a/source/Lib/EncoderLib/VLCWriter.h b/source/Lib/EncoderLib/VLCWriter.h
index 26f0221d5a3596b798f725fa968d227dcc0af970..f69aef8077a311022a6e115b1a5bd626600b3b11 100644
--- a/source/Lib/EncoderLib/VLCWriter.h
+++ b/source/Lib/EncoderLib/VLCWriter.h
@@ -136,12 +136,16 @@ public:
#else
void codeDPS ( const DPS* dps );
<<<<<<< HEAD
+<<<<<<< HEAD
#if JVET_Q0775_PH_IN_SH
void codePictureHeader ( PicHeader* picHeader, bool writeRbspTrailingBits );
#else
=======
#endif
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
+=======
+#endif
+>>>>>>> f765570c... Commit Q0117. HLS clenup: DPS is changed to DCI
void codePictureHeader ( PicHeader* picHeader );
#endif
void codeSliceHeader ( Slice* pcSlice );