From 6d31974d4b64faa719ee2b69d7d37005f8498380 Mon Sep 17 00:00:00 2001
From: zhipin <zhipin.deng@bytedance.com>
Date: Mon, 15 Jun 2020 11:05:09 +0800
Subject: [PATCH] rebase
---
source/Lib/DecoderLib/DecLib.cpp | 1 +
source/Lib/DecoderLib/VLCReader.cpp | 2 +-
source/Lib/EncoderLib/VLCWriter.cpp | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index ba5f9a2f65..9b3f34afc0 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1828,6 +1828,7 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
CHECK(nalu.m_temporalId == 0, "TemporalID of STSA picture shall not be zero in independent layers");
}
+
int currSubPicIdx = pps->getSubPicIdxFromSubPicId( m_apcSlicePilot->getSliceSubPicId() );
int currSliceAddr = m_apcSlicePilot->getSliceID();
for(int sp = 0; sp < currSubPicIdx; sp++)
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index f0ee56126c..a96d7706b2 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2648,7 +2648,7 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
#endif
}
}
-#if JVET_R0191_ASPECT3 & 0 //JVET_R0066 debug
+#if JVET_R0191_ASPECT3
for( int i = 0; i < pcVPS->m_numDpbParams; i++ )
{
CHECK( !isDPBParamReferred[i],"Each dpb_parameters( ) syntax structure in the VPS shall be referred to by at least one value of vps_ols_dpb_params_idx[i] for i in the range of 0 to NumMultiLayerOlss - 1, inclusive");
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 9361b804d2..ec9be57c38 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1665,8 +1665,8 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
WRITE_UVLC( pcVPS->getOlsDpbPicSize( i ).width, "ols_dpb_pic_width[i]" );
WRITE_UVLC( pcVPS->getOlsDpbPicSize( i ).height, "ols_dpb_pic_height[i]" );
#if JVET_R0066
- WRITE_CODE( pcVPS->m_olsDpbChromaFormatIdc[i], 2, "ols_dpb_chroma_format[i]");
- WRITE_UVLC( pcVPS->m_olsDpbBitDepthMinus8[i], "ols_dpb_bitdepth_minus8[i]");
+ WRITE_CODE( pcVPS->getOlsDpbChromaFormatIdc( i ), 2, "ols_dpb_chroma_format[i]");
+ WRITE_UVLC( pcVPS->getOlsDpbBitDepthMinus8( i ), "ols_dpb_bitdepth_minus8[i]");
#endif
#if JVET_R0099_DPB_HRD_PARAMETERS_SIGNALLING
if( (pcVPS->m_numDpbParams > 1) && (pcVPS->m_numDpbParams != pcVPS->m_numMultiLayeredOlss) )
--
GitLab