source/App/DecoderApp/DecApp.cpp

@@ -124,6 +124,10 @@ uint32_t DecApp::decode()
 
   bool bPicSkipped = false;
 
+#if JVET_S0155_EOS_NALU_CHECK
+  bool isEosPresentInPu = false;
+#endif
+
   while (!!bitstreamFile)
   {
     InputNALUnit nalu;
@@ -194,6 +198,18 @@ uint32_t DecApp::decode()
           bPicSkipped = true;
         }
       }
+#if JVET_S0155_EOS_NALU_CHECK
+      // once an EOS NAL unit appears in the current PU, mark the variable isEosPresentInPu as true
+      if (nalu.m_nalUnitType == NAL_UNIT_EOS)
+      {
+        isEosPresentInPu = true;
+      }
+      // within the current PU, only EOS and EOB are allowed to be sent after an EOS nal unit
+      if(isEosPresentInPu)
+      {
+        CHECK(nalu.m_nalUnitType != NAL_UNIT_EOS && nalu.m_nalUnitType != NAL_UNIT_EOB, "When an EOS NAL unit is present in a PU, it shall be the last NAL unit among all NAL units within the PU other than other EOS NAL units or an EOB NAL unit");
+      }
+#endif
     }
 
     if ((bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS) && !m_cDecLib.getFirstSliceInSequence(nalu.m_nuhLayerId) && !bPicSkipped)
@@ -276,6 +292,10 @@ uint32_t DecApp::decode()
     {
       m_cDecLib.checkSeiInPictureUnit();
       m_cDecLib.resetPictureSeiNalus();
+#if JVET_S0155_EOS_NALU_CHECK
+      // reset the EOS present status for the next PU check
+      isEosPresentInPu = false;
+#endif
     }
     if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS)
     {

source/Lib/CommonLib/Slice.cpp

@@ -645,9 +645,15 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
 
   bool fieldSeqFlag = getSPS()->getFieldSeqFlag();
 
-
   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()))
+  {
+    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" );
+  }
+#endif
+
   for (int i = 0; i < numEntriesL0; i++)
   {
     if (m_pRPL0->isInterLayerRefPic(i))

source/Lib/CommonLib/TypeDef.h

@@ -53,6 +53,8 @@
 //########### place macros to be removed in next cycle below this line ###############
 #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
+
 #define JVET_S0074_SPS_REORDER                            1 // JVET-S0074: aspect 1, rearrange some syntax elements in SPS
 
 #define JVET_S0132_HLS_REORDER                            1 // Rearrange syntax elements in SPS and PPS
@@ -61,6 +63,17 @@
 
 #define JVET_S0052_RM_SEPARATE_COLOUR_PLANE               1 // JVET-S0052: Remove separate colour plane coding from VVC version 1
 
+#define JVET_S0063_VPS_SIGNALLING                         1 // Modifications to VPS signalling - conditionally signal vps_num_ptls_minus1
+
+#define JVET_S0065_SPS_INFERENCE_RULE                     1 // JVET_S0065_PROPOSAL1: Inference rule for sps_virtual_boundaries_present_flag
+
+#define JVET_S0155_EOS_NALU_CHECK                         1 // JVET-S0155: Constraints on EOS NAL units
+
+#define JVET_S0160_ASPECT1_ASPECT9                        1 // JVET-S0160: Aspect 1 Infer the value of pps_loop_filter_across_tiles_enabled_flag to be equal to 0 (instead of 1) when not present
+                                                            //             Aspect 9 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
+
+
+
 //########### place macros to be be kept below this line ###############
 #define JVET_S0257_DUMP_360SEI_MESSAGE                    1 // Software support of 360 SEI messages
 

source/Lib/DecoderLib/DecLib.cpp

@@ -455,6 +455,9 @@ DecLib::DecLib()
 {
 #if ENABLE_SIMD_OPT_BUFFER
   g_pelBufOP.initPelBufOpsX86();
+#endif
+#if JVET_S0155_EOS_NALU_CHECK
+  memset(m_prevEOS, false, sizeof(m_prevEOS));
 #endif
   memset(m_accessUnitEos, false, sizeof(m_accessUnitEos));
   for (int i = 0; i < MAX_VPS_LAYERS; i++)
@@ -893,6 +896,19 @@ void DecLib::xCreateUnavailablePicture(int iUnavailablePoc, bool longTermFlag, c
     m_pocRandomAccess = iUnavailablePoc;
   }
 }
+#if JVET_S0155_EOS_NALU_CHECK
+void DecLib::checkPicTypeAfterEos()
+{
+  int layerId = m_pcPic->slices[0]->getNalUnitLayerId();
+  if (m_prevEOS[layerId])
+  {
+    bool isIrapOrGdrPu = !m_pcPic->cs->pps->getMixedNaluTypesInPicFlag() && ( m_pcPic->slices[0]->isIRAP() || m_pcPic->slices[0]->getNalUnitType() == NAL_UNIT_CODED_SLICE_GDR );
+    CHECK(!isIrapOrGdrPu, "when present, the next PU of a particular layer after an EOS NAL unit that belongs to the same layer shall be an IRAP or GDR PU");
+
+    m_prevEOS[layerId] = false;
+  }
+}
+#endif
 
 void DecLib::checkLayerIdIncludedInCvss()
 {
@@ -923,6 +939,28 @@ void DecLib::checkLayerIdIncludedInCvss()
       }
       CHECK(!layerIdFind, "each picture in an AU in a CVS shall have nuh_layer_id equal to the nuh_layer_id of one of the pictures present in the first AU of the CVS");
     }
+
+
+#if JVET_S0155_EOS_NALU_CHECK
+    // check whether the layerID of EOS_NUT is included in the layerIDs of the first AU
+    for (int i = 0; i < getVPS()->getMaxLayers(); i++)
+    {
+      int eosLayerId = getVPS()->getLayerId(i);
+      if (m_accessUnitEos[eosLayerId])
+      {
+        bool eosLayerIdFind;
+        for (auto picFirst = m_firstAccessUnitPicInfo.begin(); picFirst != m_firstAccessUnitPicInfo.end(); picFirst++)
+        {
+          eosLayerIdFind = eosLayerId == picFirst->m_nuhLayerId ? true : false;
+          if (eosLayerIdFind)
+          {
+            break;
+          }
+        }
+        CHECK(!eosLayerIdFind, "When nal_unit_type is equal to EOS_NUT, nuh_layer_id shall be equal to one of the nuh_layer_id values of the layers present in the CVS");
+      }
+    }
+#endif
   }
 
   // update the value of m_isFirstAuInCvs for the next AU according to NAL_UNIT_EOS in each layer
@@ -2181,6 +2219,9 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
     m_pcPic->setDecodingOrderNumber(m_decodingOrderCounter);
     m_decodingOrderCounter++;
     m_pcPic->setPictureType(nalu.m_nalUnitType);
+#if JVET_S0155_EOS_NALU_CHECK
+    checkPicTypeAfterEos();
+#endif
     // store sub-picture numbers, sizes, and locations with a picture
     pcSlice->getPic()->numSubpics = sps->getNumSubPics();
     pcSlice->getPic()->subpicWidthInCTUs.clear();
