From 754ec639489103d290790c5a73fe60f8d64a199e Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Wed, 21 Oct 2020 17:09:06 +0200
Subject: [PATCH] remove macro JVET_S0045_SIGN
---
source/Lib/CommonLib/Slice.cpp | 64 -----------------------------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 8 ----
source/Lib/EncoderLib/EncGOP.cpp | 20 ---------
source/Lib/EncoderLib/EncLib.cpp | 8 ----
source/Lib/EncoderLib/VLCWriter.cpp | 5 ---
6 files changed, 106 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index bd321b08a4..3f53e19469 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -460,11 +460,7 @@ void Slice::constructRefPicList(PicList& rcListPic)
else
if (!m_RPL0.isRefPicLongterm(ii))
{
-#if JVET_S0045_SIGN
pcRefPic = xGetRefPic(rcListPic, getPOC() + m_RPL0.getRefPicIdentifier(ii), m_pcPic->layerId);
-#else
- pcRefPic = xGetRefPic( rcListPic, getPOC() - m_RPL0.getRefPicIdentifier( ii ), m_pcPic->layerId );
-#endif
pcRefPic->longTerm = false;
}
else
@@ -503,11 +499,7 @@ void Slice::constructRefPicList(PicList& rcListPic)
else
if (!m_RPL1.isRefPicLongterm(ii))
{
-#if JVET_S0045_SIGN
pcRefPic = xGetRefPic(rcListPic, getPOC() + m_RPL1.getRefPicIdentifier(ii), m_pcPic->layerId);
-#else
- pcRefPic = xGetRefPic( rcListPic, getPOC() - m_RPL1.getRefPicIdentifier( ii ), m_pcPic->layerId );
-#endif
pcRefPic->longTerm = false;
}
else
@@ -578,11 +570,7 @@ void Slice::checkCRA(const ReferencePictureList* pRPL0, const ReferencePictureLi
{
if (!pRPL0->isRefPicLongterm(i))
{
-#if JVET_S0045_SIGN
CHECK(getPOC() + pRPL0->getRefPicIdentifier(i) < pocCRA, "Invalid state");
-#else
- CHECK(getPOC() - pRPL0->getRefPicIdentifier(i) < pocCRA, "Invalid state");
-#endif
}
else if (!pRPL0->isInterLayerRefPic(i))
{
@@ -604,11 +592,7 @@ void Slice::checkCRA(const ReferencePictureList* pRPL0, const ReferencePictureLi
{
if (!pRPL1->isRefPicLongterm(i))
{
-#if JVET_S0045_SIGN
CHECK(getPOC() + pRPL1->getRefPicIdentifier(i) < pocCRA, "Invalid state");
-#else
- CHECK(getPOC() - pRPL1->getRefPicIdentifier(i) < pocCRA, "Invalid state");
-#endif
}
else if( !pRPL1->isInterLayerRefPic( i ) )
{
@@ -655,11 +639,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
}
else if( !rpl[refPicList]->isRefPicLongterm( i ) )
{
-#if JVET_S0045_SIGN
refPicPOC = getPOC() + rpl[refPicList]->getRefPicIdentifier(i);
-#else
- refPicPOC = getPOC() - rpl[refPicList]->getRefPicIdentifier( i );
-#endif
pcRefPic = xGetRefPic( rcListPic, refPicPOC, m_pcPic->layerId );
}
else
@@ -752,11 +732,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
}
else if (!pRPL0->isRefPicLongterm(i))
{
-#if JVET_S0045_SIGN
refPicPOC = getPOC() + pRPL0->getRefPicIdentifier(i);
-#else
- refPicPOC = getPOC() - pRPL0->getRefPicIdentifier(i);
-#endif
pcRefPic = xGetRefPic(rcListPic, refPicPOC, m_pcPic->layerId);
}
else
@@ -828,11 +804,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
}
else if (!pRPL1->isRefPicLongterm(i))
{
-#if JVET_S0045_SIGN
refPicPOC = getPOC() + pRPL1->getRefPicIdentifier(i);
-#else
- refPicPOC = getPOC() - pRPL1->getRefPicIdentifier(i);
-#endif
pcRefPic = xGetRefPic(rcListPic, refPicPOC, m_pcPic->layerId);
}
else
@@ -1507,11 +1479,7 @@ void Slice::checkSubpicTypeConstraints(PicList& rcListPic, const ReferencePictur
}
else if (!pRPL0->isRefPicLongterm(i))
{
-#if JVET_S0045_SIGN
refPicPOC = getPOC() + pRPL0->getRefPicIdentifier(i);
-#else
- refPicPOC = getPOC() - pRPL0->getRefPicIdentifier(i);
-#endif
pcRefPic = xGetRefPic(rcListPic, refPicPOC, m_pcPic->layerId);
}
else
@@ -1588,11 +1556,7 @@ void Slice::checkSubpicTypeConstraints(PicList& rcListPic, const ReferencePictur
}
else if (!pRPL1->isRefPicLongterm(i))
{
-#if JVET_S0045_SIGN
refPicPOC = getPOC() + pRPL1->getRefPicIdentifier(i);
-#else
- refPicPOC = getPOC() - pRPL1->getRefPicIdentifier(i);
-#endif
pcRefPic = xGetRefPic(rcListPic, refPicPOC, m_pcPic->layerId);
}
else
@@ -1828,11 +1792,7 @@ void Slice::applyReferencePictureListBasedMarking( PicList& rcListPic, const Ref
{
if (!(pRPL0->isRefPicLongterm(i)))
{
-#if JVET_S0045_SIGN
if (pcPic->poc == this->getPOC() + pRPL0->getRefPicIdentifier(i))
-#else
- if (pcPic->poc == this->getPOC() - pRPL0->getRefPicIdentifier(i))
-#endif
{
isReference = 1;
pcPic->longTerm = false;
@@ -1877,11 +1837,7 @@ void Slice::applyReferencePictureListBasedMarking( PicList& rcListPic, const Ref
{
if (!(pRPL1->isRefPicLongterm(i)))
{
-#if JVET_S0045_SIGN
if (pcPic->poc == this->getPOC() + pRPL1->getRefPicIdentifier(i))
-#else
- if (pcPic->poc == this->getPOC() - pRPL1->getRefPicIdentifier(i))
-#endif
{
isReference = 1;
pcPic->longTerm = false;
@@ -2009,21 +1965,13 @@ int Slice::checkThatAllRefPicsAreAvailable(PicList& rcListPic, const ReferencePi
if (pRPL->isRefPicLongterm(ii))
continue;
-#if JVET_S0045_SIGN
notPresentPoc = this->getPOC() + pRPL->getRefPicIdentifier(ii);
-#else
- notPresentPoc = this->getPOC() - pRPL->getRefPicIdentifier(ii);
-#endif
isAvailable = 0;
PicList::iterator iterPic = rcListPic.begin();
while (iterPic != rcListPic.end())
{
rpcPic = *(iterPic++);
-#if JVET_S0045_SIGN
if (!rpcPic->longTerm && rpcPic->getPOC() == this->getPOC() + pRPL->getRefPicIdentifier(ii) && rpcPic->referenced)
-#else
- if (!rpcPic->longTerm && rpcPic->getPOC() == this->getPOC() - pRPL->getRefPicIdentifier(ii) && rpcPic->referenced)
-#endif
{
isAvailable = 1;
break;
@@ -2128,21 +2076,13 @@ int Slice::checkThatAllRefPicsAreAvailable(PicList& rcListPic, const ReferencePi
if (pRPL->isRefPicLongterm(ii))
continue;
-#if JVET_S0045_SIGN
notPresentPoc = this->getPOC() + pRPL->getRefPicIdentifier(ii);
-#else
- notPresentPoc = this->getPOC() - pRPL->getRefPicIdentifier(ii);
-#endif
isAvailable = 0;
PicList::iterator iterPic = rcListPic.begin();
while (iterPic != rcListPic.end())
{
rpcPic = *(iterPic++);
-#if JVET_S0045_SIGN
if (!rpcPic->longTerm && rpcPic->getPOC() == this->getPOC() + pRPL->getRefPicIdentifier(ii) && rpcPic->referenced)
-#else
- if (!rpcPic->longTerm && rpcPic->getPOC() == this->getPOC() - pRPL->getRefPicIdentifier(ii) && rpcPic->referenced)
-#endif
{
isAvailable = 1;
break;
@@ -2186,11 +2126,7 @@ bool Slice::isPOCInRefPicList(const ReferencePictureList *rpl, int poc )
}
else
{
-#if JVET_S0045_SIGN
if (poc == getPOC() + rpl->getRefPicIdentifier(i))
-#else
- if (poc == getPOC() - rpl->getRefPicIdentifier(i))
-#endif
{
return true;
}
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 8afe841056..63686a38b1 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -76,7 +76,6 @@
-#define JVET_S0045_SIGN 1 // JVET-S0045: semantics of strp_entry_sign_flag
#define JVET_S0133_PH_SYNTAX_OVERRIDE_ENC_FIX 1 // JVET-S0133: Encoder-only fix on the override of partition constriants in PH
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 7ead857bd1..c59094e935 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -378,7 +378,6 @@ void HLSyntaxReader::parseRefPicList(SPS* sps, ReferencePictureList* rpl, int rp
code++;
}
int readValue = code;
-#if JVET_S0045_SIGN
if (readValue > 0)
{
READ_FLAG(code, "strp_entry_sign_flag[ listIdx ][ rplsIdx ][ i ]");
@@ -387,13 +386,6 @@ void HLSyntaxReader::parseRefPicList(SPS* sps, ReferencePictureList* rpl, int rp
readValue = -readValue;
}
}
-#else
- if (readValue > 0)
- READ_FLAG(code, "strp_entry_sign_flag[ listIdx ][ rplsIdx ][ i ]");
- else
- code = 1;
- readValue = (code) ? readValue : 0 - readValue; //true means positive delta POC -- false otherwise
-#endif
if (firstSTRP)
{
firstSTRP = false;
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 816cdf900a..2b387abf17 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2256,11 +2256,7 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
const ReferencePictureList* rpl0 = pcSlice->getSPS()->getRPLList0()->getReferencePictureList(ii);
for (int jj = 0; jj < pcSlice->getRPL0()->getNumberOfActivePictures(); jj++)
{
-#if JVET_S0045_SIGN
int tPoc = pcSlice->getPOC() + rpl0->getRefPicIdentifier(jj);
-#else
- int tPoc = pcSlice->getPOC() - rpl0->getRefPicIdentifier(jj);
-#endif
int kk = 0;
for (kk = 0; kk<m_pcCfg->getGOPSize(); kk++)
{
@@ -2279,11 +2275,7 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
const ReferencePictureList* rpl1 = pcSlice->getSPS()->getRPLList1()->getReferencePictureList(ii);
for (int jj = 0; jj < pcSlice->getRPL1()->getNumberOfActivePictures(); jj++)
{
-#if JVET_S0045_SIGN
int tPoc = pcSlice->getPOC() + rpl1->getRefPicIdentifier(jj);
-#else
- int tPoc = pcSlice->getPOC() - rpl1->getRefPicIdentifier(jj);
-#endif
int kk = 0;
for (kk = 0; kk<m_pcCfg->getGOPSize(); kk++)
{
@@ -5467,13 +5459,9 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
if (rpcPic->layerId == pic->layerId)
{
hasHigherTId = rpcPic->temporalId > pic->temporalId;
-#if JVET_S0045_SIGN
if (!rpl0->isRefPicLongterm(ii) && rpcPic->referenced
&& rpcPic->getPOC() == slice->getPOC() + rpl0->getRefPicIdentifier(ii)
&& !slice->isPocRestrictedByDRAP(rpcPic->getPOC(), rpcPic->precedingDRAP))
-#else
- if (!rpl0->isRefPicLongterm(ii) && rpcPic->referenced && rpcPic->getPOC() == slice->getPOC() - rpl0->getRefPicIdentifier(ii) && !slice->isPocRestrictedByDRAP(rpcPic->getPOC(), rpcPic->precedingDRAP))
-#endif
{
isAvailable = true;
break;
@@ -5548,11 +5536,7 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
else
{
// Adding associated IRAP as shortterm picture
-#if JVET_S0045_SIGN
pLocalRPL0->setRefPicIdentifier(refPicIdxL0, slice->getAssociatedIRAPPOC() - slice->getPOC(), false, false, 0);
-#else
- pLocalRPL0->setRefPicIdentifier( refPicIdxL0, slice->getPOC() - slice->getAssociatedIRAPPOC(), false, false, 0 );
-#endif
refPicIdxL0++;
numOfSTRPL0++;
}
@@ -5596,13 +5580,9 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
if (rpcPic->layerId == pic->layerId)
{
hasHigherTId = rpcPic->temporalId > pic->temporalId;
-#if JVET_S0045_SIGN
if (!rpl1->isRefPicLongterm(ii) && rpcPic->referenced
&& rpcPic->getPOC() == slice->getPOC() + rpl1->getRefPicIdentifier(ii)
&& !slice->isPocRestrictedByDRAP(rpcPic->getPOC(), rpcPic->precedingDRAP))
-#else
- if (!rpl1->isRefPicLongterm(ii) && rpcPic->referenced && rpcPic->getPOC() == slice->getPOC() - rpl1->getRefPicIdentifier(ii) && !slice->isPocRestrictedByDRAP(rpcPic->getPOC(), rpcPic->precedingDRAP))
-#endif
{
isAvailable = true;
break;
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 00f3f941d4..778d2d2535 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -2041,11 +2041,7 @@ void EncLib::xInitRPL(SPS &sps, bool isFieldCoding)
for (int k = 0; k < ge.m_numRefPics; k++)
{
-#if JVET_S0045_SIGN
rpl->setRefPicIdentifier(k, -ge.m_deltaRefPics[k], 0, false, 0);
-#else
- rpl->setRefPicIdentifier( k, ge.m_deltaRefPics[k], 0, false, 0 );
-#endif
}
}
}
@@ -2061,11 +2057,7 @@ void EncLib::xInitRPL(SPS &sps, bool isFieldCoding)
rpl->setNumberOfLongtermPictures(0);
rpl->setNumberOfActivePictures(1);
rpl->setLtrpInSliceHeaderFlag(0);
-#if JVET_S0045_SIGN
rpl->setRefPicIdentifier(0, -1, 0, false, 0);
-#else
- rpl->setRefPicIdentifier(0, 1, 0, false, 0);
-#endif
rpl->setPOC(0, 0);
}
}
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index f663e898b9..cf82845a99 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -252,15 +252,10 @@ void HLSWriter::xCodeRefPicList( const ReferencePictureList* rpl, bool isLongTer
}
else
WRITE_UVLC(absDeltaValue, "abs_delta_poc_st[ listIdx ][ rplsIdx ][ i ]");
-#if JVET_S0045_SIGN
if (absDeltaValue > 0)
{
WRITE_FLAG(deltaValue < 0 ? 1 : 0, "strp_entry_sign_flag[ listIdx ][ rplsIdx ][ i ]");
}
-#else
- if (absDeltaValue > 0)
- WRITE_FLAG((deltaValue < 0) ? 0 : 1, "strp_entry_sign_flag[ listIdx ][ rplsIdx ][ i ]"); //0 means negative delta POC : 1 means positive
-#endif
}
else if (!rpl->getLtrpInSliceHeaderFlag())
{
--
GitLab