[x265] [PATCH] cudata: rename CUGeom encodeIdx to absPartIdx, no behavior change
Steve Borho
steve at borho.org
Mon Feb 23 17:11:50 CET 2015
# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1424707816 21600
# Mon Feb 23 10:10:16 2015 -0600
# Node ID 12f00d5ca56f8951aa277577281827c6cc9415e4
# Parent 9d854bc555c7192cbacb2dba9a727f7fc31308f6
cudata: rename CUGeom encodeIdx to absPartIdx, no behavior change
Most everywhere else in the encoder, this value is called an absolute part
index. In several places the variable was copied into an absPartIdx auto
variable. We may as well be consistent
diff -r 9d854bc555c7 -r 12f00d5ca56f source/common/cudata.cpp
--- a/source/common/cudata.cpp Mon Feb 23 09:35:53 2015 -0600
+++ b/source/common/cudata.cpp Mon Feb 23 10:10:16 2015 -0600
@@ -300,12 +300,12 @@
// initialize Sub partition
void CUData::initSubCU(const CUData& ctu, const CUGeom& cuGeom)
{
- m_absIdxInCTU = cuGeom.encodeIdx;
+ m_absIdxInCTU = cuGeom.absPartIdx;
m_encData = ctu.m_encData;
m_slice = ctu.m_slice;
m_cuAddr = ctu.m_cuAddr;
- m_cuPelX = ctu.m_cuPelX + g_zscanToPelX[cuGeom.encodeIdx];
- m_cuPelY = ctu.m_cuPelY + g_zscanToPelY[cuGeom.encodeIdx];
+ m_cuPelX = ctu.m_cuPelX + g_zscanToPelX[cuGeom.absPartIdx];
+ m_cuPelY = ctu.m_cuPelY + g_zscanToPelY[cuGeom.absPartIdx];
m_cuLeft = ctu.m_cuLeft;
m_cuAbove = ctu.m_cuAbove;
m_cuAboveLeft = ctu.m_cuAboveLeft;
@@ -392,7 +392,7 @@
m_cuAbove = cu.m_cuAbove;
m_cuAboveLeft = cu.m_cuAboveLeft;
m_cuAboveRight = cu.m_cuAboveRight;
- m_absIdxInCTU = cuGeom.encodeIdx;
+ m_absIdxInCTU = cuGeom.absPartIdx;
m_numPartitions = cuGeom.numPartitions;
memcpy(m_qp, cu.m_qp, BytesPerPartition * m_numPartitions);
memcpy(m_mv[0], cu.m_mv[0], m_numPartitions * sizeof(MV));
@@ -462,9 +462,9 @@
m_encData = ctu.m_encData;
m_slice = ctu.m_slice;
m_cuAddr = ctu.m_cuAddr;
- m_cuPelX = ctu.m_cuPelX + g_zscanToPelX[cuGeom.encodeIdx];
- m_cuPelY = ctu.m_cuPelY + g_zscanToPelY[cuGeom.encodeIdx];
- m_absIdxInCTU = cuGeom.encodeIdx;
+ m_cuPelX = ctu.m_cuPelX + g_zscanToPelX[cuGeom.absPartIdx];
+ m_cuPelY = ctu.m_cuPelY + g_zscanToPelY[cuGeom.absPartIdx];
+ m_absIdxInCTU = cuGeom.absPartIdx;
m_numPartitions = cuGeom.numPartitions;
/* copy out all prediction info for this part */
@@ -2094,7 +2094,7 @@
CUGeom *cu = cuDataArray + cuIdx;
cu->log2CUSize = log2CUSize;
cu->childOffset = childIdx - cuIdx;
- cu->encodeIdx = g_depthScanIdx[yOffset][xOffset] * 4;
+ cu->absPartIdx = g_depthScanIdx[yOffset][xOffset] * 4;
cu->numPartitions = (NUM_4x4_PARTITIONS >> ((g_maxLog2CUSize - cu->log2CUSize) * 2));
cu->depth = g_log2Size[maxCUSize] - log2CUSize;
diff -r 9d854bc555c7 -r 12f00d5ca56f source/common/cudata.h
--- a/source/common/cudata.h Mon Feb 23 09:35:53 2015 -0600
+++ b/source/common/cudata.h Mon Feb 23 10:10:16 2015 -0600
@@ -82,7 +82,7 @@
uint32_t log2CUSize; // Log of the CU size.
uint32_t childOffset; // offset of the first child CU from current CU
- uint32_t encodeIdx; // Encoding index of this CU in terms of 4x4 blocks.
+ uint32_t absPartIdx; // Part index of this CU in terms of 4x4 blocks.
uint32_t numPartitions; // Number of 4x4 blocks in the CU
uint32_t depth; // depth of this CU relative from CTU
uint32_t flags; // CU flags.
diff -r 9d854bc555c7 -r 12f00d5ca56f source/common/deblock.cpp
--- a/source/common/deblock.cpp Mon Feb 23 09:35:53 2015 -0600
+++ b/source/common/deblock.cpp Mon Feb 23 10:10:16 2015 -0600
@@ -70,7 +70,7 @@
* param Edge the direction of the edge in block boundary (horizonta/vertical), which is added newly */
void Deblock::deblockCU(const CUData* cu, const CUGeom& cuGeom, const int32_t dir, uint8_t blockStrength[])
{
- uint32_t absPartIdx = cuGeom.encodeIdx;
+ uint32_t absPartIdx = cuGeom.absPartIdx;
uint32_t depth = cuGeom.depth;
if (cu->m_predMode[absPartIdx] == MODE_NONE)
return;
diff -r 9d854bc555c7 -r 12f00d5ca56f source/common/predict.cpp
--- a/source/common/predict.cpp Mon Feb 23 09:35:53 2015 -0600
+++ b/source/common/predict.cpp Mon Feb 23 10:10:16 2015 -0600
@@ -117,7 +117,7 @@
m_predSlice = cu.m_slice;
cu.getPartIndexAndSize(partIdx, m_puAbsPartIdx, m_puWidth, m_puHeight);
m_ctuAddr = cu.m_cuAddr;
- m_cuAbsPartIdx = cuGeom.encodeIdx;
+ m_cuAbsPartIdx = cuGeom.absPartIdx;
}
void Predict::prepMotionCompensation(const CUData& cu, const CUGeom& cuGeom, int partIdx)
@@ -620,7 +620,7 @@
int tuSize = intraNeighbors.tuSize;
int tuSize2 = tuSize << 1;
- pixel* adiOrigin = cu.m_encData->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + absPartIdx);
+ pixel* adiOrigin = cu.m_encData->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + absPartIdx);
intptr_t picStride = cu.m_encData->m_reconPic->m_stride;
fillReferenceSamples(adiOrigin, picStride, intraNeighbors, intraNeighbourBuf[0]);
@@ -687,7 +687,7 @@
void Predict::initAdiPatternChroma(const CUData& cu, const CUGeom& cuGeom, uint32_t absPartIdx, const IntraNeighbors& intraNeighbors, uint32_t chromaId)
{
- const pixel* adiOrigin = cu.m_encData->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.encodeIdx + absPartIdx);
+ const pixel* adiOrigin = cu.m_encData->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.absPartIdx + absPartIdx);
intptr_t picStride = cu.m_encData->m_reconPic->m_strideC;
fillReferenceSamples(adiOrigin, picStride, intraNeighbors, intraNeighbourBuf[0]);
diff -r 9d854bc555c7 -r 12f00d5ca56f source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp Mon Feb 23 09:35:53 2015 -0600
+++ b/source/encoder/analysis.cpp Mon Feb 23 10:10:16 2015 -0600
@@ -231,7 +231,7 @@
char* reusePartSizes = &m_reuseIntraDataCTU->partSizes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
uint8_t* reuseChromaModes = &m_reuseIntraDataCTU->chromaModes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
- if (mightNotSplit && depth == reuseDepth[zOrder] && zOrder == cuGeom.encodeIdx)
+ if (mightNotSplit && depth == reuseDepth[zOrder] && zOrder == cuGeom.absPartIdx)
{
m_quant.setQPforQuant(parentCTU);
@@ -291,7 +291,7 @@
const CUGeom& childGeom = *(&cuGeom + cuGeom.childOffset + subPartIdx);
if (childGeom.flags & CUGeom::PRESENT)
{
- m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.encodeIdx);
+ m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.absPartIdx);
m_rqt[nextDepth].cur.load(*nextContext);
compressIntraCU(parentCTU, childGeom, zOrder);
@@ -321,7 +321,7 @@
/* Copy best data to encData CTU and recon */
md.bestMode->cu.copyToPic(depth);
if (md.bestMode != &md.pred[PRED_SPLIT])
- md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, parentCTU.m_cuAddr, cuGeom.encodeIdx);
+ md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, parentCTU.m_cuAddr, cuGeom.absPartIdx);
}
bool Analysis::findJob(int threadId)
@@ -385,7 +385,7 @@
slave->m_slice = m_slice;
slave->m_frame = m_frame;
- slave->m_me.setSourcePU(*m_curInterMode->fencYuv, m_curInterMode->cu.m_cuAddr, m_curGeom->encodeIdx, m_puAbsPartIdx, m_puWidth, m_puHeight);
+ slave->m_me.setSourcePU(*m_curInterMode->fencYuv, m_curInterMode->cu.m_cuAddr, m_curGeom->absPartIdx, m_puAbsPartIdx, m_puWidth, m_puHeight);
slave->prepMotionCompensation(m_curInterMode->cu, *m_curGeom, m_curPart);
}
@@ -749,7 +749,7 @@
const CUGeom& childGeom = *(&cuGeom + cuGeom.childOffset + subPartIdx);
if (childGeom.flags & CUGeom::PRESENT)
{
- m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.encodeIdx);
+ m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.absPartIdx);
m_rqt[nextDepth].cur.load(*nextContext);
compressInterCU_dist(parentCTU, childGeom);
@@ -788,7 +788,7 @@
/* Copy best data to encData CTU and recon */
md.bestMode->cu.copyToPic(depth);
if (md.bestMode != &md.pred[PRED_SPLIT])
- md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, cuAddr, cuGeom.encodeIdx);
+ md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, cuAddr, cuGeom.absPartIdx);
}
void Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom& cuGeom)
@@ -984,7 +984,7 @@
residualTransformQuantIntra(*md.bestMode, cuGeom, 0, 0, tuDepthRange);
getBestIntraModeChroma(*md.bestMode, cuGeom);
residualQTIntraChroma(*md.bestMode, cuGeom, 0, 0);
- md.bestMode->reconYuv.copyFromPicYuv(*m_frame->m_reconPic, cu.m_cuAddr, cuGeom.encodeIdx); // TODO:
+ md.bestMode->reconYuv.copyFromPicYuv(*m_frame->m_reconPic, cu.m_cuAddr, cuGeom.absPartIdx); // TODO:
}
}
}
@@ -1022,7 +1022,7 @@
const CUGeom& childGeom = *(&cuGeom + cuGeom.childOffset + subPartIdx);
if (childGeom.flags & CUGeom::PRESENT)
{
- m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.encodeIdx);
+ m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.absPartIdx);
m_rqt[nextDepth].cur.load(*nextContext);
compressInterCU_rd0_4(parentCTU, childGeom);
@@ -1072,7 +1072,7 @@
/* Copy best data to encData CTU and recon */
md.bestMode->cu.copyToPic(depth);
if (md.bestMode != &md.pred[PRED_SPLIT] && m_param->rdLevel)
- md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, cuAddr, cuGeom.encodeIdx);
+ md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, cuAddr, cuGeom.absPartIdx);
}
void Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom& cuGeom, uint32_t &zOrder)
@@ -1088,7 +1088,7 @@
{
uint8_t* reuseDepth = &m_reuseInterDataCTU->depth[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
uint8_t* reuseModes = &m_reuseInterDataCTU->modes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
- if (mightNotSplit && depth == reuseDepth[zOrder] && zOrder == cuGeom.encodeIdx && reuseModes[zOrder] == MODE_SKIP)
+ if (mightNotSplit && depth == reuseDepth[zOrder] && zOrder == cuGeom.absPartIdx && reuseModes[zOrder] == MODE_SKIP)
{
md.pred[PRED_SKIP].cu.initSubCU(parentCTU, cuGeom);
md.pred[PRED_MERGE].cu.initSubCU(parentCTU, cuGeom);
@@ -1221,7 +1221,7 @@
const CUGeom& childGeom = *(&cuGeom + cuGeom.childOffset + subPartIdx);
if (childGeom.flags & CUGeom::PRESENT)
{
- m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.encodeIdx);
+ m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.absPartIdx);
m_rqt[nextDepth].cur.load(*nextContext);
compressInterCU_rd5_6(parentCTU, childGeom, zOrder);
@@ -1251,7 +1251,7 @@
/* Copy best data to encData CTU and recon */
md.bestMode->cu.copyToPic(depth);
if (md.bestMode != &md.pred[PRED_SPLIT])
- md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, parentCTU.m_cuAddr, cuGeom.encodeIdx);
+ md.bestMode->reconYuv.copyToPicYuv(*m_frame->m_reconPic, parentCTU.m_cuAddr, cuGeom.absPartIdx);
}
/* sets md.bestMode if a valid merge candidate is found, else leaves it NULL */
@@ -1680,8 +1680,8 @@
}
else
{
- pixel *fref0 = m_slice->m_mref[0][ref0].getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx);
- pixel *fref1 = m_slice->m_mref[1][ref1].getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx);
+ pixel *fref0 = m_slice->m_mref[0][ref0].getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx);
+ pixel *fref1 = m_slice->m_mref[1][ref1].getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx);
intptr_t refStride = m_slice->m_mref[0][0].lumaStride;
primitives.pu[partEnum].pixelavg_pp(tmpPredYuv.m_buf[0], tmpPredYuv.m_size, fref0, refStride, fref1, refStride, 32);
@@ -1732,7 +1732,7 @@
void Analysis::encodeResidue(const CUData& ctu, const CUGeom& cuGeom)
{
- if (cuGeom.depth < ctu.m_cuDepth[cuGeom.encodeIdx] && cuGeom.depth < g_maxCUDepth)
+ if (cuGeom.depth < ctu.m_cuDepth[cuGeom.absPartIdx] && cuGeom.depth < g_maxCUDepth)
{
for (uint32_t subPartIdx = 0; subPartIdx < 4; subPartIdx++)
{
@@ -1743,7 +1743,7 @@
return;
}
- uint32_t absPartIdx = cuGeom.encodeIdx;
+ uint32_t absPartIdx = cuGeom.absPartIdx;
int sizeIdx = cuGeom.log2CUSize - 2;
/* reuse the bestMode data structures at the current depth */
@@ -1902,11 +1902,11 @@
numRefs++;
const CUData& cu = *m_slice->m_refPicList[0][0]->m_encData->getPicCTU(parentCTU.m_cuAddr);
previousQP = cu.m_qp[0];
- if (!cu.m_cuDepth[cuGeom.encodeIdx])
+ if (!cu.m_cuDepth[cuGeom.absPartIdx])
return 0;
for (uint32_t i = 0; i < cuGeom.numPartitions && minDepth0; i += 4)
{
- uint32_t d = cu.m_cuDepth[cuGeom.encodeIdx + i];
+ uint32_t d = cu.m_cuDepth[cuGeom.absPartIdx + i];
minDepth0 = X265_MIN(d, minDepth0);
sum += d;
}
@@ -1915,11 +1915,11 @@
{
numRefs++;
const CUData& cu = *m_slice->m_refPicList[1][0]->m_encData->getPicCTU(parentCTU.m_cuAddr);
- if (!cu.m_cuDepth[cuGeom.encodeIdx])
+ if (!cu.m_cuDepth[cuGeom.absPartIdx])
return 0;
for (uint32_t i = 0; i < cuGeom.numPartitions; i += 4)
{
- uint32_t d = cu.m_cuDepth[cuGeom.encodeIdx + i];
+ uint32_t d = cu.m_cuDepth[cuGeom.absPartIdx + i];
minDepth1 = X265_MIN(d, minDepth1);
sum += d;
}
diff -r 9d854bc555c7 -r 12f00d5ca56f source/encoder/framefilter.cpp
--- a/source/encoder/framefilter.cpp Mon Feb 23 09:35:53 2015 -0600
+++ b/source/encoder/framefilter.cpp Mon Feb 23 10:10:16 2015 -0600
@@ -426,7 +426,7 @@
/* Original YUV restoration for CU in lossless coding */
static void origCUSampleRestoration(const CUData* cu, const CUGeom& cuGeom, Frame& frame)
{
- uint32_t absPartIdx = cuGeom.encodeIdx;
+ uint32_t absPartIdx = cuGeom.absPartIdx;
if (cu->m_cuDepth[absPartIdx] > cuGeom.depth)
{
for (int subPartIdx = 0; subPartIdx < 4; subPartIdx++)
diff -r 9d854bc555c7 -r 12f00d5ca56f source/encoder/search.cpp
--- a/source/encoder/search.cpp Mon Feb 23 09:35:53 2015 -0600
+++ b/source/encoder/search.cpp Mon Feb 23 10:10:16 2015 -0600
@@ -420,7 +420,7 @@
}
// set reconstruction for next intra prediction blocks if full TU prediction won
- pixel* picReconY = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + absPartIdx);
+ pixel* picReconY = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + absPartIdx);
intptr_t picStride = m_frame->m_reconPic->m_stride;
primitives.cu[sizeIdx].copy_pp(picReconY, picStride, reconQt, reconQtStride);
@@ -588,7 +588,7 @@
}
// set reconstruction for next intra prediction blocks
- pixel* picReconY = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + absPartIdx);
+ pixel* picReconY = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + absPartIdx);
intptr_t picStride = m_frame->m_reconPic->m_stride;
primitives.cu[sizeIdx].copy_pp(picReconY, picStride, reconQt, reconQtStride);
@@ -638,7 +638,7 @@
uint32_t sizeIdx = log2TrSize - 2;
primitives.cu[sizeIdx].calcresidual(fenc, pred, residual, stride);
- pixel* picReconY = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + absPartIdx);
+ pixel* picReconY = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + absPartIdx);
intptr_t picStride = m_frame->m_reconPic->m_stride;
uint32_t numSig = m_quant.transformNxN(cu, fenc, stride, residual, stride, coeffY, log2TrSize, TEXT_LUMA, absPartIdx, false);
@@ -798,7 +798,7 @@
coeff_t* coeffC = m_rqt[qtLayer].coeffRQT[chromaId] + coeffOffsetC;
pixel* reconQt = m_rqt[qtLayer].reconQtYuv.getChromaAddr(chromaId, absPartIdxC);
uint32_t reconQtStride = m_rqt[qtLayer].reconQtYuv.m_csize;
- pixel* picReconC = m_frame->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.encodeIdx + absPartIdxC);
+ pixel* picReconC = m_frame->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.absPartIdx + absPartIdxC);
intptr_t picStride = m_frame->m_reconPic->m_strideC;
uint32_t chromaPredMode = cu.m_chromaIntraDir[absPartIdxC];
@@ -978,7 +978,7 @@
cu.setCbfPartRange(bCbf << tuDepth, ttype, absPartIdxC, tuIterator.absPartIdxStep);
cu.setTransformSkipPartRange(bTSkip, ttype, absPartIdxC, tuIterator.absPartIdxStep);
- pixel* reconPicC = m_frame->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.encodeIdx + absPartIdxC);
+ pixel* reconPicC = m_frame->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.absPartIdx + absPartIdxC);
intptr_t picStride = m_frame->m_reconPic->m_strideC;
primitives.cu[sizeIdxC].copy_pp(reconPicC, picStride, reconQt, reconQtStride);
@@ -1088,7 +1088,7 @@
int16_t* residual = resiYuv.getChromaAddr(chromaId, absPartIdxC);
uint32_t coeffOffsetC = absPartIdxC << (LOG2_UNIT_SIZE * 2 - (m_hChromaShift + m_vChromaShift));
coeff_t* coeffC = cu.m_trCoeff[ttype] + coeffOffsetC;
- pixel* picReconC = m_frame->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.encodeIdx + absPartIdxC);
+ pixel* picReconC = m_frame->m_reconPic->getChromaAddr(chromaId, cu.m_cuAddr, cuGeom.absPartIdx + absPartIdxC);
intptr_t picStride = m_frame->m_reconPic->m_strideC;
uint32_t chromaPredMode = cu.m_chromaIntraDir[absPartIdxC];
@@ -1589,7 +1589,7 @@
* output recon picture, so it cannot proceed in parallel with anything else when doing INTRA_NXN. Also
* it is not updating m_rdContexts[depth].cur for the later PUs which I suspect is slightly wrong. I think
* that the contexts should be tracked through each PU */
- pixel* dst = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + absPartIdx);
+ pixel* dst = m_frame->m_reconPic->getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + absPartIdx);
uint32_t dststride = m_frame->m_reconPic->m_stride;
const pixel* src = reconYuv->getLumaAddr(absPartIdx);
uint32_t srcstride = reconYuv->m_size;
@@ -1754,7 +1754,7 @@
if (!tuIterator.isLastSection())
{
- uint32_t zorder = cuGeom.encodeIdx + absPartIdxC;
+ uint32_t zorder = cuGeom.absPartIdx + absPartIdxC;
uint32_t dststride = m_frame->m_reconPic->m_strideC;
const pixel* src;
pixel* dst;
@@ -1956,7 +1956,7 @@
/* sets m_puAbsPartIdx, m_puWidth, m_puHeight */
initMotionCompensation(cu, cuGeom, puIdx);
- m_me.setSourcePU(*interMode.fencYuv, cu.m_cuAddr, cuGeom.encodeIdx, m_puAbsPartIdx, m_puWidth, m_puHeight);
+ m_me.setSourcePU(*interMode.fencYuv, cu.m_cuAddr, cuGeom.absPartIdx, m_puAbsPartIdx, m_puWidth, m_puHeight);
uint32_t mrgCost = MAX_UINT;
@@ -2246,8 +2246,8 @@
}
else
{
- const pixel* ref0 = m_slice->m_mref[0][bestME[0].ref].getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + m_puAbsPartIdx);
- const pixel* ref1 = m_slice->m_mref[1][bestME[1].ref].getLumaAddr(cu.m_cuAddr, cuGeom.encodeIdx + m_puAbsPartIdx);
+ const pixel* ref0 = m_slice->m_mref[0][bestME[0].ref].getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + m_puAbsPartIdx);
+ const pixel* ref1 = m_slice->m_mref[1][bestME[1].ref].getLumaAddr(cu.m_cuAddr, cuGeom.absPartIdx + m_puAbsPartIdx);
intptr_t refStride = slice->m_mref[0][0].lumaStride;
primitives.pu[m_me.partEnum].pixelavg_pp(tmpPredYuv.m_buf[0], tmpPredYuv.m_size, ref0, refStride, ref1, refStride, 32);
More information about the x265-devel
mailing list