From 3e8ef18f3dfd91dca00be3e93d9e5880705a6c20 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:09:17 +0200
Subject: [PATCH] remove macro JVET_Q0259_COLLOCATED_PIC_IN_PH
---
source/Lib/CommonLib/Slice.h | 4 ----
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 6 ------
source/Lib/EncoderLib/EncGOP.cpp | 6 ------
source/Lib/EncoderLib/VLCWriter.cpp | 12 ------------
5 files changed, 29 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 63ccd6dca..e95178e73 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2468,9 +2468,7 @@ private:
uint32_t m_cuChromaQpOffsetSubdivInter; //!< CU chroma QP offset maximum subdivision for inter slices
bool m_enableTMVPFlag; //!< enable temporal motion vector prediction
bool m_picColFromL0Flag; //!< syntax element collocated_from_l0_flag
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
uint32_t m_colRefIdx;
-#endif
bool m_mvdL1ZeroFlag; //!< L1 MVD set to zero flag
uint32_t m_maxNumAffineMergeCand; //!< max number of sub-block merge candidates
bool m_disFracMMVD; //!< fractional MMVD offsets disabled flag
@@ -2630,10 +2628,8 @@ public:
bool getEnableTMVPFlag() const { return m_enableTMVPFlag; }
void setPicColFromL0Flag(bool val) { m_picColFromL0Flag = val; }
bool getPicColFromL0Flag() const { return m_picColFromL0Flag; }
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
void setColRefIdx( uint32_t refIdx) { m_colRefIdx = refIdx; }
uint32_t getColRefIdx() { return m_colRefIdx; }
-#endif
void setMvdL1ZeroFlag( bool b ) { m_mvdL1ZeroFlag = b; }
bool getMvdL1ZeroFlag() const { return m_mvdL1ZeroFlag; }
void setMaxNumAffineMergeCand( uint32_t val ) { m_maxNumAffineMergeCand = val; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index efe054b9b..9f3d66e99 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -74,7 +74,6 @@
-#define JVET_Q0259_COLLOCATED_PIC_IN_PH 1 // JVET-Q0259 aspect 5: Include collocated pic in PH when TMVP enabled and rpl_info_in_ph_flag is 1
#define JVET_Q0505_CHROAM_QM_SIGNALING_400 1 //JVET-Q0505: Cleanup of chroma quantization matrix signaling for 400 color format
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 4a3c43e7a..1b6d4b718 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -3342,7 +3342,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
{
READ_CODE( 1, uiCode, "ph_collocated_from_l0_flag");
picHeader->setPicColFromL0Flag(uiCode);
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
if ((picHeader->getPicColFromL0Flag() == 1 && picHeader->getRPL(0)->getNumRefEntries() > 1) ||
(picHeader->getPicColFromL0Flag() == 0 && picHeader->getRPL(1)->getNumRefEntries() > 1))
{
@@ -3353,7 +3352,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
{
picHeader->setColRefIdx(0);
}
-#endif
}
else
{
@@ -4452,10 +4450,8 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setColFromL0Flag(picHeader->getPicColFromL0Flag());
}
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
if (!pps->getRplInfoInPhFlag())
{
-#endif
if ( pcSlice->getSliceType() != I_SLICE &&
((pcSlice->getColFromL0Flag() == 1 && pcSlice->getNumRefIdx(REF_PIC_LIST_0) > 1)||
(pcSlice->getColFromL0Flag() == 0 && pcSlice->getNumRefIdx(REF_PIC_LIST_1) > 1)))
@@ -4468,13 +4464,11 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setColRefIdx(0);
}
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
}
else
{
pcSlice->setColRefIdx(picHeader->getColRefIdx());
}
-#endif
}
if ( (pps->getUseWP() && pcSlice->getSliceType()==P_SLICE) || (pps->getWPBiPred() && pcSlice->getSliceType()==B_SLICE) )
{
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 9c6d69978..83f34a564 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2559,27 +2559,21 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
picHeader->setPicColFromL0Flag( uiColFromL0 );
pcSlice->setColFromL0Flag( uiColFromL0 );
pcSlice->setColRefIdx( uiColFromL0 ? colRefIdxL0 : colRefIdxL1 );
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
picHeader->setColRefIdx( uiColFromL0 ? colRefIdxL0 : colRefIdxL1 );
-#endif
}
else if( colRefIdxL0 < 0 && colRefIdxL1 >= 0 )
{
picHeader->setPicColFromL0Flag( false );
pcSlice->setColFromL0Flag( false );
pcSlice->setColRefIdx( colRefIdxL1 );
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
picHeader->setColRefIdx( colRefIdxL1 );
-#endif
}
else if( colRefIdxL0 >= 0 && colRefIdxL1 < 0 )
{
picHeader->setPicColFromL0Flag( true );
pcSlice->setColFromL0Flag( true );
pcSlice->setColRefIdx( colRefIdxL0 );
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
picHeader->setColRefIdx( colRefIdxL0 );
-#endif
}
else
{
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 0e54a6ee4..27d060b51 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -2272,7 +2272,6 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
if (sps->getSPSTemporalMVPEnabledFlag())
{
WRITE_FLAG( picHeader->getEnableTMVPFlag(), "ph_temporal_mvp_enabled_flag" );
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
if (picHeader->getEnableTMVPFlag() && pps->getRplInfoInPhFlag())
{
WRITE_CODE(picHeader->getPicColFromL0Flag(), 1, "ph_collocated_from_l0_flag");
@@ -2282,7 +2281,6 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
WRITE_UVLC(picHeader->getColRefIdx(), "ph_collocated_ref_idx");
}
}
-#endif
}
else
{
@@ -2290,12 +2288,6 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
}
// mvd L1 zero flag
-#if !JVET_Q0259_COLLOCATED_PIC_IN_PH
- if (picHeader->getEnableTMVPFlag() && pps->getRplInfoInPhFlag())
- {
- WRITE_CODE(picHeader->getPicColFromL0Flag(), 1, "pic_collocated_from_l0_flag");
- }
-#endif
WRITE_FLAG(picHeader->getMvdL1ZeroFlag(), "mvd_l1_zero_flag");
// merge candidate list size
@@ -2946,11 +2938,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
WRITE_FLAG( encCabacInitFlag ? 1 : 0, "cabac_init_flag" );
}
}
-#if JVET_Q0259_COLLOCATED_PIC_IN_PH
if (pcSlice->getPicHeader()->getEnableTMVPFlag() && !pcSlice->getPPS()->getRplInfoInPhFlag())
-#else
- if( pcSlice->getPicHeader()->getEnableTMVPFlag() )
-#endif
{
if(!pcSlice->getPPS()->getRplInfoInPhFlag())
{
--
GitLab