source/App/EncoderApp/EncAppCfg.cpp

@@ -2563,6 +2563,7 @@ bool EncAppCfg::xCheckParameter()
 #endif
 #if SHARP_LUMA_DELTA_QP
   xConfirmPara( m_lumaLevelToDeltaQPMapping.mode && m_uiDeltaQpRD > 0,                      "Luma-level-based Delta QP cannot be used together with slice level multiple-QP optimization\n" );
+  xConfirmPara( m_lumaLevelToDeltaQPMapping.mode && m_RCEnableRateControl,                  "Luma-level-based Delta QP cannot be used together with rate control\n" );
 #endif
   if (m_lumaLevelToDeltaQPMapping.mode && m_lmcsEnabled)
   {

source/Lib/CommonLib/Slice.cpp

@@ -648,7 +648,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
   int layerIdx = m_pcPic->cs->vps == nullptr ? 0 : m_pcPic->cs->vps->getGeneralLayerIdx(m_pcPic->layerId);
 
 #if JVET_S0160_ASPECT1_ASPECT9
-  if (!m_pcPic->cs->vps->getIndependentLayerFlag(layerIdx) && (pRPL0->getNumberOfInterLayerPictures() || pRPL1->getNumberOfInterLayerPictures()))
+  if ( m_pcPic->cs->vps && !m_pcPic->cs->vps->getIndependentLayerFlag(layerIdx) && (pRPL0->getNumberOfInterLayerPictures() || pRPL1->getNumberOfInterLayerPictures()))
   {
     CHECK( getPicHeader()->getPocMsbPresentFlag(), "The value of ph_poc_msb_cycle_present_flag is required to be equal to 0 when vps_independent_layer_flag[GeneralLayerIdx[nuh_layer_id]] is equal to 0 and there is an ILRP entry in RefPicList[0] or RefPicList[1] of a slice of the current picture" );
   }

source/Lib/CommonLib/TypeDef.h

@@ -51,6 +51,8 @@
 #include <cassert>
 
 //########### place macros to be removed in next cycle below this line ###############
+#define JVET_S0133_PH_SYNTAX_OVERRIDE_ENC_FIX             1 // JVET-S0133: Encoder-only fix on the override of partition constriants in PH
+
 #define JVET_S0179_CONDITIONAL_SIGNAL_GCI                 1 // JVET-S0179: Conditional signalling of GCI fields
 
 #define JVET_S0049_ASPECT4                                1 // JVET-S0049 aspect 4: Constrain the value of pps_alf_info_in_ph_flag to be equal to 0 when the PH is in the SH

source/Lib/DecoderLib/VLCReader.cpp

@@ -4484,7 +4484,8 @@ void HLSyntaxReader::parseConstraintInfo(ConstraintInfo *cinfo)
     READ_FLAG(symbol, "no_aps_constraint_flag");                     cinfo->setNoApsConstraintFlag(symbol > 0 ? true : false);
 #if JVET_S0179_CONDITIONAL_SIGNAL_GCI
     READ_CODE(8, symbol, "gci_num_reserved_bits");
-    for (int i = 0; i < symbol; i++)
+    uint32_t const numReservedBits = symbol;
+    for (int i = 0; i < numReservedBits; i++)
     {
       READ_FLAG(symbol, "gci_reserved_zero_bit");                    CHECK(symbol != 0, "gci_reserved_zero_bit not equal to zero");
     }

source/Lib/EncoderLib/EncCu.cpp

@@ -1040,7 +1040,10 @@ void EncCu::updateLambda (Slice* slice, const int dQP,
   {
     m_pcRdCost->setLambda (newLambda, slice->getSPS()->getBitDepths());
 #if WCG_EXT
-    m_pcRdCost->saveUnadjustedLambda();
+    if (!m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled())
+    {
+      m_pcRdCost->saveUnadjustedLambda();
+    }
 #endif
   }
 }

source/Lib/EncoderLib/EncGOP.cpp

@@ -2336,6 +2336,51 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
         m_uiPrevISlicePOC = pcSlice->getPOC();
         m_bInitAMaxBT = true;
       }
