[x265-commits] [x265] cleanup: remove unused m_upBuff2
Min Chen
chenm003 at 163.com
Mon Aug 18 23:34:19 CEST 2014
details: http://hg.videolan.org/x265/rev/8320283a7fe0
branches: stable
changeset: 7827:8320283a7fe0
user: Min Chen <chenm003 at 163.com>
date: Mon Aug 18 16:07:08 2014 -0500
description:
cleanup: remove unused m_upBuff2
Subject: [x265] sao: move m_upBuff* to stack, fixes (#69)
details: http://hg.videolan.org/x265/rev/c979b32c8b51
branches: stable
changeset: 7828:c979b32c8b51
user: Min Chen <chenm003 at 163.com>
date: Mon Aug 18 16:07:12 2014 -0500
description:
sao: move m_upBuff* to stack, fixes (#69)
Subject: [x265] Merge with stable
details: http://hg.videolan.org/x265/rev/d15367360097
branches:
changeset: 7829:d15367360097
user: Steve Borho <steve at borho.org>
date: Mon Aug 18 16:18:20 2014 -0500
description:
Merge with stable
diffstat:
doc/reST/introduction.rst | 4 +-
source/Lib/TLibCommon/TComDataCU.cpp | 75 +--
source/Lib/TLibCommon/TComDataCU.h | 9 +-
source/Lib/TLibCommon/TComPattern.cpp | 4 +-
source/Lib/TLibCommon/TComPicSym.cpp | 14 +-
source/Lib/TLibCommon/TComPicSym.h | 7 -
source/Lib/TLibCommon/TComPicYuv.cpp | 15 +-
source/Lib/TLibCommon/TComPicYuv.h | 2 +-
source/Lib/TLibCommon/TComRom.cpp | 42 +-
source/Lib/TLibCommon/TComRom.h | 22 +-
source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp | 58 +--
source/Lib/TLibCommon/TComSampleAdaptiveOffset.h | 3 -
source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp | 52 +-
source/Lib/TLibEncoder/TEncSearch.cpp | 60 +--
source/common/deblock.cpp | 31 +-
source/common/deblock.h | 2 +-
source/common/frame.cpp | 4 +-
source/common/frame.h | 4 -
source/common/param.cpp | 26 +-
source/common/quant.cpp | 10 +-
source/common/slice.h | 1 -
source/encoder/analysis.cpp | 344 ++++++-------------
source/encoder/analysis.h | 32 +-
source/encoder/cturow.cpp | 8 +-
source/encoder/cturow.h | 20 +-
source/encoder/encoder.cpp | 47 +-
source/encoder/encoder.h | 1 -
source/encoder/entropy.cpp | 190 +++++++++-
source/encoder/entropy.h | 19 +-
source/encoder/frameencoder.cpp | 53 +-
source/encoder/frameencoder.h | 1 +
31 files changed, 528 insertions(+), 632 deletions(-)
diffs (truncated from 2883 to 300 lines):
diff -r eb2b3e34ea0d -r d15367360097 doc/reST/introduction.rst
--- a/doc/reST/introduction.rst Mon Aug 18 15:08:27 2014 -0500
+++ b/doc/reST/introduction.rst Mon Aug 18 16:18:20 2014 -0500
@@ -74,8 +74,8 @@ executable software created from the x26
responsible for understanding the laws in your country, and for
licensing all applicable patent rights needed for use or distribution of
software applications created from the x265 source code. A good place
-to start is with the Motion Picture Experts Group - Licensing Authority
-- HEVC Licensing Program.
+to start is with the `Motion Picture Experts Group - Licensing Authority
+- HEVC Licensing Program<http://www.mpegla.com/main/PID/HEVC/default.aspx>`_.
x265 is a registered trademark of MulticoreWare, Inc. The x265 logo is
a trademark of MulticoreWare, and may only be used with explicit written
diff -r eb2b3e34ea0d -r d15367360097 source/Lib/TLibCommon/TComDataCU.cpp
--- a/source/Lib/TLibCommon/TComDataCU.cpp Mon Aug 18 15:08:27 2014 -0500
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Mon Aug 18 16:18:20 2014 -0500
@@ -129,7 +129,7 @@ fail:
return ok;
}
-void TComDataCU::create(TComDataCU *cu, uint32_t numPartition, uint32_t cuSize, int unitSize, int csp, int index, bool isLossless)
+void TComDataCU::create(TComDataCU *cu, uint32_t numPartition, uint32_t cuSize, int csp, int index, bool isLossless)
{
m_hChromaShift = CHROMA_H_SHIFT(csp);
m_vChromaShift = CHROMA_V_SHIFT(csp);
@@ -139,12 +139,6 @@ void TComDataCU::create(TComDataCU *cu,
m_slice = NULL;
m_numPartitions = numPartition;
- uint32_t tmp = 4 * AMVP_DECIMATION_FACTOR / unitSize;
- tmp = tmp * tmp;
- X265_CHECK(tmp == (1 << (g_log2Size[tmp])), "unexpected pixel count\n");
- tmp = g_log2Size[tmp];
- m_unitMask = ~((1 << tmp) - 1);
-
uint32_t sizeL = cuSize * cuSize;
uint32_t sizeC = sizeL >> (m_hChromaShift + m_vChromaShift);
@@ -577,7 +571,7 @@ void TComDataCU::copyPartFrom(TComDataCU
// Copy current predicted part to a CU in picture.
// It is used to predict for next part
-void TComDataCU::copyToPic(uint8_t depth)
+void TComDataCU::copyToPic(uint32_t depth)
{
TComDataCU* cu = m_pic->getCU(m_cuAddr);
@@ -622,7 +616,7 @@ void TComDataCU::copyToPic(uint8_t depth
m_cuMvField[1].copyTo(cu->getCUMvField(REF_PIC_LIST_1), m_absIdxInLCU);
uint32_t tmpY = 1 << ((g_maxLog2CUSize - depth) * 2);
- uint32_t tmpY2 = m_absIdxInLCU << m_pic->getLog2UnitSize() * 2;
+ uint32_t tmpY2 = m_absIdxInLCU << LOG2_UNIT_SIZE * 2;
memcpy(cu->getCoeffY() + tmpY2, m_trCoeff[0], sizeof(coeff_t) * tmpY);
uint32_t tmpC = tmpY >> (m_hChromaShift + m_vChromaShift);
@@ -633,7 +627,7 @@ void TComDataCU::copyToPic(uint8_t depth
if (m_slice->m_pps->bTransquantBypassEnabled)
{
uint32_t tmp = 1 << ((g_maxLog2CUSize - depth) * 2);
- uint32_t tmp2 = m_absIdxInLCU << m_pic->getLog2UnitSize() * 2;
+ uint32_t tmp2 = m_absIdxInLCU << LOG2_UNIT_SIZE * 2;
memcpy(cu->getLumaOrigYuv() + tmp2, m_tqBypassOrigYuv[0], sizeof(pixel) * tmp);
memcpy(cu->getChromaOrigYuv(1) + tmpC2, m_tqBypassOrigYuv[1], sizeof(pixel) * tmpC);
@@ -641,7 +635,7 @@ void TComDataCU::copyToPic(uint8_t depth
}
}
-void TComDataCU::copyCodedToPic(uint8_t depth)
+void TComDataCU::copyCodedToPic(uint32_t depth)
{
TComDataCU* cu = m_pic->getCU(m_cuAddr);
@@ -660,7 +654,7 @@ void TComDataCU::copyCodedToPic(uint8_t
memcpy(cu->getCbf(TEXT_CHROMA_V) + m_absIdxInLCU, m_cbf[2], sizeInChar);
uint32_t tmpY = 1 << ((g_maxLog2CUSize - depth) * 2);
- uint32_t tmpY2 = m_absIdxInLCU << m_pic->getLog2UnitSize() * 2;
+ uint32_t tmpY2 = m_absIdxInLCU << LOG2_UNIT_SIZE * 2;
memcpy(cu->getCoeffY() + tmpY2, m_trCoeff[0], sizeof(coeff_t) * tmpY);
tmpY >>= m_hChromaShift + m_vChromaShift;
tmpY2 >>= m_hChromaShift + m_vChromaShift;
@@ -668,7 +662,7 @@ void TComDataCU::copyCodedToPic(uint8_t
memcpy(cu->m_trCoeff[2] + tmpY2, m_trCoeff[2], sizeof(coeff_t) * tmpY);
}
-void TComDataCU::copyToPic(uint8_t depth, uint32_t partIdx, uint32_t partDepth)
+void TComDataCU::copyToPic(uint32_t depth, uint32_t partIdx, uint32_t partDepth)
{
TComDataCU* cu = m_pic->getCU(m_cuAddr);
uint32_t qNumPart = m_numPartitions >> (partDepth << 1);
@@ -713,7 +707,7 @@ void TComDataCU::copyToPic(uint8_t depth
m_cuMvField[1].copyTo(cu->getCUMvField(REF_PIC_LIST_1), m_absIdxInLCU, partStart, qNumPart);
uint32_t tmpY = 1 << ((g_maxLog2CUSize - depth - partDepth) * 2);
- uint32_t tmpY2 = partOffset << m_pic->getLog2UnitSize() * 2;
+ uint32_t tmpY2 = partOffset << LOG2_UNIT_SIZE * 2;
memcpy(cu->getCoeffY() + tmpY2, m_trCoeff[0], sizeof(coeff_t) * tmpY);
uint32_t tmpC = tmpY >> (m_hChromaShift + m_vChromaShift);
@@ -825,7 +819,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->m_sps->picWidthInLumaSamples)
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + UNIT_SIZE) >= m_slice->m_sps->picWidthInLumaSamples)
return NULL;
if (RasterAddress::lessThanCol(absPartIdxRT, numPartInCUSize - 1, numPartInCUSize))
@@ -834,7 +828,7 @@ TComDataCU* TComDataCU::getPUAboveRight(
{
if (curPartUnitIdx > g_rasterToZscan[absPartIdxRT - numPartInCUSize + 1])
{
- uint32_t absZorderCUIdx = g_zscanToRaster[m_absIdxInLCU] + (1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize())) - 1;
+ uint32_t absZorderCUIdx = g_zscanToRaster[m_absIdxInLCU] + (1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE)) - 1;
arPartUnitIdx = g_rasterToZscan[absPartIdxRT - numPartInCUSize + 1];
if (RasterAddress::isEqualRowOrCol(absPartIdxRT, absZorderCUIdx, numPartInCUSize))
{
@@ -865,7 +859,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->m_sps->picHeightInLumaSamples)
+ if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxLB] + UNIT_SIZE) >= m_slice->m_sps->picHeightInLumaSamples)
{
return NULL;
}
@@ -878,7 +872,7 @@ TComDataCU* TComDataCU::getPUBelowLeft(u
{
if (curPartUnitIdx > g_rasterToZscan[absPartIdxLB + numPartInCUSize - 1])
{
- uint32_t absZorderCUIdxLB = g_zscanToRaster[m_absIdxInLCU] + ((1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize())) - 1) * m_pic->getNumPartInCUSize();
+ uint32_t absZorderCUIdxLB = g_zscanToRaster[m_absIdxInLCU] + ((1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE)) - 1) * m_pic->getNumPartInCUSize();
blPartUnitIdx = g_rasterToZscan[absPartIdxLB + numPartInCUSize - 1];
if (RasterAddress::isEqualRowOrCol(absPartIdxLB, absZorderCUIdxLB, numPartInCUSize))
{
@@ -903,7 +897,7 @@ TComDataCU* TComDataCU::getPUBelowLeftAd
{
uint32_t absPartIdxLB = g_zscanToRaster[curPartUnitIdx];
- if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxLB] + (partUnitOffset << m_pic->getLog2UnitSize())) >=
+ if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxLB] + (partUnitOffset << LOG2_UNIT_SIZE)) >=
m_slice->m_sps->picHeightInLumaSamples)
{
return NULL;
@@ -917,7 +911,7 @@ TComDataCU* TComDataCU::getPUBelowLeftAd
{
if (curPartUnitIdx > g_rasterToZscan[absPartIdxLB + partUnitOffset * numPartInCUSize - 1])
{
- uint32_t absZorderCUIdxLB = g_zscanToRaster[m_absIdxInLCU] + ((1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize())) - 1) * m_pic->getNumPartInCUSize();
+ uint32_t absZorderCUIdxLB = g_zscanToRaster[m_absIdxInLCU] + ((1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE)) - 1) * m_pic->getNumPartInCUSize();
blPartUnitIdx = g_rasterToZscan[absPartIdxLB + partUnitOffset * numPartInCUSize - 1];
if (RasterAddress::isEqualRowOrCol(absPartIdxLB, absZorderCUIdxLB, numPartInCUSize))
{
@@ -946,7 +940,7 @@ TComDataCU* TComDataCU::getPUAboveRightA
{
uint32_t absPartIdxRT = g_zscanToRaster[curPartUnitIdx];
- if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + (partUnitOffset << m_pic->getLog2UnitSize())) >=
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxRT] + (partUnitOffset << LOG2_UNIT_SIZE)) >=
m_slice->m_sps->picWidthInLumaSamples)
{
return NULL;
@@ -960,7 +954,7 @@ TComDataCU* TComDataCU::getPUAboveRightA
{
if (curPartUnitIdx > g_rasterToZscan[absPartIdxRT - numPartInCUSize + partUnitOffset])
{
- uint32_t absZorderCUIdx = g_zscanToRaster[m_absIdxInLCU] + (1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize())) - 1;
+ uint32_t absZorderCUIdx = g_zscanToRaster[m_absIdxInLCU] + (1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE)) - 1;
arPartUnitIdx = g_rasterToZscan[absPartIdxRT - numPartInCUSize + partUnitOffset];
if (RasterAddress::isEqualRowOrCol(absPartIdxRT, absZorderCUIdx, numPartInCUSize))
{
@@ -1004,8 +998,7 @@ TComDataCU* TComDataCU::getPUAboveRightA
TComDataCU* TComDataCU::getQpMinCuLeft(uint32_t& lPartUnitIdx, uint32_t curAbsIdxInLCU)
{
uint32_t numPartInCUSize = m_pic->getNumPartInCUSize();
- uint32_t absZorderQpMinCUIdx = (curAbsIdxInLCU >> ((g_maxCUDepth - m_slice->m_pps->maxCuDQPDepth) << 1)) <<
- ((g_maxCUDepth - m_slice->m_pps->maxCuDQPDepth) << 1);
+ uint32_t absZorderQpMinCUIdx = curAbsIdxInLCU & (0xFF << (g_maxFullDepth - m_slice->m_pps->maxCuDQPDepth) * 2);
uint32_t absRorderQpMinCUIdx = g_zscanToRaster[absZorderQpMinCUIdx];
// check for left LCU boundary
@@ -1029,8 +1022,7 @@ 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 - m_slice->m_pps->maxCuDQPDepth) << 1)) <<
- ((g_maxCUDepth - m_slice->m_pps->maxCuDQPDepth) << 1);
+ uint32_t absZorderQpMinCUIdx = curAbsIdxInLCU & (0xFF << (g_maxFullDepth - m_slice->m_pps->maxCuDQPDepth) * 2);
uint32_t absRorderQpMinCUIdx = g_zscanToRaster[absZorderQpMinCUIdx];
// check for top LCU boundary
@@ -1074,7 +1066,7 @@ int TComDataCU::getLastValidPartIdx(int
char TComDataCU::getLastCodedQP(uint32_t absPartIdx)
{
- uint32_t quPartIdxMask = ~((1 << ((g_maxCUDepth - m_slice->m_pps->maxCuDQPDepth) << 1)) - 1);
+ uint32_t quPartIdxMask = 0xFF << (g_maxFullDepth - m_slice->m_pps->maxCuDQPDepth) * 2;
int lastValidPartIdx = getLastValidPartIdx(absPartIdx & quPartIdxMask);
if (lastValidPartIdx >= 0)
@@ -1526,7 +1518,7 @@ void TComDataCU::getMvField(TComDataCU*
void TComDataCU::deriveLeftRightTopIdx(uint32_t partIdx, uint32_t& ruiPartIdxLT, uint32_t& ruiPartIdxRT)
{
ruiPartIdxLT = m_absIdxInLCU;
- ruiPartIdxRT = g_rasterToZscan[g_zscanToRaster[ruiPartIdxLT] + (1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize())) - 1];
+ ruiPartIdxRT = g_rasterToZscan[g_zscanToRaster[ruiPartIdxLT] + (1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE)) - 1];
switch (m_partSizes[0])
{
@@ -1567,7 +1559,7 @@ void TComDataCU::deriveLeftRightTopIdx(u
void TComDataCU::deriveLeftBottomIdx(uint32_t partIdx, uint32_t& outPartIdxLB)
{
- outPartIdxLB = g_rasterToZscan[g_zscanToRaster[m_absIdxInLCU] + ((1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize() - 1)) - 1) * m_pic->getNumPartInCUSize()];
+ outPartIdxLB = g_rasterToZscan[g_zscanToRaster[m_absIdxInLCU] + ((1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE - 1)) - 1) * m_pic->getNumPartInCUSize()];
switch (m_partSizes[0])
{
@@ -1609,8 +1601,8 @@ void TComDataCU::deriveLeftBottomIdx(uin
void TComDataCU::deriveRightBottomIdx(uint32_t partIdx, uint32_t& outPartIdxRB)
{
outPartIdxRB = g_rasterToZscan[g_zscanToRaster[m_absIdxInLCU] +
- ((1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize() - 1)) - 1) * m_pic->getNumPartInCUSize() +
- (1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize())) - 1];
+ ((1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE - 1)) - 1) * m_pic->getNumPartInCUSize() +
+ (1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE)) - 1];
switch (m_partSizes[0])
{
@@ -1646,7 +1638,7 @@ void TComDataCU::deriveRightBottomIdx(ui
void TComDataCU::deriveLeftRightTopIdxAdi(uint32_t& outPartIdxLT, uint32_t& outPartIdxRT, uint32_t partOffset, uint32_t partDepth)
{
- uint32_t numPartInWidth = 1 << (m_log2CUSize[0] - m_pic->getLog2UnitSize() - partDepth);
+ uint32_t numPartInWidth = 1 << (m_log2CUSize[0] - LOG2_UNIT_SIZE - partDepth);
outPartIdxLT = m_absIdxInLCU + partOffset;
outPartIdxRT = g_rasterToZscan[g_zscanToRaster[outPartIdxLT] + numPartInWidth - 1];
@@ -1837,10 +1829,10 @@ void TComDataCU::getInterMergeCandidates
int refIdx;
int lcuIdx = -1;
- if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxTmp] + m_pic->getUnitSize()) >= m_slice->m_sps->picWidthInLumaSamples) // image boundary check
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdxTmp] + UNIT_SIZE) >= m_slice->m_sps->picWidthInLumaSamples) // image boundary check
{
}
- else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxTmp] + m_pic->getUnitSize()) >= m_slice->m_sps->picHeightInLumaSamples)
+ else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdxTmp] + UNIT_SIZE) >= m_slice->m_sps->picHeightInLumaSamples)
{
}
else
@@ -2107,10 +2099,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->m_sps->picWidthInLumaSamples) // image boundary check
+ if ((m_pic->getCU(m_cuAddr)->getCUPelX() + g_rasterToPelX[absPartIdx] + UNIT_SIZE) >= m_slice->m_sps->picWidthInLumaSamples) // image boundary check
{
}
- else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdx] + m_pic->getUnitSize()) >= m_slice->m_sps->picHeightInLumaSamples)
+ else if ((m_pic->getCU(m_cuAddr)->getCUPelY() + g_rasterToPelY[absPartIdx] + UNIT_SIZE) >= m_slice->m_sps->picHeightInLumaSamples)
{
}
else
@@ -2342,7 +2334,7 @@ bool TComDataCU::xAddMVPCandOrder(MV& ou
*/
bool TComDataCU::xGetColMVP(int picList, int cuAddr, int partUnitIdx, MV& outMV, int& outRefIdx)
{
- uint32_t absPartAddr = partUnitIdx & m_unitMask;
+ uint32_t absPartAddr = partUnitIdx & TMVP_UNIT_MASK;
int colRefPicList;
int colPOC, colRefPOC, curPOC, curRefPOC, scale;
@@ -2424,8 +2416,8 @@ void TComDataCU::xDeriveCenterIdx(uint32
outPartIdxCenter = m_absIdxInLCU + partAddr; // partition origin.
outPartIdxCenter = g_rasterToZscan[g_zscanToRaster[outPartIdxCenter]
- + (partHeight >> (m_pic->getLog2UnitSize() + 1)) * m_pic->getNumPartInCUSize()
- + (partWidth >> (m_pic->getLog2UnitSize() + 1))];
+ + (partHeight >> (LOG2_UNIT_SIZE + 1)) * m_pic->getNumPartInCUSize()
+ + (partWidth >> (LOG2_UNIT_SIZE + 1))];
}
ScanType TComDataCU::getCoefScanIdx(uint32_t absPartIdx, uint32_t log2TrSize, bool bIsLuma, bool bIsIntra)
@@ -2452,8 +2444,7 @@ ScanType TComDataCU::getCoefScanIdx(uint
dirMode = getChromaIntraDir(absPartIdx);
if (dirMode == DM_CHROMA_IDX)
{
- uint32_t lumaLCUIdx = (m_chromaFormat == X265_CSP_I444) ? absPartIdx : absPartIdx & (~((1 << (2 * g_addCUDepth)) - 1));
- dirMode = getLumaIntraDir(lumaLCUIdx);
+ dirMode = getLumaIntraDir((m_chromaFormat == X265_CSP_I444) ? absPartIdx : absPartIdx & 0xFC);
dirMode = (m_chromaFormat == X265_CSP_I422) ? g_chroma422IntraAngleMappingTable[dirMode] : dirMode;
}
}
@@ -2490,7 +2481,7 @@ void TComDataCU::getTUEntropyCodingParam
uint32_t TComDataCU::getSCUAddr()
More information about the x265-commits
mailing list