diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp index 32211333329059287740a36258be37beb88f6c8f..a1ded33b9b3f16cdd119028168fccac30f85d018 100755 --- a/source/Lib/CommonLib/UnitTools.cpp +++ b/source/Lib/CommonLib/UnitTools.cpp @@ -658,6 +658,7 @@ bool PU::isMIP(const PredictionUnit &pu, const ChannelType &chType) return (chType == CHANNEL_TYPE_LUMA && pu.cu->mipFlag); } +#if !JVET_O0925_MIP_SIMPLIFICATIONS int PU::getMipSizeId(const PredictionUnit &pu) { if ((pu.lwidth() == 4) && (pu.lheight() == 4)) @@ -674,7 +675,6 @@ int PU::getMipSizeId(const PredictionUnit &pu) } } -#if !JVET_O0925_MIP_SIMPLIFICATIONS int PU::getMipMPMs(const PredictionUnit &pu, unsigned *mpm) { const CompArea &area = pu.block( getFirstComponentOfChannel( CHANNEL_TYPE_LUMA ) ); diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h index 37a4d5d916671c7400db0b3b4a05b72d9fd462ee..4fdba645e5e70750334dd86897f9775399f60809 100644 --- a/source/Lib/CommonLib/UnitTools.h +++ b/source/Lib/CommonLib/UnitTools.h @@ -145,8 +145,8 @@ namespace PU bool isMIP (const PredictionUnit &pu, const ChannelType &chType = CHANNEL_TYPE_LUMA); #if !JVET_O0925_MIP_SIMPLIFICATIONS int getMipMPMs (const PredictionUnit &pu, unsigned *mpm); -#endif int getMipSizeId (const PredictionUnit &pu); +#endif uint32_t getIntraDirLuma (const PredictionUnit &pu); #if !JVET_O0925_MIP_SIMPLIFICATIONS AvailableInfo getAvailableInfoLuma (const PredictionUnit &pu);