+#if JVET_S0133_PH_SYNTAX_OVERRIDE_ENC_FIX
+      bool identicalToSPS=true;
+      const SPS* sps =pcSlice->getSPS();
+
+      if (picHeader->getPicInterSliceAllowedFlag())
+      {
+        if (picHeader->getMinQTSize(pcSlice->getSliceType()) != pcSlice->getSPS()->getMinQTSize(pcSlice->getSliceType()) ||
+            picHeader->getMaxMTTHierarchyDepth(pcSlice->getSliceType()) != pcSlice->getSPS()->getMaxMTTHierarchyDepth() ||
+            picHeader->getMaxBTSize(pcSlice->getSliceType()) != pcSlice->getSPS()->getMaxBTSize() ||
+            picHeader->getMaxTTSize(pcSlice->getSliceType()) != pcSlice->getSPS()->getMaxTTSize()
+          )
+        {
+          identicalToSPS=false;
+        }
+      }
+
+      if (identicalToSPS && picHeader->getPicIntraSliceAllowedFlag())
+      {
+        if (picHeader->getMinQTSize(I_SLICE) != sps->getMinQTSize(I_SLICE) ||
+            picHeader->getMaxMTTHierarchyDepth(I_SLICE) != sps->getMaxMTTHierarchyDepthI() ||
+            picHeader->getMaxBTSize(I_SLICE) != sps->getMaxBTSizeI() ||
+            picHeader->getMaxTTSize(I_SLICE) != sps->getMaxTTSizeI()
+        )
+        {
+          identicalToSPS=false;
+        }
+
+        if (identicalToSPS && sps->getUseDualITree())
+        {
+          if (picHeader->getMinQTSize(I_SLICE, CHANNEL_TYPE_CHROMA) != sps->getMinQTSize(I_SLICE, CHANNEL_TYPE_CHROMA) ||
+              picHeader->getMaxMTTHierarchyDepth(I_SLICE, CHANNEL_TYPE_CHROMA) != sps->getMaxMTTHierarchyDepthIChroma() ||
+              picHeader->getMaxBTSize(I_SLICE, CHANNEL_TYPE_CHROMA) != sps->getMaxBTSizeIChroma() ||
+              picHeader->getMaxTTSize(I_SLICE, CHANNEL_TYPE_CHROMA) != sps->getMaxTTSizeIChroma()
+           )
+          {
+            identicalToSPS=false;
+          }
+        }
+      }
+
+      if (identicalToSPS)
+      {
+        picHeader->setSplitConsOverrideFlag(false);
+      }
+#endif
     }
 
     //  Slice info. refinement

source/Lib/EncoderLib/EncSlice.cpp

@@ -797,7 +797,10 @@ void EncSlice::resetQP( Picture* pic, int sliceQP, double lambda )
 #endif
   setUpLambda(slice, lambda, sliceQP);
 #if WCG_EXT
-  m_pcRdCost->saveUnadjustedLambda();
+  if (!m_pcCfg->getLumaLevelToDeltaQPMapping().isEnabled())
+  {
+    m_pcRdCost->saveUnadjustedLambda();
+  }
 #endif
 }
 

source/Lib/EncoderLib/VLCWriter.cpp

@@ -1384,7 +1384,7 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
       }
     }
 #if JVET_S0063_VPS_SIGNALLING
-    CHECK(pcVPS->getNumPtls() - 1 < pcVPS->getTotalNumOLSs(), "vps_num_ptls_minus1 shall be less than TotalNumOlss");
+    CHECK(pcVPS->getNumPtls() - 1 >= pcVPS->getTotalNumOLSs(), "vps_num_ptls_minus1 shall be less than TotalNumOlss");
     WRITE_CODE(pcVPS->getNumPtls() - 1, 8, "vps_num_ptls_minus1");
 #endif
   }