[x265-commits] [x265] sps: class to struct, remove m_ prefixes
Steve Borho
steve at borho.org
Thu Jul 17 08:02:07 CEST 2014
details: http://hg.videolan.org/x265/rev/59782b2bc59c
branches:
changeset: 7415:59782b2bc59c
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 20:53:03 2014 -0500
description:
sps: class to struct, remove m_ prefixes
Subject: [x265] sps: fix check statement
details: http://hg.videolan.org/x265/rev/8193ac4172fe
branches:
changeset: 7416:8193ac4172fe
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 23:13:22 2014 -0500
description:
sps: fix check statement
Subject: [x265] vps: remove constructor, those values are always initialized
details: http://hg.videolan.org/x265/rev/c64bca550377
branches:
changeset: 7417:c64bca550377
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 20:57:11 2014 -0500
description:
vps: remove constructor, those values are always initialized
Subject: [x265] slice: white-space nits
details: http://hg.videolan.org/x265/rev/febec529cc80
branches:
changeset: 7418:febec529cc80
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 20:59:13 2014 -0500
description:
slice: white-space nits
Subject: [x265] pps: remove set/get methods and hard-coded members
details: http://hg.videolan.org/x265/rev/31d11036bf9c
branches:
changeset: 7419:31d11036bf9c
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 22:08:55 2014 -0500
description:
pps: remove set/get methods and hard-coded members
Subject: [x265] pps: class to struct, remove m_ prefix, unify naming scheme
details: http://hg.videolan.org/x265/rev/677547b73129
branches:
changeset: 7420:677547b73129
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 23:00:15 2014 -0500
description:
pps: class to struct, remove m_ prefix, unify naming scheme
Subject: [x265] pps: move deblocking logic together, fix a couple signaling bugs
details: http://hg.videolan.org/x265/rev/bb5e9a11868c
branches:
changeset: 7421:bb5e9a11868c
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 23:34:55 2014 -0500
description:
pps: move deblocking logic together, fix a couple signaling bugs
Subject: [x265] pps: we never very chroma QP per picture, so remove bSliceChromaQpFlag
details: http://hg.videolan.org/x265/rev/b59d09ca6c1b
branches:
changeset: 7422:b59d09ca6c1b
user: Steve Borho <steve at borho.org>
date: Wed Jul 16 23:55:27 2014 -0500
description:
pps: we never very chroma QP per picture, so remove bSliceChromaQpFlag
Subject: [x265] encoder: make SPS and PPS top-level encoder singletons
details: http://hg.videolan.org/x265/rev/f0d157944c55
branches:
changeset: 7423:f0d157944c55
user: Steve Borho <steve at borho.org>
date: Thu Jul 17 00:37:00 2014 -0500
description:
encoder: make SPS and PPS top-level encoder singletons
This fixes a subtle bug. If level requirements forced the max references to
be lowered, VPS and SPS maxDecPicBuffering was never adjusted. Now, they are
not configured until after level enforcement has set them to final values.
diffstat:
source/Lib/TLibCommon/TComDataCU.cpp | 52 ++--
source/Lib/TLibCommon/TComLoopFilter.cpp | 8 +-
source/Lib/TLibCommon/TComPattern.cpp | 4 +-
source/Lib/TLibCommon/TComPrediction.cpp | 8 +-
source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp | 4 +-
source/Lib/TLibCommon/TComSlice.cpp | 22 --
source/Lib/TLibCommon/TComSlice.h | 222 ++++----------------
source/Lib/TLibCommon/TComTrQuant.cpp | 6 +-
source/Lib/TLibCommon/TComWeightPrediction.cpp | 2 +-
source/Lib/TLibEncoder/TEncSearch.cpp | 98 ++++----
source/encoder/analysis.cpp | 68 +++---
source/encoder/api.cpp | 4 +-
source/encoder/dpb.cpp | 2 +-
source/encoder/encoder.cpp | 181 +++++++++++-----
source/encoder/encoder.h | 12 +-
source/encoder/entropy.cpp | 216 +++++++++-----------
source/encoder/frameencoder.cpp | 118 +---------
source/encoder/frameencoder.h | 4 -
source/encoder/framefilter.cpp | 2 +-
source/encoder/ratecontrol.cpp | 12 +-
source/encoder/ratecontrol.h | 2 +-
source/encoder/sei.h | 4 +-
22 files changed, 435 insertions(+), 616 deletions(-)
diffs (truncated from 2415 to 300 lines):
diff -r e288df705bf3 -r f0d157944c55 source/Lib/TLibCommon/TComDataCU.cpp
--- a/source/Lib/TLibCommon/TComDataCU.cpp Wed Jul 16 20:29:46 2014 -0500
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Thu Jul 17 00:37:00 2014 -0500
@@ -363,7 +363,7 @@ void TComDataCU::initCU(Frame* pic, uint
m_cuMvField[0].clearMvField();
m_cuMvField[1].clearMvField();
- if (getSlice()->getPPS()->getTransquantBypassEnableFlag())
+ if (getSlice()->getPPS()->bTransquantBypassEnabled)
{
uint32_t y_tmp = 1 << (g_maxLog2CUSize * 2);
uint32_t c_tmp = 1 << (g_maxLog2CUSize * 2 - m_hChromaShift - m_vChromaShift);
@@ -566,7 +566,7 @@ void TComDataCU::copyPartFrom(TComDataCU
memcpy(m_trCoeff[1] + tmpC2, cu->m_trCoeff[1], sizeof(coeff_t) * tmpC);
memcpy(m_trCoeff[2] + tmpC2, cu->m_trCoeff[2], sizeof(coeff_t) * tmpC);
- if (getSlice()->getPPS()->getTransquantBypassEnableFlag())
+ if (getSlice()->getPPS()->bTransquantBypassEnabled)
{
memcpy(m_tqBypassOrigYuv[0] + tmp2, cu->getLumaOrigYuv(), sizeof(pixel) * tmp);
@@ -630,7 +630,7 @@ void TComDataCU::copyToPic(uint8_t depth
memcpy(cu->m_trCoeff[1] + tmpC2, m_trCoeff[1], sizeof(coeff_t) * tmpC);
memcpy(cu->m_trCoeff[2] + tmpC2, m_trCoeff[2], sizeof(coeff_t) * tmpC);
- if (getSlice()->getPPS()->getTransquantBypassEnableFlag())
+ if (getSlice()->getPPS()->bTransquantBypassEnabled)
{
uint32_t tmp = 1 << ((g_maxLog2CUSize - depth) * 2);
uint32_t tmp2 = m_absIdxInLCU << m_pic->getLog2UnitSize() * 2;
@@ -721,7 +721,7 @@ void TComDataCU::copyToPic(uint8_t depth
memcpy(cu->m_trCoeff[1] + tmpC2, m_trCoeff[1], sizeof(coeff_t) * tmpC);
memcpy(cu->m_trCoeff[2] + tmpC2, m_trCoeff[2], sizeof(coeff_t) * tmpC);
- if (getSlice()->getPPS()->getTransquantBypassEnableFlag())
+ if (getSlice()->getPPS()->bTransquantBypassEnabled)
{
memcpy(cu->getLumaOrigYuv() + tmpY2, m_tqBypassOrigYuv[0], sizeof(pixel) * tmpY);
@@ -825,7 +825,7 @@ TComDataCU* TComDataCU::getPUAboveRight(
uint32_t absPartIdxRT = g_zscanToRaster[curPartUnitIdx];
uint32_t numPartInCUSize = m_pic->getNumPartInCUSize();
- if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + m_pic->getUnitSize()) >= m_slice->getSPS()->m_picWidthInLumaSamples)
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + m_pic->getUnitSize()) >= m_slice->getSPS()->picWidthInLumaSamples)
return NULL;
if (RasterAddress::lessThanCol(absPartIdxRT, numPartInCUSize - 1, numPartInCUSize))
@@ -865,7 +865,7 @@ TComDataCU* TComDataCU::getPUBelowLeft(u
{
uint32_t absPartIdxLB = g_zscanToRaster[curPartUnitIdx];
- if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxLB] + m_pic->getUnitSize()) >= m_slice->getSPS()->m_picHeightInLumaSamples)
+ if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxLB] + m_pic->getUnitSize()) >= m_slice->getSPS()->picHeightInLumaSamples)
{
return NULL;
}
@@ -904,7 +904,7 @@ TComDataCU* TComDataCU::getPUBelowLeftAd
uint32_t absPartIdxLB = g_zscanToRaster[curPartUnitIdx];
if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxLB] + (partUnitOffset << m_pic->getLog2UnitSize())) >=
- m_slice->getSPS()->m_picHeightInLumaSamples)
+ m_slice->getSPS()->picHeightInLumaSamples)
{
return NULL;
}
@@ -947,7 +947,7 @@ TComDataCU* TComDataCU::getPUAboveRightA
uint32_t absPartIdxRT = g_zscanToRaster[curPartUnitIdx];
if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + (partUnitOffset << m_pic->getLog2UnitSize())) >=
- m_slice->getSPS()->m_picWidthInLumaSamples)
+ m_slice->getSPS()->picWidthInLumaSamples)
{
return NULL;
}
@@ -1004,8 +1004,8 @@ TComDataCU* TComDataCU::getPUAboveRightA
TComDataCU* TComDataCU::getQpMinCuLeft(uint32_t& lPartUnitIdx, uint32_t curAbsIdxInLCU)
{
uint32_t numPartInCUSize = m_pic->getNumPartInCUSize();
- uint32_t absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1)) <<
- ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1);
+ uint32_t absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - getSlice()->getPPS()->maxCuDQPDepth) << 1)) <<
+ ((g_maxCUDepth - getSlice()->getPPS()->maxCuDQPDepth) << 1);
uint32_t absRorderQpMinCUIdx = g_zscanToRaster[absZorderQpMinCUIdx];
// check for left LCU boundary
@@ -1029,8 +1029,8 @@ TComDataCU* TComDataCU::getQpMinCuLeft(u
TComDataCU* TComDataCU::getQpMinCuAbove(uint32_t& aPartUnitIdx, uint32_t curAbsIdxInLCU)
{
uint32_t numPartInCUSize = m_pic->getNumPartInCUSize();
- uint32_t absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1)) <<
- ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1);
+ uint32_t absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - getSlice()->getPPS()->maxCuDQPDepth) << 1)) <<
+ ((g_maxCUDepth - getSlice()->getPPS()->maxCuDQPDepth) << 1);
uint32_t absRorderQpMinCUIdx = g_zscanToRaster[absZorderQpMinCUIdx];
// check for top LCU boundary
@@ -1074,7 +1074,7 @@ int TComDataCU::getLastValidPartIdx(int
char TComDataCU::getLastCodedQP(uint32_t absPartIdx)
{
- uint32_t quPartIdxMask = ~((1 << ((g_maxCUDepth - getSlice()->getPPS()->getMaxCuDQPDepth()) << 1)) - 1);
+ uint32_t quPartIdxMask = ~((1 << ((g_maxCUDepth - getSlice()->getPPS()->maxCuDQPDepth) << 1)) - 1);
int lastValidPartIdx = getLastValidPartIdx(absPartIdx & quPartIdxMask);
if (lastValidPartIdx >= 0)
@@ -1087,7 +1087,7 @@ char TComDataCU::getLastCodedQP(uint32_t
{
return getPic()->getCU(getAddr())->getLastCodedQP(getZorderIdxInCU());
}
- else if (getAddr() > 0 && !(getSlice()->getPPS()->getEntropyCodingSyncEnabledFlag() &&
+ else if (getAddr() > 0 && !(getSlice()->getPPS()->bEntropyCodingSyncEnabled &&
getAddr() % getPic()->getFrameWidthInCU() == 0))
{
return getPic()->getCU(getAddr() - 1)->getLastCodedQP(getPic()->getNumPartInCU());
@@ -1105,7 +1105,7 @@ char TComDataCU::getLastCodedQP(uint32_t
*/
bool TComDataCU::isLosslessCoded(uint32_t absPartIdx)
{
- return getSlice()->getPPS()->getTransquantBypassEnableFlag() && getCUTransquantBypass(absPartIdx);
+ return getSlice()->getPPS()->bTransquantBypassEnabled && getCUTransquantBypass(absPartIdx);
}
/** Get allowed chroma intra modes
@@ -1210,25 +1210,25 @@ uint32_t TComDataCU::getQuadtreeTULog2Mi
{
uint32_t log2CUSize = getLog2CUSize(absPartIdx);
PartSize partSize = getPartitionSize(absPartIdx);
- uint32_t quadtreeTUMaxDepth = getPredictionMode(absPartIdx) == MODE_INTRA ? m_slice->getSPS()->m_quadtreeTUMaxDepthIntra : m_slice->getSPS()->m_quadtreeTUMaxDepthInter;
+ uint32_t quadtreeTUMaxDepth = getPredictionMode(absPartIdx) == MODE_INTRA ? m_slice->getSPS()->quadtreeTUMaxDepthIntra : m_slice->getSPS()->quadtreeTUMaxDepthInter;
int intraSplitFlag = (getPredictionMode(absPartIdx) == MODE_INTRA && partSize == SIZE_NxN) ? 1 : 0;
int interSplitFlag = ((quadtreeTUMaxDepth == 1) && (getPredictionMode(absPartIdx) == MODE_INTER) && (partSize != SIZE_2Nx2N));
uint32_t log2MinTUSizeInCU = 0;
- if (log2CUSize < (m_slice->getSPS()->m_quadtreeTULog2MinSize + quadtreeTUMaxDepth - 1 + interSplitFlag + intraSplitFlag))
+ if (log2CUSize < (m_slice->getSPS()->quadtreeTULog2MinSize + quadtreeTUMaxDepth - 1 + interSplitFlag + intraSplitFlag))
{
// when fully making use of signaled TUMaxDepth + inter/intraSplitFlag, resulting luma TB size is < QuadtreeTULog2MinSize
- log2MinTUSizeInCU = m_slice->getSPS()->m_quadtreeTULog2MinSize;
+ log2MinTUSizeInCU = m_slice->getSPS()->quadtreeTULog2MinSize;
}
else
{
// when fully making use of signaled TUMaxDepth + inter/intraSplitFlag, resulting luma TB size is still >= QuadtreeTULog2MinSize
log2MinTUSizeInCU = log2CUSize - (quadtreeTUMaxDepth - 1 + interSplitFlag + intraSplitFlag); // stop when trafoDepth == hierarchy_depth = splitFlag
- if (log2MinTUSizeInCU > m_slice->getSPS()->m_quadtreeTULog2MaxSize)
+ if (log2MinTUSizeInCU > m_slice->getSPS()->quadtreeTULog2MaxSize)
{
// when fully making use of signaled TUMaxDepth + inter/intraSplitFlag, resulting luma TB size is still > QuadtreeTULog2MaxSize
- log2MinTUSizeInCU = m_slice->getSPS()->m_quadtreeTULog2MaxSize;
+ log2MinTUSizeInCU = m_slice->getSPS()->quadtreeTULog2MaxSize;
}
}
return log2MinTUSizeInCU;
@@ -2030,10 +2030,10 @@ void TComDataCU::getInterMergeCandidates
int refIdx;
int lcuIdx = -1;
- if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[uiAbsPartIdxTmp] + m_pic->getUnitSize()) >= m_slice->getSPS()->m_picWidthInLumaSamples) // image boundary check
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[uiAbsPartIdxTmp] + m_pic->getUnitSize()) >= m_slice->getSPS()->picWidthInLumaSamples) // image boundary check
{
}
- else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[uiAbsPartIdxTmp] + m_pic->getUnitSize()) >= m_slice->getSPS()->m_picHeightInLumaSamples)
+ else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[uiAbsPartIdxTmp] + m_pic->getUnitSize()) >= m_slice->getSPS()->picHeightInLumaSamples)
{
}
else
@@ -2364,10 +2364,10 @@ int TComDataCU::fillMvpCand(uint32_t par
//---- co-located RightBottom Temporal Predictor (H) ---//
absPartIdx = g_zscanToRaster[partIdxRB];
int lcuIdx = -1;
- if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdx] + m_pic->getUnitSize()) >= m_slice->getSPS()->m_picWidthInLumaSamples) // image boundary check
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdx] + m_pic->getUnitSize()) >= m_slice->getSPS()->picWidthInLumaSamples) // image boundary check
{
}
- else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdx] + m_pic->getUnitSize()) >= m_slice->getSPS()->m_picHeightInLumaSamples)
+ else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdx] + m_pic->getUnitSize()) >= m_slice->getSPS()->picHeightInLumaSamples)
{
}
else
@@ -2430,10 +2430,10 @@ void TComDataCU::clipMv(MV& outMV)
{
int mvshift = 2;
int offset = 8;
- int xmax = (m_slice->getSPS()->m_picWidthInLumaSamples + offset - m_cuPelX - 1) << mvshift;
+ int xmax = (m_slice->getSPS()->picWidthInLumaSamples + offset - m_cuPelX - 1) << mvshift;
int xmin = (-(int)g_maxCUSize - offset - (int)m_cuPelX + 1) << mvshift;
- int ymax = (m_slice->getSPS()->m_picHeightInLumaSamples + offset - m_cuPelY - 1) << mvshift;
+ int ymax = (m_slice->getSPS()->picHeightInLumaSamples + offset - m_cuPelY - 1) << mvshift;
int ymin = (-(int)g_maxCUSize - offset - (int)m_cuPelY + 1) << mvshift;
outMV.x = X265_MIN(xmax, X265_MAX(xmin, (int)outMV.x));
diff -r e288df705bf3 -r f0d157944c55 source/Lib/TLibCommon/TComLoopFilter.cpp
--- a/source/Lib/TLibCommon/TComLoopFilter.cpp Wed Jul 16 20:29:46 2014 -0500
+++ b/source/Lib/TLibCommon/TComLoopFilter.cpp Thu Jul 17 00:37:00 2014 -0500
@@ -120,7 +120,7 @@ void TComLoopFilter::xDeblockCU(TComData
{
uint32_t lpelx = cu->getCUPelX() + g_rasterToPelX[g_zscanToRaster[absZOrderIdx]];
uint32_t tpely = cu->getCUPelY() + g_rasterToPelY[g_zscanToRaster[absZOrderIdx]];
- if ((lpelx < cu->getSlice()->getSPS()->m_picWidthInLumaSamples) && (tpely < cu->getSlice()->getSPS()->m_picHeightInLumaSamples))
+ if ((lpelx < cu->getSlice()->getSPS()->picWidthInLumaSamples) && (tpely < cu->getSlice()->getSPS()->picHeightInLumaSamples))
{
xDeblockCU(cu, absZOrderIdx, depth + 1, dir, edgeFilter, blockingStrength);
}
@@ -519,7 +519,7 @@ void TComLoopFilter::xEdgeFilterLuma(TCo
int dq = dq0 + dq3;
int d = d0 + d3;
- if (cu->getSlice()->getPPS()->getTransquantBypassEnableFlag())
+ if (cu->getSlice()->getPPS()->bTransquantBypassEnabled)
{
// check if each of PUs is lossless coded
bPartPNoFilter = cuP->isLosslessCoded(partP);
@@ -627,7 +627,7 @@ void TComLoopFilter::xEdgeFilterChroma(T
qpP = cuP->getQP(partP);
- if (cu->getSlice()->getPPS()->getTransquantBypassEnableFlag())
+ if (cu->getSlice()->getPPS()->bTransquantBypassEnabled)
{
// check if each of PUs is lossless coded
bPartPNoFilter = cuP->isLosslessCoded(partP);
@@ -636,7 +636,7 @@ void TComLoopFilter::xEdgeFilterChroma(T
for (uint32_t chromaIdx = 0; chromaIdx < 2; chromaIdx++)
{
- int chromaQPOffset = (chromaIdx == 0) ? cu->getSlice()->getPPS()->getChromaCbQpOffset() : cu->getSlice()->getPPS()->getChromaCrQpOffset();
+ int chromaQPOffset = (chromaIdx == 0) ? cu->getSlice()->getPPS()->chromaCbQpOffset : cu->getSlice()->getPPS()->chromaCrQpOffset;
pixel* piTmpSrcChroma = (chromaIdx == 0) ? tmpSrcCb : tmpSrcCr;
qp = QpUV((((qpP + qpQ + 1) >> 1) + chromaQPOffset), cu->getChromaFormat());
int iBitdepthScale = 1 << (X265_DEPTH - 8);
diff -r e288df705bf3 -r f0d157944c55 source/Lib/TLibCommon/TComPattern.cpp
--- a/source/Lib/TLibCommon/TComPattern.cpp Wed Jul 16 20:29:46 2014 -0500
+++ b/source/Lib/TLibCommon/TComPattern.cpp Thu Jul 17 00:37:00 2014 -0500
@@ -93,7 +93,7 @@ void TComPattern::initAdiPattern(TComDat
// above border from left to right
memcpy(&filterBuf[l], &adiTemp[1], tuSize2 * sizeof(*filterBuf));
- if (tuSize >= 32 && cu->getSlice()->getSPS()->m_useStrongIntraSmoothing)
+ if (tuSize >= 32 && cu->getSlice()->getSPS()->useStrongIntraSmoothing)
{
int bottomLeft = filterBuf[0];
int topLeft = filterBuf[tuSize2];
@@ -209,7 +209,7 @@ void TComPattern::initIntraNeighbors(TCo
int partIdxStride = cu->getPic()->getNumPartInCUSize();
partIdxLB = g_rasterToZscan[g_zscanToRaster[partIdxLT] + ((tuHeightInUnits - 1) * partIdxStride)];
- if (!cu->getSlice()->getPPS()->getConstrainedIntraPred())
+ if (!cu->getSlice()->getPPS()->bConstrainedIntraPred)
{
bNeighborFlags[leftUnits] = isAboveLeftAvailable(cu, partIdxLT);
numIntraNeighbor += (int)(bNeighborFlags[leftUnits]);
diff -r e288df705bf3 -r f0d157944c55 source/Lib/TLibCommon/TComPrediction.cpp
--- a/source/Lib/TLibCommon/TComPrediction.cpp Wed Jul 16 20:29:46 2014 -0500
+++ b/source/Lib/TLibCommon/TComPrediction.cpp Thu Jul 17 00:37:00 2014 -0500
@@ -225,7 +225,7 @@ void TComPrediction::predIntraChromaAng(
bool TComPrediction::xCheckIdenticalMotion(TComDataCU* cu, uint32_t partAddr)
{
X265_CHECK(cu->getSlice()->isInterB(), "identical motion check in P frame\n");
- if (!cu->getSlice()->getPPS()->getWPBiPred())
+ if (!cu->getSlice()->getPPS()->bUseWeightedBiPred)
{
int refIdxL0 = cu->getCUMvField(REF_PIC_LIST_0)->getRefIdx(partAddr);
int refIdxL1 = cu->getCUMvField(REF_PIC_LIST_1)->getRefIdx(partAddr);
@@ -255,7 +255,7 @@ void TComPrediction::motionCompensation(
list = REF_PIC_LIST_0;
if (list != REF_PIC_LIST_X)
{
- if (cu->getSlice()->getPPS()->getUseWP())
+ if (cu->getSlice()->getPPS()->bUseWeightPred)
{
ShortYuv* shortYuv = &m_predShortYuv[0];
int refId = cu->getCUMvField(list)->getRefIdx(partAddr);
@@ -337,7 +337,7 @@ void TComPrediction::xPredInterBi(TComDa
xPredInterUni(cu, partAddr, width, height, list, &m_predShortYuv[list], bLuma, bChroma);
}
- if (cu->getSlice()->getPPS()->getWPBiPred())
+ if (cu->getSlice()->getPPS()->bUseWeightedBiPred)
{
xWeightedPredictionBi(cu, &m_predShortYuv[0], &m_predShortYuv[1], refIdx[0], refIdx[1], partAddr, width, height, outPredYuv, bLuma, bChroma);
}
@@ -346,7 +346,7 @@ void TComPrediction::xPredInterBi(TComDa
outPredYuv->addAvg(&m_predShortYuv[0], &m_predShortYuv[1], partAddr, width, height, bLuma, bChroma);
}
}
- else if (cu->getSlice()->getPPS()->getWPBiPred())
+ else if (cu->getSlice()->getPPS()->bUseWeightedBiPred)
{
for (int list = 0; list < 2; list++)
{
diff -r e288df705bf3 -r f0d157944c55 source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp
--- a/source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp Wed Jul 16 20:29:46 2014 -0500
+++ b/source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp Thu Jul 17 00:37:00 2014 -0500
@@ -1243,7 +1243,7 @@ static void restoreOrigLosslessYuv(TComD
*/
void restoreLFDisabledOrigYuv(Frame* pic)
{
More information about the x265-commits
mailing list