Commit abd1d7eb authored by Frederic Barbier's avatar Frederic Barbier

[Cosmetics] Cleanup trailing spaces

parent f79cf313
......@@ -7,8 +7,8 @@
*
* \section Introduction
*
* This is the doxygen generated documentation of the HEVC HM reference software.
*
* This is the doxygen generated documentation of the HEVC HM reference software.
*
* For detailed information see the sub-pages of this site.
*
* For information on the <b>subversion repositories</b> and the <b>software manual</b> see
......@@ -22,7 +22,7 @@
* The copyright in this software is being made available under the BSD
* License, included below. This software may be subject to other third party
* and contributor rights, including patent rights, and no such rights are
* granted under this license.
* granted under this license.
*
* Copyright (c) 2010-2019, ITU/ISO/IEC
* All rights reserved.
......
......@@ -260,7 +260,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setLadfIntervalLowerBound(m_LadfIntervalLowerBound[k], k);
}
}
#endif
#endif
m_cEncLib.setUseMHIntra ( m_MHIntra );
m_cEncLib.setUseTriangle ( m_Triangle );
#if JVET_M0253_HASH_ME
......@@ -574,7 +574,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setReshapeSignalType ( m_reshapeSignalType );
m_cEncLib.setReshapeIntraCMD ( m_intraCMD );
m_cEncLib.setReshapeCW ( m_reshapeCW );
#endif
#endif
}
void EncApp::xCreateLib( std::list<PelUnitBuf*>& recBufList
......
......@@ -1338,13 +1338,13 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
po::ErrorReporter err;
const list<const char*>& argv_unhandled = po::scanArgv(opts, argc, (const char**) argv, err);
if (m_compositeRefEnabled)
if (m_compositeRefEnabled)
{
for (int i = 0; i < m_iGOPSize; i++)
for (int i = 0; i < m_iGOPSize; i++)
{
m_GOPList[i].m_POC *= 2;
m_GOPList[i].m_deltaRPS *= 2;
for (int j = 0; j < m_GOPList[i].m_numRefPics; j++)
for (int j = 0; j < m_GOPList[i].m_numRefPics; j++)
{
m_GOPList[i].m_referencePics[j] *= 2;
}
......@@ -1973,7 +1973,7 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara(m_IBCMode, "IBC Mode only allowed with NEXT profile");
#if JVET_M0253_HASH_ME
xConfirmPara( m_HashME, "Hash motion estimation only allowed with NEXT profile" );
#endif
#endif
xConfirmPara( m_useFastLCTU, "Fast large CTU can only be applied when encoding with NEXT profile" );
#if JVET_M0464_UNI_MTS
xConfirmPara( m_MTS, "MTS only allowed with NEXT profile" );
......@@ -2053,8 +2053,8 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara( m_useAMaxBT && !m_SplitConsOverrideEnabledFlag, "AMaxBt can only be used with PartitionConstriantsOverride enabled" );
xConfirmPara(m_bitstreamFileName.empty(), "A bitstream file name must be specified (BitstreamFile)");
const uint32_t maxBitDepth=(m_chromaFormatIDC==CHROMA_400) ? m_internalBitDepth[CHANNEL_TYPE_LUMA] : std::max(m_internalBitDepth[CHANNEL_TYPE_LUMA], m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
xConfirmPara(m_bitDepthConstraint<maxBitDepth, "The internalBitDepth must not be greater than the bitDepthConstraint value");
......
......@@ -314,11 +314,11 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
int byte_offset2 = offset / 8;
int hi_bits2 = offset % 8;
uint16_t data2 = (nalu[byte_offset2] << 8) | nalu[byte_offset2 + 1];
int low_bits2 = 16 - hi_bits2 - 1;
int low_bits2 = 16 - hi_bits2 - 1;
if(((data2 >> low_bits2) % 2))
offset += 1; // PPSId=0
offset += 1; // PPSId=0
else
offset += 3; // PPSId=1
offset += 3; // PPSId=1
offset += 1; // slice_type TODO: ue(v)
// separate_colour_plane_flag is not supported in JEM1.0
if (nalu_type == CRA)
......
......@@ -393,7 +393,7 @@ void AreaBuf<Pel>::rspSignal(std::vector<Pel>& pLUT)
if (width == 1)
{
THROW("Blocks of width = 1 not supported");
}
}
else
{
#endif
......@@ -470,7 +470,7 @@ Pel AreaBuf <Pel> ::computeAvg() const
#endif
int32_t acc = 0;
#define AVG_INC \
src += stride;
src += stride;
#define AVG_OP(ADDR) acc += src[ADDR]
SIZE_AWARE_PER_EL_OP(AVG_OP, AVG_INC);
#undef AVG_INC
......
......@@ -831,7 +831,7 @@ void CodingStructure::useSubStructure( const CodingStructure& subStruct, const C
if( cpyResi ) picture->getResiBuf( clippedArea ).copyFrom( subResiBuf );
if( cpyReco ) picture->getRecoBuf( clippedArea ).copyFrom( subRecoBuf );
#if JVET_M0483_IBC
#if JVET_M0483_IBC
if (!subStruct.m_isTuEnc && ((!slice->isIntra() || slice->getSPS()->getIBCFlag()) && subStruct.chType != CHANNEL_TYPE_CHROMA))
#else
if (!subStruct.m_isTuEnc && (!slice->isIntra() && subStruct.chType != CHANNEL_TYPE_CHROMA))
......@@ -1015,7 +1015,7 @@ void CodingStructure::copyStructure( const CodingStructure& other, const Channel
pu = *ppu;
}
#if JVET_M0483_IBC
#if JVET_M0483_IBC
if (!other.slice->isIntra() || other.slice->getSPS()->getIBCFlag())
#else
if( !other.slice->isIntra() )
......@@ -1126,7 +1126,7 @@ void CodingStructure::clearTUs()
memset( m_tuIdx [i], 0, sizeof( *m_tuIdx [0] ) * _area );
}
numCh = getNumberValidComponents( area.chromaFormat );
numCh = getNumberValidComponents( area.chromaFormat );
for( int i = 0; i < numCh; i++ )
{
m_offsets[i] = 0;
......
......@@ -409,7 +409,7 @@ static const int TRIANGLE_MIN_SIZE = 8 * 8;
#if JVET_M0140_SBT
static const int SBT_MAX_SIZE = 64; ///< maximum CU size for using SBT
static const int SBT_NUM_SL = 10; ///< maximum number of historical PU decision saved for a CU
static const int SBT_NUM_RDO = 2; ///< maximum number of SBT mode tried for a PU
static const int SBT_NUM_RDO = 2; ///< maximum number of SBT mode tried for a PU
#endif
static const int IBC_MAX_CAND_SIZE = 16; // max block size for ibc search
......
......@@ -350,7 +350,7 @@ std::vector<std::vector<uint8_t>> ContextSetCfg::sm_InitTables( NUMBER_OF_SLICE_
const CtxSet ContextSetCfg::SplitFlag = ContextSetCfg::addCtxSet
({
#if JVET_M0421_SPLIT_SIG
// |-------- do split ctx -------------------|
// |-------- do split ctx -------------------|
{ 93, 124, 141, 123, 125, 141, 139, 126, 157, },
{ 108, 139, 156, 138, 140, 141, 139, 141, 143, },
{ 153, 154, 172, 153, 140, 156, 154, 127, 159, },
......
This diff is collapsed.
......@@ -95,7 +95,7 @@ protected:
PelStorage m_triangleBuf;
Mv* m_storedMv;
#if JVET_M0147_DMVR
/*buffers for bilinear Filter data for DMVR refinement*/
/*buffers for bilinear Filter data for DMVR refinement*/
Pel* m_cYuvPredTempDMVRL0;
Pel* m_cYuvPredTempDMVRL1;
int m_biLinearBufStride;
......@@ -121,7 +121,7 @@ protected:
Mv m_pSearchOffset[5] = { Mv(0, 1), Mv(0, -1), Mv(1, 0), Mv(-1, 0), Mv(0, 0) };
uint64_t m_SADsArray[((2 * DMVR_NUM_ITERATION) + 1) * ((2 * DMVR_NUM_ITERATION) + 1)];
#endif
Pel* m_gradX0;
Pel* m_gradY0;
Pel* m_gradX1;
......@@ -134,8 +134,8 @@ protected:
#if !JVET_M0487_INT_EXTEND
void bioSampleExtendBilinearFilter(Pel const* src, int srcStride, Pel *dst, int dstStride, int width, int height, int dim, int fracX, int fracY, bool isLast, const ChromaFormat fmt, const ClpRng& clpRng);
#endif
void xPredInterUni ( const PredictionUnit& pu, const RefPicList& eRefPicList, PelUnitBuf& pcYuvPred, const bool& bi
, const bool& bioApplied
void xPredInterUni ( const PredictionUnit& pu, const RefPicList& eRefPicList, PelUnitBuf& pcYuvPred, const bool& bi
, const bool& bioApplied
, const bool luma, const bool chroma
);
void xPredInterBi ( PredictionUnit& pu, PelUnitBuf &pcYuvPred );
......
......@@ -278,10 +278,10 @@ void InterpolationFilter::filterCopy( const ClpRng& clpRng, const Pel *src, int
src += srcStride;
dst += dstStride;
}
}
}
}
else
#endif
#endif
for (row = 0; row < height; row++)
{
for (col = 0; col < width; col++)
......@@ -301,7 +301,7 @@ void InterpolationFilter::filterCopy( const ClpRng& clpRng, const Pel *src, int
#if JVET_M0147_DMVR
if (biMCForDMVR)
{
{
int shift10BitOut, offset;
if ((clpRng.bd - IF_INTERNAL_PREC_BILINEAR) > 0)
{
......@@ -512,7 +512,7 @@ void InterpolationFilter::filterHor(const ClpRng& clpRng, Pel const *src, int sr
m_filterHor[1][1][isLast](clpRng, src, srcStride, dst, dstStride, width, height, coeff, biMCForDMVR);
#else
m_filterHor[1][1][isLast]( clpRng, src, srcStride, dst, dstStride, width, height, coeff );
#endif
#endif
}
else if( N == 2 )
{
......@@ -682,7 +682,7 @@ void InterpolationFilter::filterVer( const ComponentID compID, Pel const *src, i
if (nFilterIdx == 1)
{
#if JVET_M0147_DMVR
filterVer<NTAPS_BILINEAR>(clpRng, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_bilinearFilterPrec4[frac], biMCForDMVR);
filterVer<NTAPS_BILINEAR>(clpRng, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_bilinearFilterPrec4[frac], biMCForDMVR);
#else
filterVer<NTAPS_BILINEAR>(clpRng, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_bilinearFilter[frac]);
#endif
......
......@@ -107,7 +107,7 @@ protected:
Pel xGetPredValDc ( const CPelBuf &pSrc, const Size &dstSize );
void xFillReferenceSamples ( const CPelBuf &recoBuf, Pel* refBufUnfiltered, const CompArea &area, const CodingUnit &cu );
void xFilterReferenceSamples ( const Pel* refBufUnfiltered, Pel* refBufFiltered, const CompArea &area, const SPS &sps
void xFilterReferenceSamples ( const Pel* refBufUnfiltered, Pel* refBufFiltered, const CompArea &area, const SPS &sps
, int multiRefIdx
);
......
......@@ -248,7 +248,7 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
for( auto &currTU : CU::traverseTUs( cu ) )
{
const Area& areaTu = cu.Y().valid() ? currTU.block( COMPONENT_Y ) : area;
#if JVET_M0471_LONG_DEBLOCKING_FILTERS
#if JVET_M0471_LONG_DEBLOCKING_FILTERS
const bool xOff = currTU.blocks[cu.chType].x != cu.blocks[cu.chType].x;
const bool yOff = currTU.blocks[cu.chType].y != cu.blocks[cu.chType].y;
if ((yOff != 0) && (edgeDir == EDGE_HOR))
......@@ -418,7 +418,7 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
#if JVET_M0471_LONG_DEBLOCKING_FILTERS
if (edge == 0)
{
#if FIX_DB_MAX_TRANSFORM_SIZE
#if FIX_DB_MAX_TRANSFORM_SIZE
xEdgeFilterLuma(cu, edgeDir, edge, maxFilterLengthP, maxFilterLengthQ);
#else
xEdgeFilterLuma(cu, edgeDir, edge, 7, maxFilterLength);
......@@ -426,19 +426,19 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
}
else
{
#if FIX_DB_MAX_TRANSFORM_SIZE
#if FIX_DB_MAX_TRANSFORM_SIZE
if (implicitTU && ((edge % (maxTsize / 4)) == 0))
#else
if ( implicitTU && (edge == (64 / 4)) )
#endif
{
#if FIX_DB_MAX_TRANSFORM_SIZE
#if FIX_DB_MAX_TRANSFORM_SIZE
xEdgeFilterLuma(cu, edgeDir, edge, maxFilterLengthQ, maxFilterLengthQ);
#else
xEdgeFilterLuma(cu, edgeDir, edge, maxFilterLength, maxFilterLength);
#endif
}
#if FIX_DB_MAX_TRANSFORM_SIZE
#if FIX_DB_MAX_TRANSFORM_SIZE
else if ((edge == 2 || edge == (orthogonalLength - 2)) || (implicitTU && (((edge - 2) % ((maxTsize) / 4) == 0) || ((edge + 2) % ((maxTsize) / 4) == 0))))
#else
else if ( (edge == 2 || edge == (orthogonalLength - 2)) || (implicitTU && (edge == (56 / 4) || edge == (72 / 4))) )
......@@ -1142,7 +1142,7 @@ void LoopFilter::xEdgeFilterChroma(const CodingUnit& cu, const DeblockEdgeDir ed
const unsigned cuQWidth = cuQ.block(COMPONENT_Cb).width;
const unsigned cuQHeight = cuQ.block(COMPONENT_Cb).height;
bool largeBoundary = ((edgeDir == EDGE_VER && cuPWidth >= 8 && cuQWidth >= 8) || (edgeDir == EDGE_HOR && cuPHeight >= 8 && cuQHeight >= 8));
bool largeBoundary = ((edgeDir == EDGE_VER && cuPWidth >= 8 && cuQWidth >= 8) || (edgeDir == EDGE_HOR && cuPHeight >= 8 && cuQHeight >= 8));
if (edgeDir == EDGE_HOR && pos.y % cuP.slice->getSPS()->getCTUSize() == 0)
{
......@@ -1276,11 +1276,11 @@ inline void LoopFilter::xFilteringPandQ(Pel* src, int offset, int numberPSide, i
CHECK(numberPSide <= 3 && numberQSide <= 3, "Short filtering in long filtering function");
Pel* srcP = src-offset;
Pel* srcQ = src;
int refP = 0;
int refQ = 0;
int refMiddle = 0;
const int dbCoeffs7[7] = { 59, 50, 41,32,23,14,5 };
const int dbCoeffs3[3] = { 53, 32, 11 };
const int dbCoeffs5[5] = { 58, 45, 32,19,6};
......@@ -1514,7 +1514,7 @@ inline void LoopFilter::xPelFilterChroma( Pel* piSrc, const int iOffset, const i
if (largeBoundary)
{
piSrc[-iOffset * 3] = m1; // p2
piSrc[-iOffset * 2] = m2; // p1
piSrc[-iOffset * 2] = m2; // p1
}
#endif
piSrc[-iOffset] = m3;
......
......@@ -62,7 +62,7 @@ private:
private:
/// CU-level deblocking function
void xDeblockCU ( CodingUnit& cu, const DeblockEdgeDir edgeDir );
// set / get functions
void xSetLoopfilterParam ( const CodingUnit& cu );
......
......@@ -237,7 +237,7 @@ namespace std
}
};
};
void clipMv ( Mv& rcMv, const struct Position& pos,
void clipMv ( Mv& rcMv, const struct Position& pos,
const struct Size& size,
const class SPS& sps );
......
......@@ -152,7 +152,7 @@ void RdCost::init()
m_afpDistortFunc[DF_SAD_FULL_NBIT32 ] = RdCost::xGetSAD_full;
m_afpDistortFunc[DF_SAD_FULL_NBIT64 ] = RdCost::xGetSAD_full;
m_afpDistortFunc[DF_SAD_FULL_NBIT16N] = RdCost::xGetSAD_full;
#if WCG_EXT
m_afpDistortFunc[DF_SSE_WTD ] = RdCost::xGetSSE_WTD;
m_afpDistortFunc[DF_SSE2_WTD ] = RdCost::xGetSSE2_WTD;
......@@ -2900,11 +2900,11 @@ void RdCost::initLumaLevelToWeightTable()
else
*/
{ // set SDR weight table
y = 0.015*x - 1.5 - 6; // this is the Equation used to derive the luma qp LUT for HDR in MPEG HDR anchor3.2 (JCTCX-X1020)
y = 0.015*x - 1.5 - 6; // this is the Equation used to derive the luma qp LUT for HDR in MPEG HDR anchor3.2 (JCTCX-X1020)
y = y<-3 ? -3 : (y>6 ? 6 : y);
}
m_lumaLevelToWeightPLUT[i] = pow(2.0, y / 3.0); // or power(10, dQp/10) they are almost equal
m_lumaLevelToWeightPLUT[i] = pow(2.0, y / 3.0); // or power(10, dQp/10) they are almost equal
}
}
......@@ -2918,7 +2918,7 @@ void RdCost::initLumaLevelToWeightTableReshape()
m_lumaLevelToWeightPLUT.resize(lutSize, 1.0);
if (m_signalType == RESHAPE_SIGNAL_PQ)
{
for (int i = 0; i < (1 << m_lumaBD); i++)
for (int i = 0; i < (1 << m_lumaBD); i++)
{
double x = m_lumaBD < 10 ? i << (10 - m_lumaBD) : m_lumaBD > 10 ? i >> (m_lumaBD - 10) : i;
double y;
......@@ -2940,7 +2940,7 @@ void RdCost::updateReshapeLumaLevelToWeightTableChromaMD(std::vector<Pel>& ILUT)
void RdCost::restoreReshapeLumaLevelToWeightTable()
{
for (int i = 0; i < (1 << m_lumaBD); i++)
for (int i = 0; i < (1 << m_lumaBD); i++)
{
m_reshapeLumaLevelToWeightPLUT.at(i) = m_lumaLevelToWeightPLUT.at(i);
}
......@@ -2964,7 +2964,7 @@ void RdCost::updateReshapeLumaLevelToWeightTable(SliceReshapeInfo &sliceReshape,
{
if (sliceReshape.reshaperModelBinCWDelta[i] == 1 || (sliceReshape.reshaperModelBinCWDelta[i] == -1 * histLens))
weight = wBin;
else
else
{
weight = (double)wtTable[i] / (double)histLens;
weight = weight*weight;
......@@ -2990,7 +2990,7 @@ void RdCost::updateReshapeLumaLevelToWeightTable(SliceReshapeInfo &sliceReshape,
}
#endif
Distortion RdCost::getWeightedMSE(int compIdx, const Pel org, const Pel cur, const uint32_t uiShift, const Pel orgLuma)
Distortion RdCost::getWeightedMSE(int compIdx, const Pel org, const Pel cur, const uint32_t uiShift, const Pel orgLuma)
{
Distortion distortionVal = 0;
Intermediate_Int iTemp = org - cur;
......@@ -3003,7 +3003,7 @@ Distortion RdCost::getWeightedMSE(int compIdx, const Pel org, const Pel cur, con
// use luma to get weight
#if JVET_M0427_INLOOP_RESHAPER
double weight = 1.0;
if (m_signalType == RESHAPE_SIGNAL_SDR)
if (m_signalType == RESHAPE_SIGNAL_SDR)
{
if (compIdx == COMPONENT_Y)
{
......@@ -3011,7 +3011,7 @@ Distortion RdCost::getWeightedMSE(int compIdx, const Pel org, const Pel cur, con
}
else
{
weight = m_chromaWeight;
weight = m_chromaWeight;
}
}
else
......@@ -3053,7 +3053,7 @@ Distortion RdCost::xGetSSE_WTD( const DistParam &rcDtParam )
{
for (int n = 0; n < iCols; n++ )
{
uiSum += getWeightedMSE(rcDtParam.compID, piOrg[n ], piCur[n ], uiShift, piOrgLuma[n<<cShift]);
uiSum += getWeightedMSE(rcDtParam.compID, piOrg[n ], piCur[n ], uiShift, piOrgLuma[n<<cShift]);
}
piOrg += iStrideOrg;
piCur += iStrideCur;
......@@ -3069,7 +3069,7 @@ Distortion RdCost::xGetSSE2_WTD( const DistParam &rcDtParam )
CHECK( rcDtParam.org.width != 2, "" );
return RdCostWeightPrediction::xGetSSEw( rcDtParam ); // ignore it for now
}
int iRows = rcDtParam.org.height;
const Pel* piOrg = rcDtParam.org.buf;
const Pel* piCur = rcDtParam.cur.buf;
......@@ -3138,7 +3138,7 @@ Distortion RdCost::xGetSSE8_WTD( const DistParam &rcDtParam )
const Pel* piOrgLuma = rcDtParam.orgLuma.buf;
const size_t iStrideOrgLuma = rcDtParam.orgLuma.stride;
const size_t cShift = (rcDtParam.compID==COMPONENT_Y) ? 0 : 1; // assume 420, could use getComponentScaleX, getComponentScaleY
Distortion uiSum = 0;
uint32_t uiShift = DISTORTION_PRECISION_ADJUSTMENT(rcDtParam.bitDepth) << 1;
for( ; iRows != 0; iRows-- )
......@@ -3173,7 +3173,7 @@ Distortion RdCost::xGetSSE16_WTD( const DistParam &rcDtParam )
const Pel* piOrgLuma = rcDtParam.orgLuma.buf;
const size_t iStrideOrgLuma = rcDtParam.orgLuma.stride;
const size_t cShift = (rcDtParam.compID==COMPONENT_Y) ? 0 : 1; // assume 420, could use getComponentScaleX, getComponentScaleY
Distortion uiSum = 0;
uint32_t uiShift = DISTORTION_PRECISION_ADJUSTMENT(rcDtParam.bitDepth) << 1;
for( ; iRows != 0; iRows-- )
......@@ -3261,7 +3261,7 @@ Distortion RdCost::xGetSSE32_WTD( const DistParam &rcDtParam )
const Pel* piOrgLuma = rcDtParam.orgLuma.buf;
const size_t iStrideOrgLuma = rcDtParam.orgLuma.stride;
const size_t cShift = (rcDtParam.compID==COMPONENT_Y) ? 0 : 1; // assume 420, could use getComponentScaleX, getComponentScaleY
Distortion uiSum = 0;
uint32_t uiShift = DISTORTION_PRECISION_ADJUSTMENT(rcDtParam.bitDepth) << 1;
for( ; iRows != 0; iRows-- )
......@@ -3320,7 +3320,7 @@ Distortion RdCost::xGetSSE64_WTD( const DistParam &rcDtParam )
const Pel* piOrgLuma = rcDtParam.orgLuma.buf;
const size_t iStrideOrgLuma = rcDtParam.orgLuma.stride;
const size_t cShift = (rcDtParam.compID==COMPONENT_Y) ? 0 : 1; // assume 420, could use getComponentScaleX, getComponentScaleY
Distortion uiSum = 0;
uint32_t uiShift = DISTORTION_PRECISION_ADJUSTMENT((rcDtParam.bitDepth)) << 1;
for( ; iRows != 0; iRows-- )
......
......@@ -96,7 +96,7 @@ public:
};// END CLASS DEFINITION Reshape
//! \}
#endif //
#endif //
#endif // __RESHAPE__
......@@ -311,7 +311,7 @@ uint32_t deriveWeightIdxBits(uint8_t gbiIdx) // Note: align this with TEncSbac::
}
#if JVET_M0102_INTRA_SUBPARTITIONS // define the sbb sizes
uint32_t g_log2SbbSize[2][MAX_CU_DEPTH+1][MAX_CU_DEPTH+1][2] =
uint32_t g_log2SbbSize[2][MAX_CU_DEPTH+1][MAX_CU_DEPTH+1][2] =
{
//===== luma =====
{
......@@ -937,7 +937,7 @@ const uint8_t g_NonMPM[257] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
#if !JVET_M0328_KEEP_ONE_WEIGHT_GROUP
const Pel g_trianglePelWeightedLuma[TRIANGLE_DIR_NUM][2][7] =
{
{
{ // TRIANGLE_DIR_135
{ 1, 2, 4, 6, 7, 0, 0 },
{ 1, 2, 3, 4, 5, 6, 7 }
......@@ -980,14 +980,14 @@ const uint8_t g_triangleWeightLengthChroma[2][2] = { { 5, 7 }, { 3, 3 } };
#if !JVET_M0883_TRIANGLE_SIGNALING
const uint8_t g_triangleCombination[TRIANGLE_MAX_NUM_CANDS][3] =
{
{ 0, 1, 0 }, { 1, 0, 1 }, { 1, 0, 2 }, { 0, 0, 1 }, { 0, 2, 0 },
{ 1, 0, 3 }, { 1, 0, 4 }, { 1, 1, 0 }, { 0, 3, 0 }, { 0, 4, 0 },
{ 0, 0, 2 }, { 0, 1, 2 }, { 1, 1, 2 }, { 0, 0, 4 }, { 0, 0, 3 },
{ 0, 1, 3 }, { 0, 1, 4 }, { 1, 1, 4 }, { 1, 1, 3 }, { 1, 2, 1 },
{ 1, 2, 0 }, { 0, 2, 1 }, { 0, 4, 3 }, { 1, 3, 0 }, { 1, 3, 2 },
{ 1, 3, 4 }, { 1, 4, 0 }, { 1, 3, 1 }, { 1, 2, 3 }, { 1, 4, 1 },
{ 0, 4, 1 }, { 0, 2, 3 }, { 1, 4, 2 }, { 0, 3, 2 }, { 1, 4, 3 },
{ 0, 3, 1 }, { 0, 2, 4 }, { 1, 2, 4 }, { 0, 4, 2 }, { 0, 3, 4 },
{ 0, 1, 0 }, { 1, 0, 1 }, { 1, 0, 2 }, { 0, 0, 1 }, { 0, 2, 0 },
{ 1, 0, 3 }, { 1, 0, 4 }, { 1, 1, 0 }, { 0, 3, 0 }, { 0, 4, 0 },
{ 0, 0, 2 }, { 0, 1, 2 }, { 1, 1, 2 }, { 0, 0, 4 }, { 0, 0, 3 },
{ 0, 1, 3 }, { 0, 1, 4 }, { 1, 1, 4 }, { 1, 1, 3 }, { 1, 2, 1 },
{ 1, 2, 0 }, { 0, 2, 1 }, { 0, 4, 3 }, { 1, 3, 0 }, { 1, 3, 2 },
{ 1, 3, 4 }, { 1, 4, 0 }, { 1, 3, 1 }, { 1, 2, 3 }, { 1, 4, 1 },
{ 0, 4, 1 }, { 0, 2, 3 }, { 1, 4, 2 }, { 0, 3, 2 }, { 1, 4, 3 },
{ 0, 3, 1 }, { 0, 2, 4 }, { 1, 2, 4 }, { 0, 4, 2 }, { 0, 3, 4 },
};
const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS] =
......
......@@ -1953,7 +1953,7 @@ SPS::SPS()
#endif
#if JVET_M0140_SBT
, m_SBT ( false )
, m_MaxSbtSize ( 32 )
, m_MaxSbtSize ( 32 )
#endif
#if HEVC_VPS
, m_VPSId ( 0)
......
......@@ -1183,7 +1183,7 @@ public:
unsigned getMaxBTDepthIChroma() const { return m_maxBTDepth[2]; }
void setMaxBTSize(unsigned maxBTSize,
unsigned maxBTSizeI,
unsigned maxBTSizeC)
unsigned maxBTSizeC)
{ m_maxBTSize[1] = maxBTSize; m_maxBTSize[0] = maxBTSizeI; m_maxBTSize[2] = maxBTSizeC; }
unsigned getMaxBTSize() const { return m_maxBTSize[1]; }
unsigned getMaxBTSizeI() const { return m_maxBTSize[0]; }
......@@ -1252,7 +1252,7 @@ public:
bool getSBTMVPEnabledFlag() const { return m_sbtmvpEnabledFlag; }
void setSBTMVPEnabledFlag(bool b) { m_sbtmvpEnabledFlag = b; }
void setBDOFEnabledFlag(bool b) { m_bdofEnabledFlag = b; }
bool getBDOFEnabledFlag() const { return m_bdofEnabledFlag; }
......
......@@ -347,7 +347,7 @@ void TrQuant::getTrTypes ( TransformUnit tu, const ComponentID compID, int &trTy
return;
}
#endif
#if JVET_M0464_UNI_MTS
if ( mtsActivated )
#else
......@@ -367,7 +367,7 @@ void TrQuant::getTrTypes ( TransformUnit tu, const ComponentID compID, int &trTy
int indHor = tu.emtIdx & 1;
int indVer = tu.emtIdx >> 1;
#endif
trTypeHor = indHor ? DCT8 : DST7;
trTypeVer = indVer ? DCT8 : DST7;
}
......@@ -380,7 +380,7 @@ void TrQuant::getTrTypes ( TransformUnit tu, const ComponentID compID, int &trTy
int height = tu.blocks[compID].height;
bool widthDstOk = width >= 4 && width <= 16;
bool heightDstOk = height >= 4 && height <= 16;
if ( width < height && widthDstOk )
trTypeHor = DST7;
else if ( height < width && heightDstOk )
......@@ -406,34 +406,34 @@ void TrQuant::xT( const TransformUnit &tu, const ComponentID &compID, const CPel
const int skipWidth = width > JVET_C0024_ZERO_OUT_TH ? width - JVET_C0024_ZERO_OUT_TH : 0;
const int skipHeight = height > JVET_C0024_ZERO_OUT_TH ? height - JVET_C0024_ZERO_OUT_TH : 0;
#endif
#if !JVET_M0102_INTRA_SUBPARTITIONS
CHECK( shift_1st < 0, "Negative shift" );
CHECK( shift_2nd < 0, "Negative shift" );
#endif
int trTypeHor = DCT2;
int trTypeVer = DCT2;
getTrTypes ( tu, compID, trTypeHor, trTypeVer );
#if JVET_M0297_32PT_MTS_ZERO_OUT
const int skipWidth = ( trTypeHor != DCT2 && width == 32 ) ? 16 : width > JVET_C0024_ZERO_OUT_TH ? width - JVET_C0024_ZERO_OUT_TH : 0;
const int skipHeight = ( trTypeVer != DCT2 && height == 32 ) ? 16 : height > JVET_C0024_ZERO_OUT_TH ? height - JVET_C0024_ZERO_OUT_TH : 0;
#endif
#if RExt__DECODER_DEBUG_TOOL_STATISTICS
if ( trTypeHor != DCT2 )
{
CodingStatistics::IncrementStatisticTool( CodingStatisticsClassType{ STATS__TOOL_EMT, uint32_t( width ), uint32_t( height ), compID } );
}
#endif
ALIGN_DATA( MEMORY_ALIGN_DEF_SIZE, TCoeff block[MAX_TU_SIZE * MAX_TU_SIZE] );
const Pel *resiBuf = resi.buf;
const int resiStride = resi.stride;
for( int y = 0; y < height; y++ )
{
for( int x = 0; x < width; x++ )
......@@ -441,7 +441,7 @@ void TrQuant::xT( const TransformUnit &tu, const ComponentID &compID, const CPel
block[( y * width ) + x] = resiBuf[( y * resiStride ) + x];
}
}
#if JVET_M0102_INTRA_SUBPARTITIONS
if( width > 1 && height > 1 ) // 2-D transform
{
......@@ -451,12 +451,12 @@ void TrQuant::xT( const TransformUnit &tu, const ComponentID &compID, const CPel
CHECK( shift_2nd < 0, "Negative shift" );
#endif
TCoeff *tmp = ( TCoeff * ) alloca( width * height * sizeof( TCoeff ) );
fastFwdTrans[trTypeHor][transformWidthIndex ](block, tmp, shift_1st, height, 0, skipWidth);
fastFwdTrans[trTypeVer][transformHeightIndex](tmp, dstCoeff.buf, shift_2nd, width, skipWidth, skipHeight);
#if JVET_M0102_INTRA_SUBPARTITIONS
}
else if( height == 1 ) //1-D horizontal transform
else if( height == 1 ) //1-D horizontal transform
{
const int shift = ((g_aucLog2[width ]) + bitDepth + TRANSFORM_MATRIX_SHIFT) - maxLog2TrDynamicRange + COM16_C806_TRANS_PREC;
CHECK( shift < 0, "Negative shift" );
......@@ -492,7 +492,7 @@ void TrQuant::xIT( const TransformUnit &tu, const ComponentID &compID, const CCo
const int skipWidth = width > JVET_C0024_ZERO_OUT_TH ? width - JVET_C0024_ZERO_OUT_TH : 0;
const int skipHeight = height > JVET_C0024_ZERO_OUT_TH ? height - JVET_C0024_ZERO_OUT_TH : 0;
#endif
#if !JVET_M0102_INTRA_SUBPARTITIONS
CHECK( shift_1st < 0, "Negative shift" );
CHECK( shift_2nd < 0, "Negative shift" );
......@@ -500,19 +500,19 @@ void TrQuant::xIT( const TransformUnit &tu, const ComponentID &compID, const CCo
int trTypeHor = DCT2;
int trTypeVer = DCT2;
getTrTypes ( tu, compID, trTypeHor, trTypeVer );
#if JVET_M0297_32PT_MTS_ZERO_OUT
const int skipWidth = ( trTypeHor != DCT2 && width == 32 ) ? 16 : width > JVET_C0024_ZERO_OUT_TH ? width - JVET_C0024_ZERO_OUT_TH : 0;
const int skipHeight = ( trTypeVer != DCT2 && height == 32 ) ? 16 : height > JVET_C0024_ZERO_OUT_TH ? height - JVET_C0024_ZERO_OUT_TH : 0;
#endif
#if !JVET_M0102_INTRA_SUBPARTITIONS