Commit 5d515714 authored by Philip Cowan's avatar Philip Cowan

JVET-M0415 signaling implementation

parent f2b029f1
......@@ -56,6 +56,10 @@
#if JVET_M0445_MCTS
#define JVET_M0445_MCTS_DEC_CHECK 1 // Check at decoder side the MCTS restrictions
#endif
#define JVET_M0415_WRAPAROUND_HLS 1 // HLS for Wrap-around MC
#define JCTVC_Y0038_PARAMS 1
#define JVET_M0600_RATE_CTRL 1 //frame level bit allocation by qdf
......
......@@ -1035,9 +1035,14 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
READ_FLAG(uiCode, "sps_ref_wraparound_enabled_flag"); pcSPS->setWrapAroundEnabledFlag( uiCode ? true : false );
if (pcSPS->getWrapAroundEnabledFlag())
{
#if JVET_M0415_WRAPAROUND_HLS
READ_UVLC(uiCode, "sps_ref_wraparound_offset_minus1"); pcSPS->setWrapAroundOffset( (uiCode+1)*(1 << pcSPS->getLog2MinCodingBlockSize()));
#else
READ_UVLC(uiCode, "sps_ref_wraparound_offset"); pcSPS->setWrapAroundOffset( uiCode );
#endif
}
READ_FLAG( uiCode, "sps_temporal_mvp_enabled_flag" ); pcSPS->setSPSTemporalMVPEnabledFlag(uiCode);
......
......@@ -708,7 +708,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG( pcSPS->getWrapAroundEnabledFlag() ? 1 : 0, "sps_ref_wraparound_enabled_flag" );
if( pcSPS->getWrapAroundEnabledFlag() )
{
#if JVET_M0415_WRAPAROUND_HLS
WRITE_UVLC( (pcSPS->getWrapAroundOffset()/(1 << pcSPS->getLog2MinCodingBlockSize()))-1, "sps_ref_wraparound_offset_minus1" );
#else
WRITE_UVLC( pcSPS->getWrapAroundOffset(), "sps_ref_wraparound_offset" );
#endif
}
WRITE_FLAG( pcSPS->getSPSTemporalMVPEnabledFlag() ? 1 : 0, "sps_temporal_mvp_enabled_flag" );
......
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