Commit d6e7c8ce authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'Fix_mem_band_BIO_CPR' into 'master'

fix for ticket_#121 (JVET-J0090 related)

See merge request !124
parents b83bb305 6147d36e
Pipeline #447 passed with stage
......@@ -654,6 +654,7 @@ void InterPrediction::xPredInterBlk ( const ComponentID& compID, const Predictio
if (isCPR)
{
xFrac = yFrac = 0;
JVET_J0090_SET_CACHE_ENABLE( false );
}
#endif
xFrac <<= VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE - iAddPrecShift;
......@@ -726,8 +727,8 @@ void InterPrediction::xPredInterBlk ( const ComponentID& compID, const Predictio
#else
m_if.filterVer(compID, (Pel*) tmpBuf.buf + ((vFilterSize >> 1) - 1) * tmpBuf.stride, tmpBuf.stride, dstBuf.buf, dstBuf.stride, width, height, yFrac, false, rndRes, chFmt, clpRng);
#endif
JVET_J0090_SET_CACHE_ENABLE( true );
}
JVET_J0090_SET_CACHE_ENABLE( true );
#if JVET_L0256_BIO
if (bioApplied && compID == COMPONENT_Y)
{
......@@ -1108,7 +1109,9 @@ void InterPrediction::bioSampleExtendBilinearFilter(Pel const* src, int srcStrid
tmpBuf.stride = width;
m_if.filterHor(COMPONENT_Y, pSrc - ((vFilterSize >> 1) - 1) * srcStride, srcStride, tmpBuf.buf, tmpBuf.stride, widthTmp, heightTmp + vFilterSize - 1, fracX, false, fmt, clpRng, 1);
JVET_J0090_SET_CACHE_ENABLE( false );
m_if.filterVer(COMPONENT_Y, tmpBuf.buf + ((vFilterSize >> 1) - 1) * tmpBuf.stride, tmpBuf.stride, pDst, dstStride, widthTmp, heightTmp, fracY, false, isLast, fmt, clpRng, 1);
JVET_J0090_SET_CACHE_ENABLE( true );
}
}
}
......
......@@ -154,6 +154,9 @@ protected:
#if JVET_L0293_CPR
void xChromaMC(PredictionUnit &pu, PelUnitBuf& pcYuvPred);
#endif
#if JVET_J0090_MEMORY_BANDWITH_MEASURE
CacheModel *m_cacheModel;
#endif
public:
InterPrediction();
virtual ~InterPrediction();
......
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