From d07ec31d597e3b5cb15d899f88bb56d4d0e30c56 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:12:01 +0200
Subject: [PATCH] remove macro JVET_Q0156_STSA
---
source/Lib/CommonLib/Slice.cpp | 16 ----------------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/EncoderLib/EncGOP.cpp | 6 ------
3 files changed, 23 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 0b4bad3ed7..c247dca9b8 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -757,18 +757,10 @@ void Slice::checkSTSA(PicList& rcListPic)
{
pcRefPic = m_apcRefPicList[REF_PIC_LIST_0][ii];
-#if JVET_Q0156_STSA
if( m_eNalUnitType == NAL_UNIT_CODED_SLICE_STSA && pcRefPic->layerId == m_pcPic->layerId )
{
CHECK( pcRefPic->layer == m_uiTLayer, "When the current picture is an STSA picture and nuh_layer_id equal to that of the current picture, there shall be no active entry in the RPL that has TemporalId equal to that of the current picture" );
}
-#else
- // Checking this: "When the current picture is an STSA picture, there shall be no active entry in RefPicList[ 0 ] or RefPicList[ 1 ] that has TemporalId equal to that of the current picture"
- if (getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA)
- {
- CHECK(pcRefPic->layer == m_uiTLayer, "When the current picture is an STSA picture, there shall be no active entry in the RPL that has TemporalId equal to that of the current picture");
- }
-#endif
// Checking this: "When the current picture is a picture that follows, in decoding order, an STSA picture that has TemporalId equal to that of the current picture, there shall be no
// picture that has TemporalId equal to that of the current picture included as an active entry in RefPicList[ 0 ] or RefPicList[ 1 ] that precedes the STSA picture in decoding order."
@@ -780,18 +772,10 @@ void Slice::checkSTSA(PicList& rcListPic)
{
pcRefPic = m_apcRefPicList[REF_PIC_LIST_1][ii];
-#if JVET_Q0156_STSA
if( m_eNalUnitType == NAL_UNIT_CODED_SLICE_STSA && pcRefPic->layerId == m_pcPic->layerId )
{
CHECK( pcRefPic->layer == m_uiTLayer, "When the current picture is an STSA picture and nuh_layer_id equal to that of the current picture, there shall be no active entry in the RPL that has TemporalId equal to that of the current picture" );
}
-#else
- // Checking this: "When the current picture is an STSA picture, there shall be no active entry in RefPicList[ 0 ] or RefPicList[ 1 ] that has TemporalId equal to that of the current picture"
- if (getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA)
- {
- CHECK(pcRefPic->layer == m_uiTLayer, "When the current picture is an STSA picture, there shall be no active entry in the RPL that has TemporalId equal to that of the current picture");
- }
-#endif
// Checking this: "When the current picture is a picture that follows, in decoding order, an STSA picture that has TemporalId equal to that of the current picture, there shall be no
// picture that has TemporalId equal to that of the current picture included as an active entry in RefPicList[ 0 ] or RefPicList[ 1 ] that precedes the STSA picture in decoding order."
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index f27e4ccdfe..c52b7125c2 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -143,7 +143,6 @@
-#define JVET_Q0156_STSA 1 // JVET-Q0156: Enable inter-layer prediction for STSA pictures
#define JVET_Q0249_ALF_CHROMA_CLIPFLAG 1 // JVET-Q0249: Cleanup of chroma clipping flags for ALF
#define JVET_Q0150 1 // fix for ALF virtual horizontal CTU boundary processing
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 41c737c9ca..70b9d36301 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2211,12 +2211,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
{
bool isSTSA=true;
-#if !JVET_Q0156_STSA
- if( !m_pcEncLib->getVPS()->getAllIndependentLayersFlag() && m_pcEncLib->getVPS()->getGeneralLayerIdx( m_pcEncLib->getLayerId() ) )
- {
- isSTSA = false;
- }
-#endif
for(int ii=0;(ii<m_pcCfg->getGOPSize() && isSTSA==true);ii++)
{
--
GitLab