diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 1c244d4fc97fa74a9e4548328fdf81103d26a4fc..fbc7719dba428ba1f0b6da349433f3502c2a0436 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -103,7 +103,6 @@ void EncApp::xInitLibCfg()
if (!vps.getAllIndependentLayersFlag())
{
vps.setEachLayerIsAnOlsFlag(0);
-#if JVET_R0058
for (int i = 0; i < m_maxTempLayer; i++)
{
vps.setPredDirection(i, 0);
@@ -115,7 +114,6 @@ void EncApp::xInitLibCfg()
vps.setPredDirection(i >> 1, int(m_predDirectionArray[i] - 48));
}
}
-#endif
}
}
@@ -252,11 +250,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setSourceHeight ( m_iSourceHeight );
m_cEncLib.setConformanceWindow ( m_confWinLeft / SPS::getWinUnitX( m_InputChromaFormatIDC ), m_confWinRight / SPS::getWinUnitX( m_InputChromaFormatIDC ), m_confWinTop / SPS::getWinUnitY( m_InputChromaFormatIDC ), m_confWinBottom / SPS::getWinUnitY( m_InputChromaFormatIDC ) );
m_cEncLib.setScalingRatio ( m_scalingRatioHor, m_scalingRatioVer );
-#if JVET_R0058
m_cEncLib.setResChangeInClvsEnabled ( m_resChangeInClvsEnabled );
-#else
- m_cEncLib.setRPREnabled ( m_rprEnabled );
-#endif
m_cEncLib.setSwitchPocPeriod ( m_switchPocPeriod );
m_cEncLib.setUpscaledOutput ( m_upscaledOutput );
m_cEncLib.setFramesToBeEncoded ( m_framesToBeEncoded );
@@ -1181,11 +1175,7 @@ void EncApp::xWriteOutput( int iNumEncoded, std::list<PelUnitBuf*>& recBufList )
const PelUnitBuf* pcPicYuvRec = *(iterPicYuvRec++);
if (!m_reconFileName.empty())
{
-#if JVET_R0058
if( m_cEncLib.isResChangeInClvsEnabled() && m_cEncLib.getUpscaledOutput() )
-#else
- if( m_cEncLib.isRPREnabled() && m_cEncLib.getUpscaledOutput() )
-#endif
{
const SPS& sps = *m_cEncLib.getSPS( 0 );
const PPS& pps = *m_cEncLib.getPPS( ( sps.getMaxPicWidthInLumaSamples() != pcPicYuvRec->get( COMPONENT_Y ).width || sps.getMaxPicHeightInLumaSamples() != pcPicYuvRec->get( COMPONENT_Y ).height ) ? ENC_PPS_ID_RPR : 0 );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 47ed454c5ef74a2a1785ee6bafd304b6be739732..a0208544bc9ad07ce47a1e6914970dfefd0a35c9 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1416,9 +1416,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
( "MaxSublayers", m_maxSublayers, 7, "Max number of Sublayers")
( "AllLayersSameNumSublayersFlag", m_allLayersSameNumSublayersFlag, true, "All layers same num sublayersflag")
( "AllIndependentLayersFlag", m_allIndependentLayersFlag, true, "All layers are independent layer")
-#if JVET_R0058
("AllowablePredDirection", m_predDirectionArray, string(""), "prediction directions allowed for i-th temporal layer")
-#endif
( "LayerId%d", m_layerId, 0, MAX_VPS_LAYERS, "Max number of Sublayers")
( "NumRefLayers%d", m_numRefLayers, 0, MAX_VPS_LAYERS, "Number of direct reference layer index of i-th layer")
( "RefLayerIdx%d", m_refLayerIdxStr, string(""), MAX_VPS_LAYERS, "Reference layer index(es)")
@@ -1466,21 +1464,13 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
po::ErrorReporter err;
const list<const char*>& argv_unhandled = po::scanArgv(opts, argc, (const char**) argv, err);
-#if JVET_R0058
m_resChangeInClvsEnabled = m_scalingRatioHor != 1.0 || m_scalingRatioVer != 1.0;
-#else
- m_rprEnabled = m_scalingRatioHor != 1.0 || m_scalingRatioVer != 1.0;
-#endif
if( m_fractionOfFrames != 1.0 )
{
m_framesToBeEncoded = int( m_framesToBeEncoded * m_fractionOfFrames );
}
-#if JVET_R0058
if (m_resChangeInClvsEnabled && !m_switchPocPeriod)
-#else
- if (m_rprEnabled && !m_switchPocPeriod)
-#endif
{
m_switchPocPeriod = m_iFrameRate / 2 / m_iGOPSize * m_iGOPSize;
}
@@ -1677,11 +1667,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
CHECK( m_subPicIdLen > 16, "SubPicIdLen must not exceed 16 bits" );
-#if JVET_R0058
CHECK(m_resChangeInClvsEnabled, "resolution change in CLVS and subpictures cannot be enabled together");
-#else
- CHECK(m_rprEnabled, "RPR and subpictures cannot be enabled together");
-#endif
}
if (m_cfgSubpictureLevelInfoSEI.m_enabled)
@@ -3924,11 +3910,7 @@ void EncAppCfg::xPrintParameter()
msg( VERBOSE, "NumWppThreads:%d+%d ", m_numWppThreads, m_numWppExtraLines );
msg( VERBOSE, "EnsureWppBitEqual:%d ", m_ensureWppBitEqual );
-#if JVET_R0058
if (m_resChangeInClvsEnabled)
-#else
- if (m_rprEnabled)
-#endif
{
msg( VERBOSE, "RPR:(%1.2lfx, %1.2lfx)|%d ", m_scalingRatioHor, m_scalingRatioVer, m_switchPocPeriod );
}
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index ad588951d827c0acaefbea4de18a9c4e82839e46..8e2e0df54f5c0eb03b54feeb38308454099071bc 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -715,11 +715,7 @@ protected:
double m_scalingRatioHor;
double m_scalingRatioVer;
-#if JVET_R0058
bool m_resChangeInClvsEnabled;
-#else
- bool m_rprEnabled;
-#endif
double m_fractionOfFrames; ///< encode a fraction of the frames as specified in FramesToBeEncoded
int m_switchPocPeriod;
int m_upscaledOutput; ////< Output upscaled (2), decoded cropped but in full resolution buffer (1) or decoded cropped (0, default) picture for RPR.
@@ -737,9 +733,7 @@ protected:
int m_maxSublayers;
bool m_allLayersSameNumSublayersFlag;
bool m_allIndependentLayersFlag;
-#if JVET_R0058
std::string m_predDirectionArray;
-#endif
int m_numRefLayers[MAX_VPS_LAYERS];
std::string m_refLayerIdxStr[MAX_VPS_LAYERS];
diff --git a/source/Lib/CommonLib/Mv.cpp b/source/Lib/CommonLib/Mv.cpp
index 0ac9c5cdc3b63232c9c8a8d4cca20a662de9698a..672c953a0b7530dd52dd4ca575ad75101c0f1fbd 100644
--- a/source/Lib/CommonLib/Mv.cpp
+++ b/source/Lib/CommonLib/Mv.cpp
@@ -51,7 +51,6 @@ void roundAffineMv( int& mvx, int& mvy, int nShift )
mvy = (mvy + nOffset - (mvy >= 0)) >> nShift;
}
-#if JVET_R0058
void (*clipMv) ( Mv& rcMv, const struct Position& pos, const struct Size& size, const class SPS& sps, const class PPS& pps );
void clipMvInPic ( Mv& rcMv, const struct Position& pos, const struct Size& size, const class SPS& sps, const class PPS& pps )
@@ -101,39 +100,6 @@ void clipMvInSubpic ( Mv& rcMv, const struct Position& pos, const struct Size& s
rcMv.setHor(std::min(horMax, std::max(horMin, rcMv.getHor())));
rcMv.setVer(std::min(verMax, std::max(verMin, rcMv.getVer())));
}
-#else
-void clipMv( Mv& rcMv, const Position& pos, const struct Size& size, const SPS& sps, const PPS& pps )
-{
-#if JVET_Q0764_WRAP_AROUND_WITH_RPR
- if (pps.getWrapAroundEnabledFlag())
-#else
- if (sps.getWrapAroundEnabledFlag())
-#endif
- {
- wrapClipMv(rcMv, pos, size, &sps, &pps);
- return;
- }
-
- int iMvShift = MV_FRACTIONAL_BITS_INTERNAL;
- int iOffset = 8;
- int iHorMax = ( pps.getPicWidthInLumaSamples() + iOffset - (int)pos.x - 1 ) << iMvShift;
- int iHorMin = ( -( int ) sps.getMaxCUWidth() - iOffset - ( int ) pos.x + 1 ) << iMvShift;
-
- int iVerMax = ( pps.getPicHeightInLumaSamples() + iOffset - (int)pos.y - 1 ) << iMvShift;
- int iVerMin = ( -( int ) sps.getMaxCUHeight() - iOffset - ( int ) pos.y + 1 ) << iMvShift;
- const SubPic& curSubPic = pps.getSubPicFromPos(pos);
- if (curSubPic.getTreatedAsPicFlag())
- {
- iHorMax = ((curSubPic.getSubPicRight() + 1) + iOffset - (int)pos.x - 1 ) << iMvShift;
- iHorMin = (-(int)sps.getMaxCUWidth() - iOffset - ((int)pos.x - curSubPic.getSubPicLeft()) + 1) << iMvShift;
-
- iVerMax = ((curSubPic.getSubPicBottom() + 1) + iOffset - (int)pos.y - 1) << iMvShift;
- iVerMin = (-(int)sps.getMaxCUHeight() - iOffset - ((int)pos.y - curSubPic.getSubPicTop()) + 1) << iMvShift;
- }
- rcMv.setHor( std::min( iHorMax, std::max( iHorMin, rcMv.getHor() ) ) );
- rcMv.setVer( std::min( iVerMax, std::max( iVerMin, rcMv.getVer() ) ) );
-}
-#endif
bool wrapClipMv( Mv& rcMv, const Position& pos, const struct Size& size, const SPS *sps, const PPS *pps )
{
diff --git a/source/Lib/CommonLib/Mv.h b/source/Lib/CommonLib/Mv.h
index 1cb73f9505f596a4d2d099dcc185b8b7521975f1..2a1db05108b58002dcb752dd8cebf36fa86151ff 100644
--- a/source/Lib/CommonLib/Mv.h
+++ b/source/Lib/CommonLib/Mv.h
@@ -281,17 +281,9 @@ namespace std
}
};
};
-#if JVET_R0058
extern void(*clipMv) ( Mv& rcMv, const struct Position& pos, const struct Size& size, const class SPS& sps, const class PPS& pps );
void clipMvInPic ( Mv& rcMv, const struct Position& pos, const struct Size& size, const class SPS& sps, const class PPS& pps );
void clipMvInSubpic ( Mv& rcMv, const struct Position& pos, const struct Size& size, const class SPS& sps, const class PPS& pps );
-#else
-void clipMv ( Mv& rcMv, const struct Position& pos,
- const struct Size& size,
- const class SPS& sps
- , const class PPS& pps
-);
-#endif
bool wrapClipMv( Mv& rcMv, const Position& pos,
const struct Size& size,
diff --git a/source/Lib/CommonLib/Picture.cpp b/source/Lib/CommonLib/Picture.cpp
index f65579e908d2e90d61fc24e70a09c7874439ac9e..7d9339e397e8224337e68c1cb17bc7ae759c1f5d 100644
--- a/source/Lib/CommonLib/Picture.cpp
+++ b/source/Lib/CommonLib/Picture.cpp
@@ -195,9 +195,7 @@ Picture::Picture()
m_spliceIdx = NULL;
m_ctuNums = 0;
layerId = NOT_VALID;
-#if JVET_R0058
numSubpics = 1;
-#endif
numSlices = 1;
}
diff --git a/source/Lib/CommonLib/Picture.h b/source/Lib/CommonLib/Picture.h
index 8d7317ff0d2453d9e54273f8c9be9cdb050cefa5..e6c132d2fa03568eac8866e8b38e42cdf050b097 100644
--- a/source/Lib/CommonLib/Picture.h
+++ b/source/Lib/CommonLib/Picture.h
@@ -224,13 +224,11 @@ public:
int poc;
uint32_t temporalId;
int layerId;
-#if JVET_R0058
int numSubpics;
std::vector<int> subpicWidthInCTUs;
std::vector<int> subpicHeightInCTUs;
std::vector<int> subpicCtuTopLeftX;
std::vector<int> subpicCtuTopLeftY;
-#endif
int numSlices;
std::vector<int> sliceSubpicIdx;
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 0ffee7cb17b7e23f7d7c9275c2d613bd2eb86aa2..e003cde91371f46b134124d18e54f8c3ea6d0e97 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2261,12 +2261,10 @@ VPS::VPS()
, m_sublayerDpbParamsPresentFlag( false )
, m_targetOlsIdx( -1 )
{
-#if JVET_R0058
for (int i = 0; i < MAX_VPS_SUBLAYERS; i++)
{
m_vpsCfgPredDirection[i] = 0;
}
-#endif
for (int i = 0; i < MAX_VPS_LAYERS; i++)
{
m_vpsLayerId[i] = 0;
@@ -2852,9 +2850,7 @@ SPS::SPS()
, m_GDREnabledFlag ( true )
, m_SubLayerCbpParametersPresentFlag ( true )
, m_rprEnabledFlag ( false )
-#if JVET_R0058
, m_resChangeInClvsEnabledFlag ( false )
-#endif
, m_maxNumMergeCand(MRG_MAX_NUM_CANDS)
, m_maxNumAffineMergeCand(AFFINE_MRG_MAX_NUM_CANDS)
, m_maxNumIBCMergeCand(IBC_MRG_MAX_NUM_CANDS)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index a4de9a95b6e107b4392e77e8dadafba2a5651dfd..4ea03b76cf1e2d154bb6cf225433dd135a5821df 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -931,9 +931,7 @@ private:
uint32_t m_vpsLayerId[MAX_VPS_LAYERS];
bool m_vpsAllLayersSameNumSubLayersFlag;
bool m_vpsAllIndependentLayersFlag;
-#if JVET_R0058
uint32_t m_vpsCfgPredDirection[MAX_VPS_SUBLAYERS];
-#endif
bool m_vpsIndependentLayerFlag[MAX_VPS_LAYERS];
bool m_vpsDirectRefLayerFlag[MAX_VPS_LAYERS][MAX_VPS_LAYERS];
#if JVET_Q0398_SUBLAYER_DEP
@@ -1008,10 +1006,8 @@ public:
bool getAllIndependentLayersFlag() const { return m_vpsAllIndependentLayersFlag; }
void setAllIndependentLayersFlag(bool t) { m_vpsAllIndependentLayersFlag = t; }
-#if JVET_R0058
uint32_t getPredDirection(uint32_t tmplayer) const { return m_vpsCfgPredDirection[tmplayer]; }
void setPredDirection(uint32_t tmplayer, uint32_t t) { m_vpsCfgPredDirection[tmplayer] = t; }
-#endif
bool getIndependentLayerFlag(uint32_t layerIdx) const { return m_vpsIndependentLayerFlag[layerIdx]; }
void setIndependentLayerFlag(uint32_t layerIdx, bool t) { m_vpsIndependentLayerFlag[layerIdx] = t; }
@@ -1493,9 +1489,7 @@ private:
bool m_SubLayerCbpParametersPresentFlag;
bool m_rprEnabledFlag;
-#if JVET_R0058
bool m_resChangeInClvsEnabledFlag;
-#endif
bool m_interLayerPresentFlag;
uint32_t m_log2ParallelMergeLevelMinus2;
@@ -1894,10 +1888,8 @@ void setCCALFEnabledFlag( bool b )
void setRprEnabledFlag( bool flag ) { m_rprEnabledFlag = flag; }
bool getInterLayerPresentFlag() const { return m_interLayerPresentFlag; }
void setInterLayerPresentFlag( bool b ) { m_interLayerPresentFlag = b; }
-#if JVET_R0058
bool getResChangeInClvsEnabledFlag() const { return m_resChangeInClvsEnabledFlag; }
void setResChangeInClvsEnabledFlag(bool flag) { m_resChangeInClvsEnabledFlag = flag; }
-#endif
uint32_t getLog2ParallelMergeLevelMinus2() const { return m_log2ParallelMergeLevelMinus2; }
void setLog2ParallelMergeLevelMinus2(uint32_t mrgLevel) { m_log2ParallelMergeLevelMinus2 = mrgLevel; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 9e2a9f08a69ed281280f1dc9db8cceeccc47b1ca..b21498c55aafc0ead3dfaaeaf02b973fa015da77 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -69,7 +69,6 @@
#define JVET_R0351_HIGH_BIT_DEPTH_SUPPORT 1 // JVET-R0351: high bit depth coding support (syntax changes, no mathematical differences for CTCs)
#define JVET_R0351_HIGH_BIT_DEPTH_ENABLED 0 // JVET-R0351: high bit depth coding enabled (increases accuracies of some calculations, e.g. transforms)
-#define JVET_R0058 1 // JVET-R0058: the combination of RPR, subpictures, and scalability
#define JVET_R0185_OLS_DPB_CLEANUP 1 // JVET-R0185: Replace if( !vps_all_independent_layers_flag ) condition on vps_num_dpb_params syntax element with if(!each_layer_is_an_ols_flag)
// Change vps_num_dpb_params to vps_num_dpb_params_minus1 and change the semantics to a two-way constraint
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 062a91f300d46d2b4173797171e9c12a90e74000..69a5681428dbcd31bc676201301f5913bfb10209 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -135,7 +135,6 @@ bool CU::getRprScaling( const SPS* sps, const PPS* curPPS, Picture* refPic, int&
return refPic->isRefScaled( curPPS );
}
-#if JVET_R0058
void CU::checkConformanceILRP(Slice *slice)
{
const int numRefList = (slice->getSliceType() == B_SLICE) ? (2) : (1);
@@ -190,7 +189,6 @@ void CU::checkConformanceILRP(Slice *slice)
return;
}
-#endif
bool CU::isIntra(const CodingUnit &cu)
{
diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h
index 833fd6cb22eb75becc9e1fbf9de080c8a7190a95..a201b500e9864ae59bd8535f165b5dfda6574af4 100644
--- a/source/Lib/CommonLib/UnitTools.h
+++ b/source/Lib/CommonLib/UnitTools.h
@@ -122,9 +122,7 @@ namespace CU
bool isSbtMode (const uint8_t sbtInfo);
bool isSameSbtSize (const uint8_t sbtInfo1, const uint8_t sbtInfo2);
bool getRprScaling ( const SPS* sps, const PPS* curPPS, Picture* refPic, int& xScale, int& yScale );
-#if JVET_R0058
void checkConformanceILRP (Slice *slice);
-#endif
}
// PU tools
namespace PU
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 99454800cf2826442493f3aed19c9c5379ab54a2..5ab0ece088a440761bb1764a3fd124517323b270 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -580,11 +580,7 @@ Picture* DecLib::xGetNewPicBuffer( const SPS &sps, const PPS &pps, const uint32_
}
else
{
-#if JVET_R0058
if( !pcPic->Y().Size::operator==( Size( pps.getPicWidthInLumaSamples(), pps.getPicHeightInLumaSamples() ) ) || pps.pcv->maxCUWidth != sps.getMaxCUWidth() || pps.pcv->maxCUHeight != sps.getMaxCUHeight() || pcPic->layerId != layerId )
-#else
- if( !pcPic->Y().Size::operator==( Size( pps.getPicWidthInLumaSamples(), pps.getPicHeightInLumaSamples() ) ) || pps.pcv->maxCUWidth != sps.getMaxCUWidth() || pps.pcv->maxCUHeight != sps.getMaxCUHeight() )
-#endif
{
pcPic->destroy();
pcPic->create( sps.getChromaFormatIdc(), Size( pps.getPicWidthInLumaSamples(), pps.getPicHeightInLumaSamples() ), sps.getMaxCUWidth(), sps.getMaxCUWidth() + 16, true, layerId );
@@ -1676,7 +1672,6 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
const int minCuSize = 1 << sps->getLog2MinCodingBlockSize();
CHECK( ( pps->getPicWidthInLumaSamples() % ( std::max( 8, minCuSize) ) ) != 0, "Coded frame width must be a multiple of Max(8, the minimum unit size)" );
CHECK( ( pps->getPicHeightInLumaSamples() % ( std::max( 8, minCuSize) ) ) != 0, "Coded frame height must be a multiple of Max(8, the minimum unit size)" );
-#if JVET_R0058
if (!sps->getResChangeInClvsEnabledFlag())
{
CHECK(pps->getPicWidthInLumaSamples() != sps->getMaxPicWidthInLumaSamples(), "When res_change_in_clvs_allowed_flag equal to 0, the value of pic_width_in_luma_samples shall be equal to pic_width_max_in_luma_samples.");
@@ -1687,19 +1682,6 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
CHECK(sps->getSubPicInfoPresentFlag() != 0, "When res_change_in_clvs_allowed_flag is equal to 1, the value of subpic_info_present_flag shall be equal to 0.");
}
CHECK(sps->getResChangeInClvsEnabledFlag() && sps->getVirtualBoundariesEnabledFlag(), "when the value of res_change_in_clvs_allowed_flag is equal to 1, the value of sps_virtual_boundaries_present_flag shall be equal to 0");
-#else
- if( !sps->getRprEnabledFlag() )
- {
- CHECK( pps->getPicWidthInLumaSamples() != sps->getMaxPicWidthInLumaSamples(), "When res_change_in_clvs_allowed_flag equal to 0, the value of pic_width_in_luma_samples shall be equal to pic_width_max_in_luma_samples." );
- CHECK( pps->getPicHeightInLumaSamples() != sps->getMaxPicHeightInLumaSamples(), "When res_change_in_clvs_allowed_flag equal to 0, the value of pic_height_in_luma_samples shall be equal to pic_height_max_in_luma_samples." );
- }
- if( sps->getRprEnabledFlag() )
- {
- CHECK( sps->getSubPicInfoPresentFlag() != 0, "When res_change_in_clvs_allowed_flag is equal to 1, the value of subpic_info_present_flag shall be equal to 0." );
- }
-
- CHECK( sps->getRprEnabledFlag() && sps->getVirtualBoundariesPresentFlag(), "when the value of res_change_in_clvs_allowed_flag is equal to 1, the value of sps_virtual_boundaries_present_flag shall be equal to 0" );
-#endif
if( sps->getCTUSize() + 2 * ( 1 << sps->getLog2MinCodingBlockSize() ) > pps->getPicWidthInLumaSamples() )
{
@@ -2269,7 +2251,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
m_pcPic->setDecodingOrderNumber(m_decodingOrderCounter);
m_decodingOrderCounter++;
m_pcPic->setPictureType(nalu.m_nalUnitType);
-#if JVET_R0058
// store sub-picture numbers, sizes, and locations with a picture
pcSlice->getPic()->numSubpics = sps->getNumSubPics();
pcSlice->getPic()->subpicWidthInCTUs.clear();
@@ -2283,7 +2264,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
pcSlice->getPic()->subpicCtuTopLeftX.push_back(pps->getSubPic(subPicIdx).getSubPicCtuTopLeftX());
pcSlice->getPic()->subpicCtuTopLeftY.push_back(pps->getSubPic(subPicIdx).getSubPicCtuTopLeftY());
}
-#endif
pcSlice->getPic()->numSlices = pps->getNumSlicesInPic();
pcSlice->getPic()->sliceSubpicIdx.clear();
}
@@ -2297,12 +2277,10 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
pcSlice->checkSubpicTypeConstraints(m_cListPic, pcSlice->getRPL0(), pcSlice->getRPL1(), m_prevIRAPSubpicDecOrderNo[nalu.m_nuhLayerId][currSubPicIdx]);
pcSlice->checkRPL(pcSlice->getRPL0(), pcSlice->getRPL1(), m_associatedIRAPDecodingOrderNumber[nalu.m_nuhLayerId], m_cListPic);
pcSlice->checkSTSA(m_cListPic);
-#if JVET_R0058
if (m_pcPic->cs->vps && !m_pcPic->cs->vps->getIndependentLayerFlag(m_pcPic->cs->vps->getGeneralLayerIdx(nalu.m_nuhLayerId)) && m_pcPic->cs->pps->getNumSubPics() > 1)
{
CU::checkConformanceILRP(pcSlice);
}
-#endif
pcSlice->scaleRefPicList( scaledRefPic, m_pcPic->cs->picHeader, m_parameterSetManager.getAPSs(), m_picHeader.getLmcsAPS(), m_picHeader.getScalingListAPS(), true );
diff --git a/source/Lib/DecoderLib/DecSlice.cpp b/source/Lib/DecoderLib/DecSlice.cpp
index 335b79ae49be703ed44afd392dabd91e850a8982..3a19443561f3219424e8e1940a1d56602ae17e5e 100644
--- a/source/Lib/DecoderLib/DecSlice.cpp
+++ b/source/Lib/DecoderLib/DecSlice.cpp
@@ -131,7 +131,6 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
DTRACE( g_trace_ctx, D_HEADER, "=========== POC: %d ===========\n", slice->getPOC() );
-#if JVET_R0058
if (slice->getSliceType() != I_SLICE && slice->getRefPic(REF_PIC_LIST_0, 0)->numSubpics > 1)
{
clipMv = clipMvInSubpic;
@@ -140,7 +139,6 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
{
clipMv = clipMvInPic;
}
-#endif
// for every CTU in the slice segment...
unsigned subStrmId = 0;
for( unsigned ctuIdx = 0; ctuIdx < slice->getNumCtuInSlice(); ctuIdx++ )
@@ -172,11 +170,7 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
for (int idx = 0; idx < n; idx++)
{
Picture *refPic = slice->getRefPic((RefPicList)rlist, idx);
-#if JVET_R0058
if (!refPic->getSubPicSaved() && refPic->numSubpics > 1)
-#else
- if (!refPic->getSubPicSaved())
-#endif
{
refPic->saveSubPicBorder(refPic->getPOC(), subPicX, subPicY, subPicWidth, subPicHeight);
refPic->extendSubPicBorder(refPic->getPOC(), subPicX, subPicY, subPicWidth, subPicHeight);
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 142bd15158e889281886612f9ebe5dced98285d8..fb037b329496c342b37d9a3684eef93c6143215a 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1435,7 +1435,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setSeparateColourPlaneFlag( uiCode != 0 );
}
-#if JVET_R0058
READ_FLAG(uiCode, "ref_pic_resampling_enabled_flag"); pcSPS->setRprEnabledFlag(uiCode);
if (uiCode)
{
@@ -1445,9 +1444,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
{
pcSPS->setResChangeInClvsEnabledFlag(0);
}
-#else
- READ_FLAG( uiCode, "res_change_in_clvs_allowed_flag" ); pcSPS->setRprEnabledFlag( uiCode );
-#endif
if (pcSPS->getProfileTierLevel()->getConstraintInfo()->getNoResChangeInClvsConstraintFlag())
{
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 816a59bc6c7e04be6ac065f644b0004157f51828..94c4fa795abf923b97eea5a22d8aec59883562ae 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -770,11 +770,7 @@ protected:
#endif
double m_scalingRatioHor;
double m_scalingRatioVer;
-#if JVET_R0058
bool m_resChangeInClvsEnabled;
-#else
- bool m_rprEnabled;
-#endif
int m_switchPocPeriod;
int m_upscaledOutput;
int m_numRefLayers[MAX_VPS_LAYERS];
@@ -1964,13 +1960,8 @@ public:
#endif
void setScalingRatio( double hor, double ver ) { m_scalingRatioHor = hor, m_scalingRatioVer = ver; }
-#if JVET_R0058
void setResChangeInClvsEnabled(bool b) { m_resChangeInClvsEnabled = b; }
bool isResChangeInClvsEnabled() const { return m_resChangeInClvsEnabled; }
-#else
- void setRPREnabled(bool b) { m_rprEnabled = b; }
- bool isRPREnabled() const { return m_rprEnabled; }
-#endif
void setSwitchPocPeriod( int p ) { m_switchPocPeriod = p;}
void setUpscaledOutput( int b ) { m_upscaledOutput = b; }
int getUpscaledOutput() const { return m_upscaledOutput; }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index f4113bb55b4abc3e85c8828ac41998136fe41900..396a8eb1cfffe3e22abba569a56999850718ce5f 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2282,7 +2282,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
// Set reference list
pcSlice->constructRefPicList(rcListPic);
-#if JVET_R0058
// store sub-picture numbers, sizes, and locations with a picture
pcSlice->getPic()->numSubpics = pcPic->cs->pps->getNumSubPics();
pcSlice->getPic()->subpicWidthInCTUs.clear();
@@ -2303,7 +2302,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
{
CU::checkConformanceILRP(pcSlice);
}
-#endif
xPicInitHashME( pcPic, pcSlice->getPPS(), rcListPic );
@@ -2780,7 +2778,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
m_pcSliceEncoder->setLosslessSlice(pcPic, isLossless);
#endif
-#if JVET_R0058
if (pcSlice->getSliceType() != I_SLICE && pcSlice->getRefPic(REF_PIC_LIST_0, 0)->numSubpics > 1)
{
clipMv = clipMvInSubpic;
@@ -2791,7 +2788,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
clipMv = clipMvInPic;
m_pcEncLib->getInterSearch()->setClipMvInSubPic(false);
}
-#endif
m_pcSliceEncoder->precompressSlice( pcPic );
m_pcSliceEncoder->compressSlice ( pcPic, false, false );
@@ -4092,11 +4088,7 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
PelStorage upscaledRec;
-#if JVET_R0058
if (m_pcEncLib->isResChangeInClvsEnabled())
-#else
- if (m_pcEncLib->isRPREnabled())
-#endif
{
const CPelBuf& upscaledOrg = sps.getUseLmcs() ? pcPic->M_BUFS( 0, PIC_TRUE_ORIGINAL_INPUT).get( COMPONENT_Y ) : pcPic->M_BUFS( 0, PIC_ORIGINAL_INPUT).get( COMPONENT_Y );
upscaledRec.create( pic.chromaFormat, Area( Position(), upscaledOrg ) );
@@ -4124,11 +4116,7 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
// when RPR is enabled, picture padding is picture specific due to possible different picture resoluitons, however only full resolution padding is stored in EncLib
// get per picture padding from the conformance window, in this case if conformance window is set not equal to the padding then PSNR results may be inaccurate
-#if JVET_R0058
if (m_pcEncLib->isResChangeInClvsEnabled())
-#else
- if (m_pcEncLib->isRPREnabled())
-#endif
{
Window& conf = pcPic->getConformanceWindow();
padX = conf.getWindowRightOffset() * SPS::getWinUnitX( format );
@@ -4161,11 +4149,7 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
}
#endif
-#if JVET_R0058
if (m_pcEncLib->isResChangeInClvsEnabled())
-#else
- if (m_pcEncLib->isRPREnabled())
-#endif
{
const CPelBuf& upscaledOrg = sps.getUseLmcs() ? pcPic->M_BUFS( 0, PIC_TRUE_ORIGINAL_INPUT ).get( compID ) : pcPic->M_BUFS( 0, PIC_ORIGINAL_INPUT ).get( compID );
@@ -4442,11 +4426,7 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
}
msg( NOTICE, "]" );
}
-#if JVET_R0058
if (m_pcEncLib->isResChangeInClvsEnabled())
-#else
- if (m_pcEncLib->isRPREnabled())
-#endif
{
msg( NOTICE, "\nPSNR2: [Y %6.4lf dB U %6.4lf dB V %6.4lf dB]", upscaledPSNR[COMPONENT_Y], upscaledPSNR[COMPONENT_Cb], upscaledPSNR[COMPONENT_Cr] );
}
@@ -5310,10 +5290,8 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
Picture* pic = slice->getPic();
const VPS* vps = slice->getPic()->cs->vps;
int layerIdx = vps == nullptr ? 0 : vps->getGeneralLayerIdx( pic->layerId );
-#if JVET_R0058
bool isIntraLayerPredAllowed = vps->getIndependentLayerFlag(layerIdx) || (vps->getPredDirection(slice->getTLayer()) != 1);
bool isInterLayerPredAllowed = !vps->getIndependentLayerFlag(layerIdx) && (vps->getPredDirection(slice->getTLayer()) != 2);
-#endif
ReferencePictureList* pLocalRPL0 = slice->getLocalRPL0();
*pLocalRPL0 = ReferencePictureList( slice->getSPS()->getInterLayerPresentFlag() );
@@ -5323,10 +5301,8 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
uint32_t numOfRefPic = rpl0->getNumberOfShorttermPictures() + rpl0->getNumberOfLongtermPictures();
uint32_t refPicIdxL0 = 0;
-#if JVET_R0058
if (isIntraLayerPredAllowed)
{
-#endif
for (int ii = 0; ii < numOfRefPic; ii++)
{
// loop through all pictures in the reference picture buffer
@@ -5362,16 +5338,10 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
isAvailable = false;
}
}
-#if JVET_R0058
}
-#endif
// inter-layer reference pictures are added to the end of the reference picture list
-#if JVET_R0058
if (layerIdx && vps && !vps->getAllIndependentLayersFlag() && isInterLayerPredAllowed)
-#else
- if( layerIdx && vps && !vps->getAllIndependentLayersFlag() )
-#endif
{
numOfRefPic = rpl0->getNumberOfInterLayerPictures() ? rpl0->getNumberOfInterLayerPictures() : m_pcEncLib->getNumRefLayers( layerIdx );
@@ -5434,10 +5404,8 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
numOfRefPic = rpl1->getNumberOfShorttermPictures() + rpl1->getNumberOfLongtermPictures();
uint32_t refPicIdxL1 = 0;
-#if JVET_R0058
if (isIntraLayerPredAllowed)
{
-#endif
for (int ii = 0; ii < numOfRefPic; ii++)
{
// loop through all pictures in the reference picture buffer
@@ -5471,17 +5439,11 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
isAvailable = false;
}
}
-#if JVET_R0058
}
-#endif
// inter-layer reference pictures are added to the end of the reference picture list
-#if JVET_R0058
if (layerIdx && vps && !vps->getAllIndependentLayersFlag() && isInterLayerPredAllowed)
-#else
- if( layerIdx && vps && !vps->getAllIndependentLayersFlag() )
-#endif
{
numOfRefPic = rpl1->getNumberOfInterLayerPictures() ? rpl1->getNumberOfInterLayerPictures() : m_pcEncLib->getNumRefLayers( layerIdx );
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 00f8f9f39f29b22f5d5ca4b2c6022a7ac7d6207d..bbbb712fbccd566b0b5c1b0e86d88ed23fc2d1bd 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -264,11 +264,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
// initialize APS
xInitRPL(sps0, isFieldCoding);
-#if JVET_R0058
if (m_resChangeInClvsEnabled)
-#else
- if (m_rprEnabled)
-#endif
{
PPS &pps = *( m_ppsMap.allocatePS( ENC_PPS_ID_RPR ) );
Window& inputScalingWindow = pps0.getScalingWindow();
@@ -461,11 +457,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
{
xInitScalingLists( sps0, aps0 );
}
-#if JVET_R0058
if (m_resChangeInClvsEnabled)
-#else
- if (m_rprEnabled)
-#endif
{
xInitScalingLists( sps0, *m_apsMap.getPS( ENC_PPS_ID_RPR ) );
}
@@ -648,11 +640,7 @@ bool EncLib::encodePrep( bool flush, PelStorage* pcPicYuvOrg, PelStorage* cPicYu
}
#endif
-#if JVET_R0058
if( m_resChangeInClvsEnabled && m_intraPeriod == -1 )
-#else
- if( m_rprEnabled && m_intraPeriod == -1 )
-#endif
{
const int poc = m_iPOCLast + ( m_compositeRefEnabled ? 2 : 1 );
@@ -676,11 +664,7 @@ bool EncLib::encodePrep( bool flush, PelStorage* pcPicYuvOrg, PelStorage* cPicYu
const PPS *pPPS = ( ppsID < 0 ) ? m_ppsMap.getFirstPS() : m_ppsMap.getPS( ppsID );
const SPS *pSPS = m_spsMap.getPS( pPPS->getSPSId() );
-#if JVET_R0058
if (m_resChangeInClvsEnabled)
-#else
- if (m_rprEnabled)
-#endif
{
pcPicCurr->M_BUFS( 0, PIC_ORIGINAL_INPUT ).getBuf( COMPONENT_Y ).copyFrom( pcPicYuvOrg->getBuf( COMPONENT_Y ) );
pcPicCurr->M_BUFS( 0, PIC_ORIGINAL_INPUT ).getBuf( COMPONENT_Cb ).copyFrom( pcPicYuvOrg->getBuf( COMPONENT_Cb ) );
@@ -974,11 +958,7 @@ void EncLib::xGetNewPicBuffer ( std::list<PelUnitBuf*>& rcListPicYuvRecOut, Pict
{
rpcPic = new Picture;
rpcPic->create( sps.getChromaFormatIdc(), Size( pps.getPicWidthInLumaSamples(), pps.getPicHeightInLumaSamples() ), sps.getMaxCUWidth(), sps.getMaxCUWidth() + 16, false, m_layerId );
-#if JVET_R0058
if (m_resChangeInClvsEnabled)
-#else
- if (m_rprEnabled)
-#endif
{
const PPS &pps0 = *m_ppsMap.getPS(0);
rpcPic->M_BUFS(0, PIC_ORIGINAL_INPUT).create(sps.getChromaFormatIdc(), Area(Position(), Size(pps0.getPicWidthInLumaSamples(), pps0.getPicHeightInLumaSamples())));
@@ -1206,11 +1186,7 @@ void EncLib::xInitSPS( SPS& sps )
sps.setVPSId( m_vps->getVPSId() );
sps.setMaxPicWidthInLumaSamples( m_iSourceWidth );
sps.setMaxPicHeightInLumaSamples( m_iSourceHeight );
-#if JVET_R0058
if (m_resChangeInClvsEnabled)
-#else
- if (m_rprEnabled)
-#endif
{
int maxPicWidth = std::max(m_iSourceWidth, (int)((double)m_iSourceWidth / m_scalingRatioHor + 0.5));
int maxPicHeight = std::max(m_iSourceHeight, (int)((double)m_iSourceHeight / m_scalingRatioVer + 0.5));
@@ -1492,20 +1468,12 @@ void EncLib::xInitSPS( SPS& sps )
sps.setInterLayerPresentFlag( m_layerId > 0 && m_vps->getMaxLayers() > 1 && !m_vps->getAllIndependentLayersFlag() && !m_vps->getIndependentLayerFlag( m_vps->getGeneralLayerIdx( m_layerId ) ) );
CHECK( m_vps->getIndependentLayerFlag( m_vps->getGeneralLayerIdx( m_layerId ) ) && sps.getInterLayerPresentFlag(), " When vps_independent_layer_flag[GeneralLayerIdx[nuh_layer_id ]] is equal to 1, the value of inter_layer_ref_pics_present_flag shall be equal to 0." );
-#if JVET_R0058
sps.setResChangeInClvsEnabledFlag(m_resChangeInClvsEnabled);
sps.setRprEnabledFlag((m_resChangeInClvsEnabled) || sps.getInterLayerPresentFlag());
-#else
- sps.setRprEnabledFlag(m_rprEnabled || sps.getInterLayerPresentFlag());
-#endif
sps.setLog2ParallelMergeLevelMinus2( m_log2ParallelMergeLevelMinus2 );
-#if JVET_R0058
CHECK(sps.getResChangeInClvsEnabledFlag() && sps.getVirtualBoundariesEnabledFlag(), "when the value of res_change_in_clvs_allowed_flag is equal to 1, the value of sps_virtual_boundaries_present_flag shall be equal to 0");
-#else
- CHECK(sps.getRprEnabledFlag() && sps.getVirtualBoundariesEnabledFlag(), "when the value of res_change_in_clvs_allowed_flag is equal to 1, the value of sps_virtual_boundaries_present_flag shall be equal to 0");
-#endif
}
void EncLib::xInitHrdParameters(SPS &sps)
diff --git a/source/Lib/EncoderLib/EncLib.h b/source/Lib/EncoderLib/EncLib.h
index ea9bda5c907a1bf85a93c6f1d509f7ca004afac1..831c3ac947db24eac7ee64b3e7b700be8b34ec90 100644
--- a/source/Lib/EncoderLib/EncLib.h
+++ b/source/Lib/EncoderLib/EncLib.h
@@ -283,11 +283,7 @@ public:
int& iNumEncoded, bool isTff );
-#if JVET_R0058
void printSummary(bool isField) { m_cGOPEncoder.printOutSummary(m_uiNumAllPicCoded, isField, m_printMSEBasedSequencePSNR, m_printSequenceMSE, m_printHexPsnr, m_resChangeInClvsEnabled, m_spsMap.getFirstPS()->getBitDepths()); }
-#else
- void printSummary(bool isField) { m_cGOPEncoder.printOutSummary(m_uiNumAllPicCoded, isField, m_printMSEBasedSequencePSNR, m_printSequenceMSE, m_printHexPsnr, m_rprEnabled, m_spsMap.getFirstPS()->getBitDepths()); }
-#endif
int getLayerId() const { return m_layerId; }
VPS* getVPS() { return m_vps; }
diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp
index 0d0e751012605d72b57fdff274bc3b4ff4733a48..d5ac1b579845d831b4f952b76fea5866aa48fa19 100644
--- a/source/Lib/EncoderLib/EncSlice.cpp
+++ b/source/Lib/EncoderLib/EncSlice.cpp
@@ -1583,11 +1583,7 @@ void EncSlice::encodeCtus( Picture* pcPic, const bool bCompressEntireSlice, cons
for (int idx = 0; idx < n; idx++)
{
Picture *refPic = pcSlice->getRefPic((RefPicList)rlist, idx);
-#if JVET_R0058
if (!refPic->getSubPicSaved() && refPic->numSubpics > 1)
-#else
- if (!refPic->getSubPicSaved())
-#endif
{
refPic->saveSubPicBorder(refPic->getPOC(), subPicX, subPicY, subPicWidth, subPicHeight);
refPic->extendSubPicBorder(refPic->getPOC(), subPicX, subPicY, subPicWidth, subPicHeight);
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
index 6fed39c1c52c40d097954fd15b356179aa329411..ccbe3776dbe887c78de2ca31051378ec336cb5c0 100644
--- a/source/Lib/EncoderLib/InterSearch.cpp
+++ b/source/Lib/EncoderLib/InterSearch.cpp
@@ -1408,10 +1408,8 @@ void InterSearch::xSetIntraSearchRange(PredictionUnit& pu, int iRoiWidth, int iR
rcMvSrchRngLT <<= 2;
rcMvSrchRngRB <<= 2;
-#if JVET_R0058
bool temp = m_clipMvInSubPic;
m_clipMvInSubPic = true;
-#endif
xClipMv(rcMvSrchRngLT, pu.cu->lumaPos(),
pu.cu->lumaSize(),
sps
@@ -1422,9 +1420,7 @@ void InterSearch::xSetIntraSearchRange(PredictionUnit& pu, int iRoiWidth, int iR
sps
, *pu.cs->pps
);
-#if JVET_R0058
m_clipMvInSubPic = temp;
-#endif
rcMvSrchRngLT >>= 2;
rcMvSrchRngRB >>= 2;
}
@@ -7792,11 +7788,7 @@ void InterSearch::xClipMv( Mv& rcMv, const Position& pos, const struct Size& siz
int verMax = ( pps.getPicHeightInLumaSamples() + offset - (int)pos.y - 1 ) << mvShift;
int verMin = ( -( int ) sps.getMaxCUHeight() - offset - ( int ) pos.y + 1 ) << mvShift;
const SubPic &curSubPic = pps.getSubPicFromPos(pos);
-#if JVET_R0058
if (curSubPic.getTreatedAsPicFlag() && m_clipMvInSubPic)
-#else
- if (curSubPic.getTreatedAsPicFlag())
-#endif
{
horMax = ((curSubPic.getSubPicRight() + 1) + offset - (int)pos.x - 1) << mvShift;
horMin = (-(int)sps.getMaxCUWidth() - offset - ((int)pos.x - curSubPic.getSubPicLeft()) + 1) << mvShift;
diff --git a/source/Lib/EncoderLib/InterSearch.h b/source/Lib/EncoderLib/InterSearch.h
index dcc704a4dc4e0c9bb5a73319219a7b7a335d4d8d..779097776d37d891dcf0edc11b4c0f4a456fc9c1 100644
--- a/source/Lib/EncoderLib/InterSearch.h
+++ b/source/Lib/EncoderLib/InterSearch.h
@@ -172,9 +172,7 @@ protected:
bool m_skipSbtAll; // to skip all SBT modes for the current PU
uint8_t m_histBestSbt; // historical best SBT mode for PU of certain SSE values
uint8_t m_histBestMtsIdx; // historical best MTS idx for PU of certain SSE values
-#if JVET_R0058
bool m_clipMvInSubPic;
-#endif
public:
InterSearch();
@@ -320,9 +318,7 @@ public:
void resetSavedAffineMotion();
void storeAffineMotion( Mv acAffineMv[2][3], int16_t affineRefIdx[2], EAffineModel affineType, int bcwIdx );
bool searchBv(PredictionUnit& pu, int xPos, int yPos, int width, int height, int picWidth, int picHeight, int xBv, int yBv, int ctuSize);
-#if JVET_R0058
void setClipMvInSubPic(bool flag) { m_clipMvInSubPic = flag; }
-#endif
protected:
/// sub-function for motion vector refinement used in fractional-pel accuracy
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index a0a9bb7c4a95ca1c45bdf000dfcfd64803b9c7b2..07c51174b1ac9547a154a28861ac0eec3e323007 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -885,15 +885,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
const uint32_t chromaArrayType = separate_colour_plane_flag ? 0 : format;
-#if JVET_R0058
WRITE_FLAG(pcSPS->getRprEnabledFlag(), "ref_pic_resampling_enabled_flag");
if (pcSPS->getRprEnabledFlag())
{
WRITE_FLAG(pcSPS->getResChangeInClvsEnabledFlag(), "res_change_in_clvs_allowed_flag");
}
-#else
- WRITE_FLAG( pcSPS->getRprEnabledFlag(), "res_change_in_clvs_allowed_flag" );
-#endif
WRITE_UVLC( pcSPS->getMaxPicWidthInLumaSamples(), "pic_width_max_in_luma_samples" );
WRITE_UVLC( pcSPS->getMaxPicHeightInLumaSamples(), "pic_height_max_in_luma_samples" );