@@ -2735,6 +2776,9 @@ bool DecLib::decode(InputNALUnit& nalu, int& iSkipFrame, int& iPOCLastDisplay, i
       m_prevSliceSkipped = false;
       m_skippedPOC = 0;
       m_accessUnitEos[nalu.m_nuhLayerId] = true;
+#if JVET_S0155_EOS_NALU_CHECK
+      m_prevEOS[nalu.m_nuhLayerId] = true;
+#endif
       return false;
 
     case NAL_UNIT_ACCESS_UNIT_DELIMITER:

source/Lib/DecoderLib/DecLib.h

@@ -85,6 +85,9 @@ private:
   int                     m_prevIRAPSubpicDecOrderNo[MAX_VPS_LAYERS][MAX_NUM_SUB_PICS];
   int                     m_pocRandomAccess;   ///< POC number of the random access point (the first IDR or CRA picture)
   int                     m_lastRasPoc;
+#if JVET_S0155_EOS_NALU_CHECK
+  bool                    m_prevEOS[MAX_VPS_LAYERS];
+#endif
 
   PicList                 m_cListPic;         //  Dynamic buffer
   ParameterSetManager     m_parameterSetManager;  // storage for parameter sets
@@ -217,6 +220,9 @@ public:
   void  finishPictureLight(int& poc, PicList*& rpcListPic );
   void  checkNoOutputPriorPics (PicList* rpcListPic);
   void  checkNalUnitConstraints( uint32_t naluType );
+#if JVET_S0155_EOS_NALU_CHECK
+  void  checkPicTypeAfterEos();
+#endif
   void  updateAssociatedIRAP();
   void  updatePrevGDRInSameLayer();
   void  updatePrevIRAPAndGDRSubpic();

source/Lib/DecoderLib/VLCReader.cpp

@@ -518,7 +518,11 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
     }
     else
     {
+#if JVET_S0160_ASPECT1_ASPECT9
+      pcPPS->setLoopFilterAcrossTilesEnabledFlag(false);
+#else
       pcPPS->setLoopFilterAcrossTilesEnabledFlag(true);
+#endif
       uiCode = 1;
     }
     pcPPS->setRectSliceFlag(uiCode == 1);
@@ -1978,6 +1982,12 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
     pcSPS->setNumHorVirtualBoundaries( 0 );
   }
   }
+#if JVET_S0065_SPS_INFERENCE_RULE
+  else
+  {
+    pcSPS->setVirtualBoundariesPresentFlag(false);
+  }
+#endif
 
   if (pcSPS->getPtlDpbHrdParamsPresentFlag())
   {
@@ -2199,10 +2209,20 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
         }
       }
     }
+#if JVET_S0063_VPS_SIGNALLING
+    READ_CODE(8, uiCode, "vps_num_ptls_minus1");      pcVPS->setNumPtls(uiCode + 1);
+#endif
   }
-
+#if JVET_S0063_VPS_SIGNALLING
+  else
+  {
+    pcVPS->setNumPtls(1);
+  }
+#endif
   pcVPS->deriveOutputLayerSets();
+#if !JVET_S0063_VPS_SIGNALLING
   READ_CODE(8, uiCode, "vps_num_ptls_minus1");        pcVPS->setNumPtls(uiCode + 1);
+#endif
   CHECK( uiCode >= pcVPS->getTotalNumOLSs(),"The value of vps_num_ptls_minus1 shall be less than TotalNumOlss");
   std::vector<bool> isPTLReferred( pcVPS->getNumPtls(), false);
 
@@ -3348,6 +3368,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
   CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getRplInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, rpl_info_in_ph_flag shall be equal to 0");
   CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getDbfInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, dbf_info_in_ph_flag shall be equal to 0");
   CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getSaoInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, sao_info_in_ph_flag shall be equal to 0");
+#if JVET_S0049_ASPECT4
+  CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getAlfInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, alf_info_in_ph_flag shall be equal to 0");
+#endif
   CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getWpInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, wp_info_in_ph_flag shall be equal to 0");
   CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getQpDeltaInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, qp_delta_info_in_ph_flag shall be equal to 0");
   CHECK(pcSlice->getPictureHeaderInSliceHeader() && sps->getSubPicInfoPresentFlag() == 1, "When sps_subpic_info_present_flag is equal to 1, the value of sh_picture_header_in_slice_header_flag shall be equal to 0");

source/Lib/EncoderLib/VLCWriter.cpp

@@ -1383,10 +1383,16 @@ 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");
+    WRITE_CODE(pcVPS->getNumPtls() - 1, 8, "vps_num_ptls_minus1");
+#endif
   }
 
   int totalNumOlss = pcVPS->getTotalNumOLSs();
+#if !JVET_S0063_VPS_SIGNALLING
   WRITE_CODE(pcVPS->getNumPtls() - 1, 8, "vps_num_ptls_minus1");
+#endif
   for (int i = 0; i < pcVPS->getNumPtls(); i++)
   {
     if(i > 0)