Skip to content
Snippets Groups Projects
Commit 63197d1f authored by Xiang Li's avatar Xiang Li
Browse files

remove macro CHECK_NOOUTPUTBEFORERECOVERYFLAG_PRIOR_NOTOUTPUT

parent b9f45827
No related branches found
No related tags found
1 merge request!2212Remove macros of Y meeting
Pipeline #7152 passed
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
#define GDR_DEC_TRACE 0 #define GDR_DEC_TRACE 0
#endif #endif
#define CHECK_NOOUTPUTBEFORERECOVERYFLAG_PRIOR_NOTOUTPUT 1 // Apply the check to ensure that marking the existing pictures in the DPB not needed for output only when the current picture is a CVSS or CLVSS
#define JVET_S0257_DUMP_360SEI_MESSAGE 1 // Software support of 360 SEI messages #define JVET_S0257_DUMP_360SEI_MESSAGE 1 // Software support of 360 SEI messages
......
...@@ -2764,16 +2764,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl ...@@ -2764,16 +2764,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
DTRACE_UPDATE( g_trace_ctx, std::make_pair( "poc", m_apcSlicePilot->getPOC() ) ); DTRACE_UPDATE( g_trace_ctx, std::make_pair( "poc", m_apcSlicePilot->getPOC() ) );
#if !CHECK_NOOUTPUTBEFORERECOVERYFLAG_PRIOR_NOTOUTPUT
if (m_bFirstSliceInPicture && m_apcSlicePilot->getPOC() != m_prevPOC &&
(m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA
|| m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_GDR) &&
getNoOutputPriorPicsFlag())
{
checkNoOutputPriorPics(&m_cListPic);
setNoOutputPriorPicsFlag (false);
}
#endif
xUpdatePreviousTid0POC(m_apcSlicePilot); xUpdatePreviousTid0POC(m_apcSlicePilot);
...@@ -2834,7 +2824,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl ...@@ -2834,7 +2824,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
} }
} }
#if CHECK_NOOUTPUTBEFORERECOVERYFLAG_PRIOR_NOTOUTPUT
if (m_bFirstSliceInPicture && m_apcSlicePilot->getPOC() != m_prevPOC if (m_bFirstSliceInPicture && m_apcSlicePilot->getPOC() != m_prevPOC
&& (m_apcSlicePilot->getRapPicFlag() || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_GDR) && (m_apcSlicePilot->getRapPicFlag() || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_GDR)
&& m_picHeader.getNoOutputBeforeRecoveryFlag() && m_picHeader.getNoOutputBeforeRecoveryFlag()
...@@ -2843,7 +2832,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl ...@@ -2843,7 +2832,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
checkNoOutputPriorPics(&m_cListPic); checkNoOutputPriorPics(&m_cListPic);
setNoOutputPriorPicsFlag(false); setNoOutputPriorPicsFlag(false);
} }
#endif
//For inference of PicOutputFlag //For inference of PicOutputFlag
if( !pps->getMixedNaluTypesInPicFlag() && ( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL ) ) if( !pps->getMixedNaluTypesInPicFlag() && ( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL ) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment