diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index eb2d77d487fa7b0af7c1f3ed994af172c8b7a9bd..7dd40dc88b5891b1623cef40b9a9965973beb85c 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2015,7 +2015,7 @@ public:
return (compID==COMPONENT_Y) ? 0 : (compID==COMPONENT_Cb ? m_chromaCbQpOffset : compID==COMPONENT_Cr ? m_chromaCrQpOffset : m_chromaCbCrQpOffset );
}
- bool getCuChromaQpOffsetEnabledFlag() const { return getChromaQpOffsetListLen()>0; }
+ bool getCuChromaQpOffsetListEnabledFlag() const { return getChromaQpOffsetListLen()>0; }
int getChromaQpOffsetListLen() const { return m_chromaQpOffsetListLen; }
void clearChromaQpOffsetList() { m_chromaQpOffsetListLen = 0; }
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index dddde5651e8336401aba8f57a499852d965de6d8..b99623e5fdabe69e30e6e2797f33cc3a1f54f704 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -716,7 +716,7 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
READ_FLAG( uiCode, "pps_slice_chroma_qp_offsets_present_flag" );
pcPPS->setSliceChromaQpFlag( uiCode ? true : false );
- READ_FLAG( uiCode, "pps_cu_chroma_qp_offset_enabled_flag");
+ READ_FLAG( uiCode, "pps_cu_chroma_qp_offset_list_enabled_flag");
if (uiCode == 0)
{
pcPPS->clearChromaQpOffsetList();
@@ -1328,11 +1328,11 @@ void HLSyntaxReader::dpb_parameters(int maxSubLayersMinus1, bool subLayerInfoFla
uint32_t code;
for (int i = (subLayerInfoFlag ? 0 : maxSubLayersMinus1); i <= maxSubLayersMinus1; i++)
{
- READ_UVLC(code, "sps_max_dec_pic_buffering_minus1[i]");
+ READ_UVLC(code, "max_dec_pic_buffering_minus1[i]");
pcSPS->setMaxDecPicBuffering(code + 1, i);
- READ_UVLC(code, "sps_max_num_reorder_pics[i]");
+ READ_UVLC(code, "max_num_reorder_pics[i]");
pcSPS->setNumReorderPics(code, i);
- READ_UVLC(code, "sps_max_latency_increase_plus1[i]");
+ READ_UVLC(code, "max_latency_increase_plus1[i]");
pcSPS->setMaxLatencyIncreasePlus1(code, i);
}
}
@@ -2100,12 +2100,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setLog2ParallelMergeLevelMinus2(uiCode);
#endif
- // KJS: reference picture sets to be replaced
-
- // KJS: not found in draft -> does not exist
-
- // KJS: remove scaling lists?
- READ_FLAG( uiCode, "scaling_list_enabled_flag" ); pcSPS->setScalingListFlag ( uiCode );
+ READ_FLAG( uiCode, "sps_scaling_list_enabled_flag" ); pcSPS->setScalingListFlag ( uiCode );
READ_FLAG( uiCode, "sps_loop_filter_across_virtual_boundaries_disabled_present_flag" ); pcSPS->setLoopFilterAcrossVirtualBoundariesDisabledFlag( uiCode != 0 );
if( pcSPS->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
@@ -3089,7 +3084,7 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
picHeader->setCuQpDeltaSubdivInter( 0 );
#endif
}
- if (pps->getCuChromaQpOffsetEnabledFlag())
+ if (pps->getCuChromaQpOffsetListEnabledFlag())
{
READ_UVLC( uiCode, "pic_cu_chroma_qp_offset_subdiv_intra_slice" ); picHeader->setCuChromaQpOffsetSubdivIntra( uiCode );
#if !JVET_Q0819_PH_CHANGES
@@ -3134,7 +3129,7 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
{
picHeader->setCuQpDeltaSubdivInter(0);
}
- if (pps->getCuChromaQpOffsetEnabledFlag())
+ if (pps->getCuChromaQpOffsetListEnabledFlag())
{
READ_UVLC(uiCode, "pic_cu_chroma_qp_offset_subdiv_inter_slice"); picHeader->setCuChromaQpOffsetSubdivInter(uiCode);
}
@@ -4507,7 +4502,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
}
}
- if (pps->getCuChromaQpOffsetEnabledFlag())
+ if (pps->getCuChromaQpOffsetListEnabledFlag())
{
READ_FLAG(uiCode, "cu_chroma_qp_offset_enabled_flag"); pcSlice->setUseChromaQpAdj(uiCode != 0);
}
@@ -5553,11 +5548,11 @@ void HLSyntaxReader::alfFilter( AlfParam& alfParam, const bool isChroma, const i
for( int i = 0; i < alfShape.numCoeff - 1; i++ )
{
#if JVET_Q0210_UEK_REMOVAL
- READ_UVLC( code, "alf coeff abs" );
+ READ_UVLC( code, isChroma ? "alf_chroma_coeff_abs" : "alf_luma_coeff_abs" );
coeff[ ind * MAX_NUM_ALF_LUMA_COEFF + i ] = code;
if( coeff[ ind * MAX_NUM_ALF_LUMA_COEFF + i ] != 0 )
{
- READ_FLAG( code, "alf_coeff_sign" );
+ READ_FLAG( code, isChroma ? "alf_chroma_coeff_sign" : "alf_luma_coeff_sign" );
coeff[ ind * MAX_NUM_ALF_LUMA_COEFF + i ] = ( code ) ? -coeff[ ind * MAX_NUM_ALF_LUMA_COEFF + i ] : coeff[ ind * MAX_NUM_ALF_LUMA_COEFF + i ];
}
#else
@@ -5583,7 +5578,7 @@ void HLSyntaxReader::alfFilter( AlfParam& alfParam, const bool isChroma, const i
for( int i = 0; i < alfShape.numCoeff - 1; i++ )
{
- READ_CODE(2, code, "alf_clipping_index");
+ READ_CODE(2, code, isChroma ? "alf_chroma_clip_idx" : "alf_luma_clip_idx");
clipp[ind * MAX_NUM_ALF_LUMA_COEFF + i] = code;
}
}
diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp
index dacf6c198b8846b07e391aef55defa31df89f53b..31775c340491166d3aa925546c1ddf606a999dc4 100644
--- a/source/Lib/EncoderLib/EncSlice.cpp
+++ b/source/Lib/EncoderLib/EncSlice.cpp
@@ -596,7 +596,7 @@ void EncSlice::initEncSlice(Picture* pcPic, const int pocLast, const int pocCurr
rpcSlice->setSliceChromaQpDelta( COMPONENT_Cr, 0 );
rpcSlice->setSliceChromaQpDelta( JOINT_CbCr, 0 );
#endif
- rpcSlice->setUseChromaQpAdj( rpcSlice->getPPS()->getCuChromaQpOffsetEnabledFlag() );
+ rpcSlice->setUseChromaQpAdj( rpcSlice->getPPS()->getCuChromaQpOffsetListEnabledFlag() );
rpcSlice->setNumRefIdx(REF_PIC_LIST_0, m_pcCfg->getRPLEntry(0, iGOPid).m_numRefPicsActive);
rpcSlice->setNumRefIdx(REF_PIC_LIST_1, m_pcCfg->getRPLEntry(1, iGOPid).m_numRefPicsActive);
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index f6c43970785e7aac520103b59481fa22e179a8c2..8b6b325208877fe190329bb50aba06ba98122a20 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -415,7 +415,7 @@ void HLSWriter::codePPS( const PPS* pcPPS )
WRITE_FLAG( pcPPS->getCabacInitPresentFlag() ? 1 : 0, "cabac_init_present_flag" );
WRITE_UVLC( pcPPS->getNumRefIdxL0DefaultActive()-1, "num_ref_idx_l0_default_active_minus1");
WRITE_UVLC( pcPPS->getNumRefIdxL1DefaultActive()-1, "num_ref_idx_l1_default_active_minus1");
- WRITE_FLAG(pcPPS->getRpl1IdxPresentFlag() ? 1 : 0, "rpl1IdxPresentFlag");
+ WRITE_FLAG( pcPPS->getRpl1IdxPresentFlag() ? 1 : 0, "rpl1_idx_present_flag");
WRITE_SVLC( pcPPS->getPicInitQPMinus26(), "init_qp_minus26");
@@ -438,8 +438,8 @@ void HLSWriter::codePPS( const PPS* pcPPS )
WRITE_FLAG( pcPPS->getSliceChromaQpFlag() ? 1 : 0, "pps_slice_chroma_qp_offsets_present_flag" );
- WRITE_FLAG(uint32_t(pcPPS->getCuChromaQpOffsetEnabledFlag()), "cu_chroma_qp_offset_enabled_flag" );
- if (pcPPS->getCuChromaQpOffsetEnabledFlag())
+ WRITE_FLAG(uint32_t(pcPPS->getCuChromaQpOffsetListEnabledFlag()), "pps_cu_chroma_qp_offset_list_enabled_flag" );
+ if (pcPPS->getCuChromaQpOffsetListEnabledFlag())
{
WRITE_UVLC(pcPPS->getChromaQpOffsetListLen() - 1, "chroma_qp_offset_list_len_minus1");
/* skip zero index */
@@ -707,10 +707,10 @@ void HLSWriter::codeLmcsAps( APS* pcAPS )
int deltaCRS = param.chrResScalingOffset;
int signCRS = (deltaCRS < 0) ? 1 : 0;
int absCRS = (deltaCRS < 0) ? (-deltaCRS) : deltaCRS;
- WRITE_CODE(absCRS, 3, "lmcs_delta_crs_val");
+ WRITE_CODE(absCRS, 3, "lmcs_delta_abs_crs");
if (absCRS > 0)
{
- WRITE_FLAG(signCRS, "lmcs_delta_crs_val_flag");
+ WRITE_FLAG(signCRS, "lmcs_delta_sign_crs_flag");
}
}
@@ -2123,7 +2123,7 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
picHeader->setCuQpDeltaSubdivInter( 0 );
#endif
}
- if (pps->getCuChromaQpOffsetEnabledFlag())
+ if (pps->getCuChromaQpOffsetListEnabledFlag())
{
WRITE_UVLC( picHeader->getCuChromaQpOffsetSubdivIntra(), "pic_cu_chroma_qp_offset_subdiv_intra_slice" );
#if !JVET_Q0819_PH_CHANGES
@@ -2163,7 +2163,7 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
{
picHeader->setCuQpDeltaSubdivInter(0);
}
- if (pps->getCuChromaQpOffsetEnabledFlag())
+ if (pps->getCuChromaQpOffsetListEnabledFlag())
{
WRITE_UVLC(picHeader->getCuChromaQpOffsetSubdivInter(), "pic_cu_chroma_qp_offset_subdiv_inter_slice");
}
@@ -3035,7 +3035,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
CHECK(numberValidComponents < COMPONENT_Cr+1, "Too many valid components");
}
- if (pcSlice->getPPS()->getCuChromaQpOffsetEnabledFlag())
+ if (pcSlice->getPPS()->getCuChromaQpOffsetListEnabledFlag())
{
WRITE_FLAG(pcSlice->getUseChromaQpAdj(), "cu_chroma_qp_offset_enabled_flag");
}
@@ -3659,10 +3659,10 @@ void HLSWriter::alfFilter( const AlfParam& alfParam, const bool isChroma, const
for( int i = 0; i < alfShape.numCoeff - 1; i++ )
{
#if JVET_Q0210_UEK_REMOVAL
- WRITE_UVLC( abs(coeff[ ind* MAX_NUM_ALF_LUMA_COEFF + i ]), "alf_abs_coeff" ); //alf_coeff_chroma[i], alf_coeff_luma_delta[i][j]
+ WRITE_UVLC( abs(coeff[ ind* MAX_NUM_ALF_LUMA_COEFF + i ]), isChroma ? "alf_chroma_coeff_abs" : "alf_luma_coeff_abs" ); //alf_coeff_chroma[i], alf_coeff_luma_delta[i][j]
if( abs( coeff[ ind* MAX_NUM_ALF_LUMA_COEFF + i ] ) != 0 )
{
- WRITE_FLAG( ( coeff[ ind* MAX_NUM_ALF_LUMA_COEFF + i ] < 0 ) ? 1 : 0, "alf_coeff_sign" );
+ WRITE_FLAG( ( coeff[ ind* MAX_NUM_ALF_LUMA_COEFF + i ] < 0 ) ? 1 : 0, isChroma ? "alf_chroma_coeff_sign" : "alf_luma_coeff_sign" );
}
#else
alfGolombEncode( coeff[ind* MAX_NUM_ALF_LUMA_COEFF + i], 3 ); // alf_coeff_chroma[i], alf_coeff_luma_delta[i][j]
@@ -3681,7 +3681,7 @@ void HLSWriter::alfFilter( const AlfParam& alfParam, const bool isChroma, const
{
for (int i = 0; i < alfShape.numCoeff - 1; i++)
{
- WRITE_CODE(clipp[ind* MAX_NUM_ALF_LUMA_COEFF + i], 2, "alf_clipping_index");
+ WRITE_CODE(clipp[ind* MAX_NUM_ALF_LUMA_COEFF + i], 2, isChroma ? "alf_chroma_clip_idx" : "alf_luma_clip_idx");
}
}
}