From 509bd3bedf51a7045ab1e72749b1b17faa2b126c Mon Sep 17 00:00:00 2001
From: Yang Wang <wangyang.cs@bytedance.com>
Date: Thu, 18 Jun 2020 08:51:40 +0200
Subject: [PATCH] JVET-R0068: Aspect 1 - slice_type constraint and Aspect 6 -
signalling of conformance window parameters
---
.../BitstreamExtractorApp.cpp | 4 +++
.../BitstreamExtractorApp.h | 3 +++
source/Lib/CommonLib/Slice.cpp | 3 +++
source/Lib/CommonLib/Slice.h | 7 ++++++
source/Lib/CommonLib/TypeDef.h | 2 ++
source/Lib/DecoderLib/DecLib.cpp | 10 ++++++++
source/Lib/DecoderLib/DecLib.h | 3 +++
source/Lib/DecoderLib/VLCReader.cpp | 25 +++++++++++++++++++
source/Lib/DecoderLib/VLCReader.h | 4 +++
9 files changed, 61 insertions(+)
diff --git a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
index 194bdf8f4..47d461883 100644
--- a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
+++ b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
@@ -116,7 +116,11 @@ bool BitstreamExtractorApp::xCheckSliceSubpicture(InputNALUnit &nalu, int target
slice.setNalUnitLayerId(nalu.m_nuhLayerId);
slice.setTLayer(nalu.m_temporalId);
+#if JVET_R0068_ASPECT1_ASPECT6
+ m_hlSynaxReader.parseSliceHeader(&slice, &m_picHeader, &m_parameterSetManager, m_prevTid0Poc, m_prevPicPOC);
+#else
m_hlSynaxReader.parseSliceHeader(&slice, &m_picHeader, &m_parameterSetManager, m_prevTid0Poc);
+#endif
PPS *pps = m_parameterSetManager.getPPS(m_picHeader.getPPSId());
CHECK (nullptr==pps, "referenced PPS not found");
diff --git a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.h b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.h
index d8af800df..5ad386ac2 100644
--- a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.h
+++ b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.h
@@ -88,6 +88,9 @@ protected:
PicHeader m_picHeader;
int m_prevTid0Poc;
+#if JVET_R0068_ASPECT1_ASPECT6
+ int m_prevPicPOC;
+#endif
std::vector<int> m_updatedVPSList;
std::vector<int> m_updatedSPSList;
std::vector<int> m_updatedPPSList;
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 0b447f32f..5c2102916 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2902,6 +2902,9 @@ PPS::PPS()
, m_wpInfoInPhFlag (0)
, m_qpDeltaInfoInPhFlag (0)
, m_mixedNaluTypesInPicFlag ( false )
+#if JVET_R0068_ASPECT1_ASPECT6
+, m_conformanceWindowFlag (false)
+#endif
, m_picWidthInLumaSamples(352)
, m_picHeightInLumaSamples( 288 )
#if JVET_Q0764_WRAP_AROUND_WITH_RPR
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 5eb49c23e..a44b05eee 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1997,6 +1997,9 @@ private:
bool m_qpDeltaInfoInPhFlag;
bool m_mixedNaluTypesInPicFlag;
+#if JVET_R0068_ASPECT1_ASPECT6
+ bool m_conformanceWindowFlag;
+#endif
uint32_t m_picWidthInLumaSamples;
uint32_t m_picHeightInLumaSamples;
Window m_conformanceWindow;
@@ -2247,6 +2250,10 @@ public:
void setPicHeightInLumaSamples( uint32_t u ) { m_picHeightInLumaSamples = u; }
uint32_t getPicHeightInLumaSamples() const { return m_picHeightInLumaSamples; }
+#if JVET_R0068_ASPECT1_ASPECT6
+ void setConformanceWindowFlag(bool flag) { m_conformanceWindowFlag = flag; }
+ bool getConformanceWindowFlag() const { return m_conformanceWindowFlag; }
+#endif
Window& getConformanceWindow() { return m_conformanceWindow; }
const Window& getConformanceWindow() const { return m_conformanceWindow; }
void setConformanceWindow( Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 013b045e5..423adcf7d 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
+#define JVET_R0068_ASPECT1_ASPECT6 1 // JVET-R0068 aspect 1: On slice_type constraint; JVET-R0068 aspect 6: On signalling of conformance window parameters
+
//########### place macros to be removed in next cycle below this line ###############
#define JVET_R0080 1 // JVET-R0080, Change the syntax condition for pps_tile_idx_delta_present_flag. When the value of pps_num_slices_in_pic_minus1 is greater than 1 instead of 0, the syntax element of pps_tile_idx_delta_present_flag is signalled.
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 417fe4d83..5f5a52efe 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -427,6 +427,9 @@ DecLib::DecLib()
, m_pcPic(NULL)
, m_prevLayerID(MAX_INT)
, m_prevPOC(MAX_INT)
+#if JVET_R0068_ASPECT1_ASPECT6
+ , m_prevPicPOC(MAX_INT)
+#endif
, m_prevTid0POC(0)
, m_bFirstSliceInPicture(true)
, m_firstSliceInSequence{ true }
@@ -696,6 +699,9 @@ void DecLib::finishPicture(int& poc, PicList*& rpcListPic, MsgLevel msgl )
#endif
Slice* pcSlice = m_pcPic->cs->slice;
+#if JVET_R0068_ASPECT1_ASPECT6
+ m_prevPicPOC = pcSlice->getPOC();
+#endif
char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
if (!m_pcPic->referenced)
@@ -1825,7 +1831,11 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
m_HLSReader.setBitstream( &nalu.getBitstream() );
m_apcSlicePilot->m_ccAlfFilterParam = m_cALF.getCcAlfFilterParam();
+#if JVET_R0068_ASPECT1_ASPECT6
+ m_HLSReader.parseSliceHeader( m_apcSlicePilot, &m_picHeader, &m_parameterSetManager, m_prevTid0POC, m_prevPicPOC );
+#else
m_HLSReader.parseSliceHeader( m_apcSlicePilot, &m_picHeader, &m_parameterSetManager, m_prevTid0POC );
+#endif
PPS *pps = m_parameterSetManager.getPPS(m_picHeader.getPPSId());
CHECK(pps == 0, "No PPS present");
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 6a1c1f0d5..4bcfcfc59 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -122,6 +122,9 @@ private:
uint32_t m_uiSliceSegmentIdx;
uint32_t m_prevLayerID;
int m_prevPOC;
+#if JVET_R0068_ASPECT1_ASPECT6
+ int m_prevPicPOC;
+#endif
int m_prevTid0POC;
bool m_bFirstSliceInPicture;
bool m_firstSliceInSequence[MAX_VPS_LAYERS];
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 1d5db4736..b925ffe26 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -450,6 +450,9 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
READ_UVLC( uiCode, "pic_width_in_luma_samples" ); pcPPS->setPicWidthInLumaSamples( uiCode );
READ_UVLC( uiCode, "pic_height_in_luma_samples" ); pcPPS->setPicHeightInLumaSamples( uiCode );
READ_FLAG(uiCode, "pps_conformance_window_flag");
+#if JVET_R0068_ASPECT1_ASPECT6
+ pcPPS->setConformanceWindowFlag( uiCode );
+#endif
if (uiCode != 0)
{
Window& conf = pcPPS->getConformanceWindow();
@@ -3018,6 +3021,16 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
{
picHeader->setExplicitScalingListEnabledFlag(false);
}
+#if JVET_R0068_ASPECT1_ASPECT6
+ if (pps->getPicWidthInLumaSamples() == sps->getMaxPicWidthInLumaSamples() && pps->getPicHeightInLumaSamples() == sps->getMaxPicHeightInLumaSamples())
+ {
+ CHECK(pps->getConformanceWindowFlag(), "When pic_width_in_luma_samples is equal to pic_width_max_in_luma_samples and pic_height_in_luma_samples is equal to pic_height_max_in_luma_samples, the value of pps_conformance_window_flag shall be equal to 0");
+ pps->getConformanceWindow().setWindowLeftOffset(sps->getConformanceWindow().getWindowLeftOffset());
+ pps->getConformanceWindow().setWindowRightOffset(sps->getConformanceWindow().getWindowRightOffset());
+ pps->getConformanceWindow().setWindowTopOffset(sps->getConformanceWindow().getWindowTopOffset());
+ pps->getConformanceWindow().setWindowBottomOffset(sps->getConformanceWindow().getWindowBottomOffset());
+ }
+#endif
// initialize tile/slice info for no partitioning case
@@ -3803,7 +3816,11 @@ void HLSyntaxReader::checkAlfNaluTidAndPicTid(Slice* pcSlice, PicHeader* picHea
}
}
}
+#if JVET_R0068_ASPECT1_ASPECT6
+void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC, const int prevPicPOC)
+#else
void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC)
+#endif
{
uint32_t uiCode;
int iCode;
@@ -3992,9 +4009,17 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
READ_UVLC ( uiCode, "slice_type" ); pcSlice->setSliceType((SliceType)uiCode);
VPS *vps = parameterSetManager->getVPS(sps->getVPSId());
+#if JVET_R0068_ASPECT1_ASPECT6
+ if (pcSlice->isIRAP() && (sps->getVPSId() == 0 || pcSlice->getPOC() != prevPicPOC || vps->getIndependentLayerFlag(vps->getGeneralLayerIdx(pcSlice->getNalUnitLayerId())) == 1))
+#else
if (pcSlice->isIRAP() && (sps->getVPSId() == 0 || vps->getIndependentLayerFlag(vps->getGeneralLayerIdx(pcSlice->getNalUnitLayerId())) == 1))
+#endif
{
+#if JVET_R0068_ASPECT1_ASPECT6
+ CHECK(uiCode != 2, "When nal_unit_type is in the range of IDR_W_RADL to CRA_NUT, inclusive, and vps_independent_layer_flag[ GeneralLayerIdx[ nuh_layer_id ] ] is equal to 1 or the current picture is the first picture in the current AU, slice_type shall be equal to 2");
+#else
CHECK(uiCode != 2, "When nal_unit_type is in the range of IDR_W_RADL to CRA_NUT, inclusive, and vps_independent_layer_flag[ GeneralLayerIdx[ nuh_layer_id ] ] is equal to 1, slice_type shall be equal to 2");
+#endif
}
}
else
diff --git a/source/Lib/DecoderLib/VLCReader.h b/source/Lib/DecoderLib/VLCReader.h
index 5d6f97831..3a785936b 100644
--- a/source/Lib/DecoderLib/VLCReader.h
+++ b/source/Lib/DecoderLib/VLCReader.h
@@ -179,7 +179,11 @@ public:
void parseGeneralHrdParameters(GeneralHrdParams *generalHrd);
void parsePictureHeader ( PicHeader* picHeader, ParameterSetManager *parameterSetManager, bool readRbspTrailingBits );
void checkAlfNaluTidAndPicTid(Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager);
+#if JVET_R0068_ASPECT1_ASPECT6
+ void parseSliceHeader ( Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC, const int prevPicPOC );
+#else
void parseSliceHeader ( Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC );
+#endif
void getSlicePoc ( Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC );
void parseTerminatingBit ( uint32_t& ruiBit );
void parseRemainingBytes ( bool noTrailingBytesExpected );
--
GitLab