Commit 36243477 authored by Karl Sharman's avatar Karl Sharman
Browse files

remove macro FIXSAORESETAFTERIRAP

parent 71b3b716
......@@ -2315,12 +2315,6 @@ Void TAppEncCfg::xCheckParameter()
xConfirmPara( m_iIntraPeriod > 0 && m_iIntraPeriod <= m_iGOPSize , "Intra period must be larger than GOP size for periodic IDR pictures");
}
#if !ADD_RESET_ENCODER_DECISIONS_AFTER_IRAP
#if !FIXSAORESETAFTERIRAP
if (m_saoResetEncoderStateAfterIRAP)
{
xConfirmPara( m_iIntraPeriod > 0 && m_iIntraPeriod <= m_iGOPSize , "Intra period must be larger than GOP size when SAOResetEncoderStateAfterIRAP is enabled");
}
#endif
#endif
xConfirmPara( m_uiMaxCUDepth < 1, "MaxPartitionDepth must be greater than zero");
xConfirmPara( (m_uiMaxCUWidth >> m_uiMaxCUDepth) < 4, "Minimum partition width size should be larger than or equal to 8");
......
......@@ -104,7 +104,6 @@
#define SHUTTER_INTERVAL_SEI_MESSAGE 1 ///< support for shutter interval SEI message
#define SEI_ENCODER_CONTROL 1 ///< add encoder control for the following SEI: film grain characteristics, content light level, ambient viewing environment
#define FIXSAORESETAFTERIRAP 1 // Fix the reset mechanism for SAO after an IRAP for the case of IRAP period equal to gop size.
#define ADD_RESET_ENCODER_DECISIONS_AFTER_IRAP 1 // Add support to reseting encoder decisions after IRAP, to enable independent/parallel coding of randomaccess configuration intra-periods.
#define DPB_ENCODER_USAGE_CHECK 1 ///< Adds DPB encoder usage check.
......
......@@ -356,12 +356,6 @@ Void TEncSampleAdaptiveOffset::decidePicParams(Bool* sliceEnabled, const TComPic
#else
Void TEncSampleAdaptiveOffset::decidePicParams(Bool* sliceEnabled, const TComPic* pic, const Double saoEncodingRate, const Double saoEncodingRateChroma, const Bool bResetStateAfterIRAP)
{
#if !FIXSAORESETAFTERIRAP
if (pic->getSlice(0)->isIRAP())
{
m_lastIRAPPoc = pic->getSlice(0)->getPOC();
}
#endif
if (bResetStateAfterIRAP && pic->getSlice(0)->getPOC() > m_lastIRAPPoc)
{ // reset
for (Int compIdx = 0; compIdx < MAX_NUM_COMPONENT; compIdx++)
......@@ -373,12 +367,10 @@ Void TEncSampleAdaptiveOffset::decidePicParams(Bool* sliceEnabled, const TComPic
}
m_lastIRAPPoc = MAX_INT;
}
#if FIXSAORESETAFTERIRAP
if (pic->getSlice(0)->isIRAP())
{
m_lastIRAPPoc = pic->getSlice(0)->getPOC();
}
#endif
#endif
const Int picTempLayer = pic->getSlice(0)->getDepth();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment