Commit 51e64553 authored by Xiang Li's avatar Xiang Li

fix compiling issues when JEM_TOOLS is off

parent e15d4056
......@@ -682,8 +682,16 @@ void InterPrediction::xChromaMC(PredictionUnit &pu, PelUnitBuf& pcYuvPred)
subPu.UnitArea::operator=(UnitArea(pu.chromaFormat, Area(x, y, MIN_PU_SIZE, MIN_PU_SIZE)));
PelUnitBuf subPredBuf = pcYuvPred.subBuf(UnitAreaRelative(pu, subPu));
xPredInterBlk(COMPONENT_Cb, subPu, refPic, curMi.mv[0], subPredBuf, false, pu.cu->slice->clpRng(COMPONENT_Cb), false, false, FRUC_MERGE_OFF, false);
xPredInterBlk(COMPONENT_Cr, subPu, refPic, curMi.mv[0], subPredBuf, false, pu.cu->slice->clpRng(COMPONENT_Cr), false, false, FRUC_MERGE_OFF, false);
xPredInterBlk(COMPONENT_Cb, subPu, refPic, curMi.mv[0], subPredBuf, false, pu.cu->slice->clpRng(COMPONENT_Cb)
#if JEM_TOOLS
, false, false, FRUC_MERGE_OFF, false
#endif
);
xPredInterBlk(COMPONENT_Cr, subPu, refPic, curMi.mv[0], subPredBuf, false, pu.cu->slice->clpRng(COMPONENT_Cr)
#if JEM_TOOLS
, false, false, FRUC_MERGE_OFF, false
#endif
);
}
}
}
......@@ -696,7 +704,11 @@ void InterPrediction::xPredInterUni(const PredictionUnit& pu, const RefPicList&
#endif
)
#else
void InterPrediction::xPredInterUni(const PredictionUnit& pu, const RefPicList& eRefPicList, PelUnitBuf& pcYuvPred, const bool& bi )
void InterPrediction::xPredInterUni(const PredictionUnit& pu, const RefPicList& eRefPicList, PelUnitBuf& pcYuvPred, const bool& bi
#if JVET_K0076_CPR_DT
, const bool luma, const bool chroma
#endif
)
#endif
{
const SPS &sps = *pu.cs->sps;
......@@ -1863,7 +1875,11 @@ void InterPrediction::motionCompensation( PredictionUnit &pu, PelUnitBuf &predBu
}
else // (luma && !chroma)
{
xPredInterUni(pu, eRefPicList, predBuf, false, false, false, luma, chroma);
xPredInterUni(pu, eRefPicList, predBuf, false,
#if JEM_TOOLS
false, false,
#endif
luma, chroma);
return;
}
}
......
......@@ -224,7 +224,11 @@ protected:
);
void xPredInterBi ( PredictionUnit& pu, PelUnitBuf &pcYuvPred, bool obmc = false );
#else
void xPredInterUni ( const PredictionUnit& pu, const RefPicList& eRefPicList, PelUnitBuf& pcYuvPred, const bool& bi );
void xPredInterUni ( const PredictionUnit& pu, const RefPicList& eRefPicList, PelUnitBuf& pcYuvPred, const bool& bi
#if JVET_K0076_CPR_DT
, const bool luma = true, const bool chroma = true
#endif
);
void xPredInterBi ( PredictionUnit& pu, PelUnitBuf &pcYuvPred );
#endif
void xPredInterBlk ( const ComponentID& compID, const PredictionUnit& pu, const Picture* refPic, const Mv& _mv, PelUnitBuf& dstPic, const bool& bi, const ClpRng& clpRng
......
......@@ -4277,7 +4277,11 @@ void clipColBlkMv(int& mvX, int& mvY, const PredictionUnit& pu)
}
#endif
bool PU::getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx& mrgCtx, bool& LICFlag, const int count)
bool PU::getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx& mrgCtx, bool& LICFlag, const int count
#if JVET_K0076_CPR
, const int countIBC
#endif
)
{
const Slice &slice = *pu.cs->slice;
#if JVET_K0346
......
......@@ -188,7 +188,11 @@ namespace PU
void setAllAffineMv ( PredictionUnit &pu, Mv affLT, Mv affRT, Mv affLB, RefPicList eRefList );
#endif
#if !JEM_TOOLS && JVET_K0346
bool getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx &mrgCtx, bool& LICFlag, const int count);
bool getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx &mrgCtx, bool& LICFlag, const int count
#if JVET_K0076_CPR
, const int countIBC
#endif
);
bool getInterMergeSubPuRecurCand(const PredictionUnit &pu, MergeCtx &mrgCtx, const int count);
#endif
bool isBiPredFromDifferentDir (const PredictionUnit &pu);
......
......@@ -1458,7 +1458,7 @@ bool InterSearch::predIntraBCSearch(CodingUnit& cu, Partitioner& partitioner, co
for (int bvpIdxTemp = 0; bvpIdxTemp<iBvpNum; bvpIdxTemp++)
{
m_pcRdCost->setPredictor(cMvPred[bvpIdxTemp]);
#if JEM_TOOLS
#if JVET_K0357_AMVR
bitsBVPTemp = m_pcRdCost->getBitsOfVectorWithPredictor(cMv.getHor(), cMv.getVer(), 0);
#else
bitsBVPTemp = m_pcRdCost->getBitsOfVectorWithPredictor(cMv.getHor(), cMv.getVer());
......@@ -1490,7 +1490,7 @@ bool InterSearch::predIntraBCSearch(CodingUnit& cu, Partitioner& partitioner, co
mvPredQuadPel >>= 4;
//mvPredQuadPel.set((cMvPred[bvpIdxTemp].hor >> 2) << 2, (cMvPred[bvpIdxTemp].ver >> 2) << 2);
m_pcRdCost->setPredictor(mvPredQuadPel);
#if JEM_TOOLS
#if JVET_K0357_AMVR
bitsBVPQP = m_pcRdCost->getBitsOfVectorWithPredictor(cMv.getHor() >> 2, cMv.getVer() >> 2, 0);
#else
costQuadPel = m_pcRdCost->getBitsOfVectorWithPredictor(candMv.getHor(), candMv.getVer());
......@@ -1569,7 +1569,7 @@ void InterSearch::xxIntraBlockCopyHashSearch(PredictionUnit& pu, Mv* mvPred, int
for (int n = 0; n < numMvPred; n++)
{
m_pcRdCost->setPredictor(mvPred[n]);
#if JEM_TOOLS
#if JVET_K0357_AMVR
unsigned int cost = m_pcRdCost->getBitsOfVectorWithPredictor(candMv.getHor(), candMv.getVer(), 0);
#else
UInt cost = m_pcRdCost->getBitsOfVectorWithPredictor(candMv.getHor(), candMv.getVer());
......@@ -1591,7 +1591,7 @@ void InterSearch::xxIntraBlockCopyHashSearch(PredictionUnit& pu, Mv* mvPred, int
mvPredQuadPel.set(((mvPred[n].hor + offset) >> 2), ((mvPred[n].ver + offset) >> 2));
m_pcRdCost->setPredictor(mvPredQuadPel);
#if JEM_TOOLS
#if JVET_K0357_AMVR
costQuadPel = m_pcRdCost->getBitsOfVectorWithPredictor(candMv.getHor() >> 2, candMv.getVer() >> 2, 0);
#else
costQuadPel = m_pcRdCost->getBitsOfVectorWithPredictor(candMv.getHor(), candMv.getVer());
......
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