Commit b810585d authored by Karsten Suehring's avatar Karsten Suehring
Browse files

remove INCLUDE_ISP_CFG_FLAG macro (leftover from last meeting cycle)

parent 29fb1a22
......@@ -356,9 +356,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setUseBLambdaForNonKeyLowDelayPictures ( m_bUseBLambdaForNonKeyLowDelayPictures );
m_cEncLib.setPCMLog2MinSize ( m_uiPCMLog2MinSize);
m_cEncLib.setUsePCM ( m_usePCM );
#if INCLUDE_ISP_CFG_FLAG
m_cEncLib.setUseISP ( m_ISP );
#endif
m_cEncLib.setUseFastISP ( m_useFastISP );
// set internal bit-depth and constants
......
......@@ -877,9 +877,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("MTSInterMaxCand", m_MTSInterMaxCand, 4, "Number of additional candidates to test in encoder search for MTS in inter slices\n")
("MTSImplicit", m_MTSImplicit, 0, "Enable implicit MTS (when explicit MTS is off)\n")
( "SBT", m_SBT, false, "Enable Sub-Block Transform for inter blocks\n" )
#if INCLUDE_ISP_CFG_FLAG
( "ISP", m_ISP, false, "Enable Intra Sub-Partitions\n" )
#endif
("SMVD", m_SMVD, false, "Enable Symmetric MVD\n")
("CompositeLTReference", m_compositeRefEnabled, false, "Enable Composite Long Term Reference Frame")
("GBi", m_GBi, false, "Enable Generalized Bi-prediction(GBi)")
......@@ -3307,9 +3305,7 @@ void EncAppCfg::xPrintParameter()
}
msg( VERBOSE, "MTS: %1d(intra) %1d(inter) ", m_MTS & 1, ( m_MTS >> 1 ) & 1 );
msg( VERBOSE, "SBT:%d ", m_SBT );
#if INCLUDE_ISP_CFG_FLAG
msg( VERBOSE, "ISP:%d ", m_ISP );
#endif
msg( VERBOSE, "SMVD:%d ", m_SMVD );
msg( VERBOSE, "CompositeLTReference:%d ", m_compositeRefEnabled);
msg( VERBOSE, "GBi:%d ", m_GBi );
......@@ -3366,11 +3362,7 @@ void EncAppCfg::xPrintParameter()
msg( VERBOSE, "PBIntraFast:%d ", m_usePbIntraFast );
if( m_ImvMode ) msg( VERBOSE, "IMV4PelFast:%d ", m_Imv4PelFast );
if( m_MTS ) msg( VERBOSE, "MTSMaxCand: %1d(intra) %1d(inter) ", m_MTSIntraMaxCand, m_MTSInterMaxCand );
#if INCLUDE_ISP_CFG_FLAG
if( m_ISP ) msg( VERBOSE, "ISPFast:%d ", m_useFastISP );
#else
msg( VERBOSE, "ISPFast:%d ", m_useFastISP );
#endif
if( m_LFNST ) msg( VERBOSE, "FastLFNST:%d ", m_useFastLFNST );
msg( VERBOSE, "AMaxBT:%d ", m_useAMaxBT );
msg( VERBOSE, "E0023FastEnc:%d ", m_e0023FastEnc );
......
......@@ -186,9 +186,7 @@ protected:
bool m_rdpcmEnabledFlag[NUMBER_OF_RDPCM_SIGNALLING_MODES];///< control flags for residual DPCM
bool m_persistentRiceAdaptationEnabledFlag; ///< control flag for Golomb-Rice parameter adaptation over each slice
bool m_cabacBypassAlignmentEnabledFlag;
#if INCLUDE_ISP_CFG_FLAG
bool m_ISP;
#endif
bool m_useFastISP; ///< flag for enabling fast methods for ISP
// coding quality
......
......@@ -1378,9 +1378,7 @@ SPS::SPS()
, m_MMVD ( false )
, m_SBT ( false )
, m_MaxSbtSize ( 32 )
#if INCLUDE_ISP_CFG_FLAG
, m_ISP ( false )
#endif
, m_chromaFormatIdc (CHROMA_420)
, m_uiMaxTLayers ( 1)
// Structure
......
......@@ -661,9 +661,7 @@ private:
bool m_MMVD;
bool m_SBT;
uint8_t m_MaxSbtSize;
#if INCLUDE_ISP_CFG_FLAG
bool m_ISP;
#endif
ChromaFormat m_chromaFormatIdc;
uint32_t m_uiMaxTLayers; // maximum number of temporal layers
......@@ -967,10 +965,8 @@ public:
unsigned getIBCFlag() const { return m_IBCFlag; }
void setUseSBT( bool b ) { m_SBT = b; }
bool getUseSBT() const { return m_SBT; }
#if INCLUDE_ISP_CFG_FLAG
void setUseISP( bool b ) { m_ISP = b; }
bool getUseISP() const { return m_ISP; }
#endif
void setMaxSbtSize( uint8_t val ) { m_MaxSbtSize = val; }
uint8_t getMaxSbtSize() const { return m_MaxSbtSize; }
......
......@@ -1223,11 +1223,7 @@ void TrQuant::transformNxN( TransformUnit &tu, const ComponentID &compID, const
void TrQuant::xGetCoeffEnergy( TransformUnit &tu, const ComponentID &compID, const CoeffBuf& coeffs, double* diagRatio, double* horVerRatio )
{
if( nullptr == diagRatio || nullptr == horVerRatio ) return;
#if INCLUDE_ISP_CFG_FLAG
if( tu.cu->predMode == MODE_INTRA && !tu.cu->ispMode && isLuma( compID ) && tu.cs->sps->getUseISP() && CU::canUseISPSplit( *tu.cu, compID ) != NOT_INTRA_SUBPARTITIONS )
#else
if( tu.cu->predMode == MODE_INTRA && !tu.cu->ispMode && isLuma( compID ) && CU::canUseISPSplit( *tu.cu, compID ) != NOT_INTRA_SUBPARTITIONS )
#endif
{
const int width = tu.cu->blocks[compID].width;
const int height = tu.cu->blocks[compID].height;
......
......@@ -159,7 +159,6 @@ typedef std::pair<int, bool> TrMode;
typedef std::pair<int, int> TrCost;
// clang-format off
#define INCLUDE_ISP_CFG_FLAG 1
#define ENABLE_JVET_L0283_MRL 1 // 1: Enable MRL, 0: Disable MRL
#define JVET_L0090_PAIR_AVG 1 // Add pairwise average candidates, replace HEVC combined candidates
#define REUSE_CU_RESULTS 1
......
......@@ -2754,11 +2754,7 @@ void CABACReader::mts_coding( TransformUnit& tu, ComponentID compID )
void CABACReader::isp_mode( CodingUnit& cu )
{
#if INCLUDE_ISP_CFG_FLAG
if( !CU::isIntra( cu ) || !isLuma( cu.chType ) || cu.firstPU->multiRefIdx || cu.ipcm || !cu.cs->sps->getUseISP() || cu.bdpcmMode )
#else
if( !CU::isIntra( cu ) || !isLuma( cu.chType ) || cu.firstPU->multiRefIdx || cu.ipcm || cu.bdpcmMode )
#endif
{
cu.ispMode = NOT_INTRA_SUBPARTITIONS;
return;
......
......@@ -1271,9 +1271,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
// KJS: not in draft yet
READ_FLAG(uiCode, "sps_reshaper_enable_flag"); pcSPS->setUseReshaper(uiCode == 1);
#if INCLUDE_ISP_CFG_FLAG
READ_FLAG(uiCode, "isp_enable_flag"); pcSPS->setUseISP(uiCode != 0);
#endif
#if LUMA_ADAPTIVE_DEBLOCKING_FILTER_QP_OFFSET
READ_FLAG( uiCode, "sps_ladf_enabled_flag" ); pcSPS->setLadfEnabled( uiCode != 0 );
......
......@@ -2656,11 +2656,7 @@ void CABACWriter::mts_coding( const TransformUnit& tu, ComponentID compID )
void CABACWriter::isp_mode( const CodingUnit& cu )
{
#if INCLUDE_ISP_CFG_FLAG
if( !CU::isIntra( cu ) || !isLuma( cu.chType ) || cu.firstPU->multiRefIdx || cu.ipcm || !cu.cs->sps->getUseISP() || cu.bdpcmMode )
#else
if( !CU::isIntra( cu ) || !isLuma( cu.chType ) || cu.firstPU->multiRefIdx || cu.ipcm || cu.bdpcmMode )
#endif
{
CHECK( cu.ispMode != NOT_INTRA_SUBPARTITIONS, "error: cu.intraSubPartitions != 0" );
return;
......
......@@ -426,9 +426,7 @@ protected:
int* m_aidQP;
uint32_t m_uiDeltaQpRD;
bool m_bFastDeltaQP;
#if INCLUDE_ISP_CFG_FLAG
bool m_ISP;
#endif
bool m_useFastISP;
bool m_bUseConstrainedIntraPred;
......@@ -893,10 +891,8 @@ public:
unsigned getVirtualBoundariesPosX ( unsigned idx ) const { return m_virtualBoundariesPosX[idx]; }
void setVirtualBoundariesPosY ( unsigned u, unsigned idx ) { m_virtualBoundariesPosY[idx] = u; }
unsigned getVirtualBoundariesPosY ( unsigned idx ) const { return m_virtualBoundariesPosY[idx]; }
#if INCLUDE_ISP_CFG_FLAG
void setUseISP ( bool b ) { m_ISP = b; }
bool getUseISP () const { return m_ISP; }
#endif
void setReshaper ( bool b ) { m_lumaReshapeEnable = b; }
bool getReshaper () const { return m_lumaReshapeEnable; }
void setReshapeSignalType ( uint32_t signalType ) { m_reshapeSignalType = signalType; }
......
......@@ -941,9 +941,7 @@ void EncLib::xInitSPS(SPS &sps)
sps.setWrapAroundEnabledFlag ( m_wrapAround );
sps.setWrapAroundOffset ( m_wrapAroundOffset );
// ADD_NEW_TOOL : (encoder lib) set tool enabling flags and associated parameters here
#if INCLUDE_ISP_CFG_FLAG
sps.setUseISP ( m_ISP );
#endif
sps.setUseReshaper ( m_lumaReshapeEnable );
sps.setUseMIP ( m_MIP );
int minCUSize = sps.getMaxCUWidth() >> sps.getLog2DiffMaxMinCodingBlockSize();
......
......@@ -317,11 +317,7 @@ bool IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
{
mtsUsageFlag = 0;
}
#if INCLUDE_ISP_CFG_FLAG
int nOptionsForISP = ( sps.getUseISP() && cu.mtsFlag == 0 && cu.lfnstIdx == 0 ) ? NUM_INTRA_SUBPARTITIONS_MODES : 1;
#else
int nOptionsForISP = ( cu.mtsFlag == 0 && cu.lfnstIdx == 0 ) ? NUM_INTRA_SUBPARTITIONS_MODES : 1;
#endif
double bestCurrentCost = bestCostSoFar;
int ispOptions[NUM_INTRA_SUBPARTITIONS_MODES] = { 0 };
......@@ -1823,11 +1819,7 @@ void IntraSearch::xIntraCodingTUBlock(TransformUnit &tu, const ComponentID &comp
const bool bUseCrossCPrediction = pps.getPpsRangeExtension().getCrossComponentPredictionEnabledFlag() && isChroma( compID ) && PU::isChromaIntraModeCrossCheckMode( pu ) && checkCrossCPrediction;
const bool ccUseRecoResi = m_pcEncCfg->getUseReconBasedCrossCPredictionEstimate();
#if INCLUDE_ISP_CFG_FLAG
const bool ispSplitIsAllowed = sps.getUseISP() && CU::canUseISPSplit( *tu.cu, compID );
#else
const bool ispSplitIsAllowed = CU::canUseISPSplit( *tu.cu, compID );
#endif
//===== init availability pattern =====
......@@ -2034,11 +2026,7 @@ void IntraSearch::xIntraCodingTUBlock(TransformUnit &tu, const ComponentID &comp
tu.mtsIdx = trModes->at(0).first;
}
m_pcTrQuant->transformNxN( tu, compID, cQP, uiAbsSum, m_CABACEstimator->getCtx(), loadTr, &diagRatio, &horVerRatio );
#if INCLUDE_ISP_CFG_FLAG
if ( !tu.cu->ispMode && isLuma(compID) && ispSplitIsAllowed && tu.mtsIdx == MTS_DCT2_DCT2 && ispSplitIsAllowed )
#else
if ( !tu.cu->ispMode && isLuma(compID) && ispSplitIsAllowed && tu.mtsIdx == MTS_DCT2_DCT2 )
#endif
{
m_intraModeDiagRatio .push_back(diagRatio);
m_intraModeHorVerRatio .push_back(horVerRatio);
......
......@@ -864,9 +864,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
// KJS: not in draft yet
WRITE_FLAG(pcSPS->getUseReshaper() ? 1 : 0, "sps_reshaper_enable_flag");
#if INCLUDE_ISP_CFG_FLAG
WRITE_FLAG( pcSPS->getUseISP() ? 1 : 0, "isp_enable_flag");
#endif
#if LUMA_ADAPTIVE_DEBLOCKING_FILTER_QP_OFFSET
WRITE_FLAG( pcSPS->getLadfEnabled() ? 1 : 0, "sps_ladf_enabled_flag" );
......
Supports Markdown
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