Commit be969de4 authored by Frederic Barbier's avatar Frederic Barbier
Browse files

Cleanup trailing whitespaces

parent 33e05832
......@@ -290,7 +290,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setUseAffineAmvr ( m_AffineAmvr );
m_cEncLib.setUseAffineAmvrEncOpt ( m_AffineAmvrEncOpt );
m_cEncLib.setDMVR ( m_DMVR );
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
m_cEncLib.setMMVD ( m_MMVD );
#endif
#if JVET_N0449_MMVD_SIMP
......
......@@ -839,9 +839,9 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
( "FastLFNST", m_useFastLFNST, false, "Fast methods for LFNST" )
#endif
("SubPuMvp", m_SubPuMvpMode, 0, "Enable Sub-PU temporal motion vector prediction (0:off, 1:ATMVP, 2:STMVP, 3:ATMVP+STMVP) [default: off]")
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
("MMVD", m_MMVD, true, "Enable Merge mode with Motion Vector Difference (0:off, 1:on) [default: 1]")
#endif
#endif
("Affine", m_Affine, false, "Enable affine prediction (0:off, 1:on) [default: off]")
("AffineType", m_AffineType, true, "Enable affine type prediction (0:off, 1:on) [default: on]" )
("BIO", m_BIO, false, "Enable bi-directional optical flow")
......@@ -3166,7 +3166,7 @@ void EncAppCfg::xPrintParameter()
#if JVET_N0193_LFNST
msg( VERBOSE, "LFNST:%d ", m_LFNST );
#endif
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
msg( VERBOSE, "MMVD:%d ", m_MMVD);
#endif
msg( VERBOSE, "Affine:%d ", m_Affine );
......@@ -3199,7 +3199,7 @@ void EncAppCfg::xPrintParameter()
#endif
msg(VERBOSE, "MHIntra:%d ", m_MHIntra);
msg( VERBOSE, "Triangle:%d ", m_Triangle );
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
m_allowDisFracMMVD = m_MMVD ? m_allowDisFracMMVD : false;
if ( m_MMVD )
msg(VERBOSE, "AllowDisFracMMVD:%d ", m_allowDisFracMMVD);
......
......@@ -274,7 +274,7 @@ protected:
bool m_AffineAmvr;
bool m_AffineAmvrEncOpt;
bool m_DMVR;
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
bool m_MMVD;
#endif
#if JVET_N0449_MMVD_SIMP
......
......@@ -264,7 +264,7 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
int poc = -1;
int poc_lsb = -1;
int new_poc = -1;
if(nalu_type == NAL_UNIT_CODED_SLICE_IDR_W_RADL || nalu_type == NAL_UNIT_CODED_SLICE_IDR_N_LP)
{
poc = 0;
......
......@@ -753,7 +753,7 @@ void AdaptiveLoopFilter::deriveClassification( AlfClassifier** classifier, const
for( int j = blk.pos().x; j < width; j += m_CLASSIFICATION_BLK_SIZE )
{
int nWidth = std::min( j + m_CLASSIFICATION_BLK_SIZE, width ) - j;
#if JVET_N0180_ALF_LINE_BUFFER_REDUCTION
#if JVET_N0180_ALF_LINE_BUFFER_REDUCTION
m_deriveClassificationBlk(classifier, m_laplacian, srcLuma, Area(j, i, nWidth, nHeight), m_inputBitDepth[CHANNEL_TYPE_LUMA] + 4
, m_alfVBLumaCTUHeight
, ((i + nHeight >= m_picHeight) ? m_picHeight : m_alfVBLumaPos)
......@@ -761,7 +761,7 @@ void AdaptiveLoopFilter::deriveClassification( AlfClassifier** classifier, const
#else
m_deriveClassificationBlk(classifier, m_laplacian, srcLuma, Area(j, i, nWidth, nHeight), m_inputBitDepth[CHANNEL_TYPE_LUMA] + 4);
#endif
}
}
}
......@@ -815,7 +815,7 @@ void AdaptiveLoopFilter::resetPCMBlkClassInfo(CodingStructure & cs, AlfClassifi
}
}
#if JVET_N0180_ALF_LINE_BUFFER_REDUCTION
#if JVET_N0180_ALF_LINE_BUFFER_REDUCTION
void AdaptiveLoopFilter::deriveClassificationBlk(AlfClassifier** classifier, int** laplacian[NUM_DIRECTIONS], const CPelBuf& srcLuma, const Area& blk, const int shift, int vbCTUHeight, int vbPos)
#else
void AdaptiveLoopFilter::deriveClassificationBlk(AlfClassifier** classifier, int** laplacian[NUM_DIRECTIONS], const CPelBuf& srcLuma, const Area& blk, const int shift)
......@@ -846,7 +846,7 @@ void AdaptiveLoopFilter::deriveClassificationBlk(AlfClassifier** classifier, int
const Pel *src1 = &src[yoffset];
const Pel *src2 = &src[yoffset + stride];
const Pel *src3 = &src[yoffset + stride * 2];
#if JVET_N0180_ALF_LINE_BUFFER_REDUCTION
#if JVET_N0180_ALF_LINE_BUFFER_REDUCTION
if (((posY - 2 + i) > 0) && ((posY - 2 + i) % vbCTUHeight) == (vbPos - 2))
{
src3 = &src[yoffset + stride];
......@@ -855,7 +855,7 @@ void AdaptiveLoopFilter::deriveClassificationBlk(AlfClassifier** classifier, int
{
src0 = &src[yoffset];
}
#endif
#endif
int* pYver = laplacian[VER][i];
int* pYhor = laplacian[HOR][i];
int* pYdig0 = laplacian[DIAG0][i];
......
......@@ -98,7 +98,7 @@ public:
static void deriveClassificationBlk(AlfClassifier** classifier, int** laplacian[NUM_DIRECTIONS], const CPelBuf& srcLuma, const Area& blk, const int shift, int vbCTUHeight, int vbPos);
#else
static void deriveClassificationBlk(AlfClassifier** classifier, int** laplacian[NUM_DIRECTIONS], const CPelBuf& srcLuma, const Area& blk, const int shift);
#endif
#endif
void deriveClassification( AlfClassifier** classifier, const CPelBuf& srcLuma, const Area& blk );
void resetPCMBlkClassInfo(CodingStructure & cs, AlfClassifier** classifier, const CPelBuf& srcLuma, const Area& blk);
template<AlfFilterType filtType>
......
......@@ -365,18 +365,18 @@ void AreaBuf<T>::copyAndNegate( const AreaBuf<const T> &other )
{
CHECK( width != other.width, "Incompatible size" );
CHECK( height != other.height, "Incompatible size" );
T* dest = buf;
const T* subs = other.buf;
#define SUBS_INC \
dest += stride; \
subs += other.stride; \
#define SUBS_OP( ADDR ) dest[ADDR] = -subs[ADDR]
SIZE_AWARE_PER_EL_OP( SUBS_OP, SUBS_INC );
#undef SUBS_OP
#undef SUBS_INC
}
......@@ -386,18 +386,18 @@ void AreaBuf<T>::subtractAndHalve( const AreaBuf<const T> &other )
{
CHECK( width != other.width, "Incompatible size" );
CHECK( height != other.height, "Incompatible size" );
T* dest = buf;
const T* subs = other.buf;
#define SUBS_INC \
dest += stride; \
subs += other.stride; \
#define SUBS_OP( ADDR ) dest[ADDR] = ( dest[ADDR] - subs[ADDR] ) / 2
SIZE_AWARE_PER_EL_OP( SUBS_OP, SUBS_INC );
#undef SUBS_OP
#undef SUBS_INC
}
......
......@@ -259,7 +259,7 @@ public:
}
};
#if JVET_N0217_MATRIX_INTRAPRED
#if JVET_N0217_MATRIX_INTRAPRED
struct AvailableInfo
{
int maxPosTop;
......
......@@ -940,7 +940,7 @@ const unsigned ContextSetCfg::NumberOfContexts = (unsigned)ContextSetCfg::sm_Ini
// combined sets
const CtxSet ContextSetCfg::Sao = { ContextSetCfg::SaoMergeFlag, ContextSetCfg::SaoTypeIdx };
#if JVET_N0415_CTB_ALF
#if JVET_N0415_CTB_ALF
const CtxSet ContextSetCfg::Alf = { ContextSetCfg::ctbAlfFlag, ContextSetCfg::AlfUseLatestFilt, ContextSetCfg::AlfUseTemporalFilt };
#endif
......
......@@ -1274,7 +1274,7 @@ namespace DQIntern
TCoeff sumGt1 = sumAbs1 - sumNum;
m_sigFracBits = m_sigFracBitsArray[scanInfo.sigCtxOffsetNext + (sumAbs1 < 5 ? sumAbs1 : 5)];
m_coeffFracBits = m_gtxFracBitsArray[scanInfo.gtxCtxOffsetNext + (sumGt1 < 4 ? sumGt1 : 4)];
#if JVET_N0188_UNIFY_RICEPARA
TCoeff sumAbs = m_absLevelsAndCtxInit[8 + scanInfo.nextInsidePos] >> 8;
#define UPDATE(k) {TCoeff t=levels[scanInfo.nextNbInfoSbb.inPos[k]]; sumAbs+=t; }
......
......@@ -274,7 +274,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
// find the block with least candidates
size_t minSize = MAX_UINT;
unsigned int targetHashOneBlock = 0;
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
Position targetBlockOffsetInCu(0, 0);
#endif
for (SizeType y = 0; y < lumaArea.height && minSize > 1; y += MIN_PU_SIZE)
......@@ -286,7 +286,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
{
minSize = m_hash2Pos[hash].size();
targetHashOneBlock = hash;
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
targetBlockOffsetInCu.repositionTo(Position(x, y));
#endif
}
......@@ -300,7 +300,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
// check whether whole block match
for (std::vector<Position>::iterator refBlockPos = candOneBlock.begin(); refBlockPos != candOneBlock.end(); refBlockPos++)
{
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
Position topLeft = refBlockPos->offset(-targetBlockOffsetInCu.x, -targetBlockOffsetInCu.y);
Position bottomRight = topLeft.offset(lumaArea.width - 1, lumaArea.height - 1);
#else
......@@ -309,7 +309,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
bool wholeBlockMatch = true;
if (lumaArea.width > MIN_PU_SIZE || lumaArea.height > MIN_PU_SIZE)
{
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
if (!cs.isDecomp(bottomRight, CHANNEL_TYPE_LUMA) || bottomRight.x >= m_picWidth || bottomRight.y >= m_picHeight || topLeft.x < 0 || topLeft.y < 0)
#else
if (!cs.isDecomp(bottomRight, cs.chType) || bottomRight.x >= m_picWidth || bottomRight.y >= m_picHeight)
......@@ -322,7 +322,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
for (SizeType x = 0; x < lumaArea.width && wholeBlockMatch; x += MIN_PU_SIZE)
{
// whether the reference block and current block has the same hash
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
wholeBlockMatch &= (m_pos2Hash[lumaArea.pos().y + y][lumaArea.pos().x + x] == m_pos2Hash[topLeft.y + y][topLeft.x + x]);
#else
wholeBlockMatch &= (m_pos2Hash[lumaArea.pos().y + y][lumaArea.pos().x + x] == m_pos2Hash[refBlockPos->y + y][refBlockPos->x + x]);
......@@ -332,7 +332,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
}
else
{
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
CHECK(topLeft != *refBlockPos, "4x4 target block should not have offset!");
if (abs(topLeft.x - lumaArea.x) > searchRange4SmallBlk || abs(topLeft.y - lumaArea.y) > searchRange4SmallBlk || !cs.isDecomp(bottomRight, CHANNEL_TYPE_LUMA))
#else
......@@ -344,7 +344,7 @@ bool IbcHashMap::ibcHashMatch(const Area& lumaArea, std::vector<Position>& cand,
}
if (wholeBlockMatch)
{
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
cand.push_back(topLeft);
#else
cand.push_back(*refBlockPos);
......
......@@ -799,7 +799,7 @@ void InterPrediction::xPredInterBlk ( const ComponentID& compID, const Predictio
}
#if JVET_N0068_AFFINE_MEM_BW
bool InterPrediction::isSubblockVectorSpreadOverLimit( int a, int b, int c, int d, int predType )
bool InterPrediction::isSubblockVectorSpreadOverLimit( int a, int b, int c, int d, int predType )
{
int s4 = ( 4 << 11 );
int filterTap = 6;
......@@ -1101,7 +1101,7 @@ void InterPrediction::applyBiOptFlow(const PredictionUnit &pu, const CPelUnitBuf
const int bitDepth = clipBitDepths.recon[toChannelType(COMPONENT_Y)];
const int shiftNum = IF_INTERNAL_PREC + 1 - bitDepth;
const int offset = (1 << (shiftNum - 1)) + 2 * IF_INTERNAL_OFFS;
#if JVET_N0325_BDOF
#if JVET_N0325_BDOF
const int limit = (1<<(std::max<int>(5, bitDepth - 7)));
#else
const int limit = (bitDepth>12)? 2 : ((int)1 << (4 + IF_INTERNAL_PREC - bitDepth - 5));
......@@ -1373,15 +1373,15 @@ void InterPrediction::motionCompensation( PredictionUnit &pu, PelUnitBuf &predBu
}
}
if (bioApplied && pu.cu->smvdMode)
if (bioApplied && pu.cu->smvdMode)
{
bioApplied = false;
}
if (pu.cu->cs->sps->getUseGBi() && bioApplied && pu.cu->GBiIdx != GBI_DEFAULT)
if (pu.cu->cs->sps->getUseGBi() && bioApplied && pu.cu->GBiIdx != GBI_DEFAULT)
{
bioApplied = false;
}
if (pu.mmvdEncOptMode == 2 && pu.mmvdMergeFlag)
if (pu.mmvdEncOptMode == 2 && pu.mmvdMergeFlag)
{
bioApplied = false;
}
......@@ -2015,7 +2015,7 @@ void InterPrediction::xProcessDMVR(PredictionUnit& pu, PelUnitBuf &pcYuvDst, con
xFinalPaddedMCForDMVR(subPu, srcPred0, srcPred1, m_cYuvRefBuffSubCuDMVRL0, m_cYuvRefBuffSubCuDMVRL1, bioApplied, mergeMv);
subPredBuf.bufs[COMPONENT_Y].buf = pcYuvDst.bufs[COMPONENT_Y].buf + xStart + yStart * dstStride[COMPONENT_Y];
#if !JVET_N0671_DMVR
#if !JVET_N0671_DMVR
subPredBuf.bufs[COMPONENT_Cb].buf = pcYuvDst.bufs[COMPONENT_Cb].buf + (xStart >> 1) + ((yStart >> 1) * dstStride[COMPONENT_Cb]);
subPredBuf.bufs[COMPONENT_Cr].buf = pcYuvDst.bufs[COMPONENT_Cr].buf + (xStart >> 1) + ((yStart >> 1) * dstStride[COMPONENT_Cr]);
#else
......@@ -2026,7 +2026,7 @@ void InterPrediction::xProcessDMVR(PredictionUnit& pu, PelUnitBuf &pcYuvDst, con
scaleX = getComponentScaleX(COMPONENT_Cr, pu.chromaFormat);
scaleY = getComponentScaleY(COMPONENT_Cr, pu.chromaFormat);
subPredBuf.bufs[COMPONENT_Cr].buf = pcYuvDst.bufs[COMPONENT_Cr].buf + (xStart >> scaleX) + ((yStart >> scaleY) * dstStride[COMPONENT_Cr]);
#endif // !JVET_N0671_DMVR
#endif // !JVET_N0671_DMVR
xWeightedAverage(subPu, srcPred0, srcPred1, subPredBuf, subPu.cu->slice->getSPS()->getBitDepths(), subPu.cu->slice->clpRngs(), bioApplied);
num++;
......
......@@ -571,10 +571,10 @@ void IntraPrediction::initPredIntraParams(const PredictionUnit & pu, const CompA
m_ipaParam.applyPDPC &= m_ipaParam.intraPredAngle == 0 || m_ipaParam.intraPredAngle >= 12; // intra prediction modes: HOR, VER, x, where x>=VDIA-8 or x<=2+8
}
// high level conditions and DC intra prediction
if( sps.getSpsRangeExtension().getIntraSmoothingDisabledFlag()
// high level conditions and DC intra prediction
if( sps.getSpsRangeExtension().getIntraSmoothingDisabledFlag()
#if JVET_N0671_INTRA_TPM_ALIGNWITH420
|| !isLuma( chType )
|| !isLuma( chType )
#else
|| ( !isLuma( chType ) && pu.chromaFormat != CHROMA_444 )
#endif
......@@ -582,7 +582,7 @@ void IntraPrediction::initPredIntraParams(const PredictionUnit & pu, const CompA
|| m_ipaParam.multiRefIndex
|| DC_IDX == dirMode
)
{
{
if (useISP)
{
m_ipaParam.interpolationFlag = (m_ipaParam.isModeVer ? puSize.width : puSize.height) > 8 ? true : false ;
......@@ -594,13 +594,13 @@ void IntraPrediction::initPredIntraParams(const PredictionUnit & pu, const CompA
m_ipaParam.refFilterFlag = false;
}
#endif
else if (dirMode == PLANAR_IDX) // Planar intra prediction
else if (dirMode == PLANAR_IDX) // Planar intra prediction
{
m_ipaParam.refFilterFlag = puSize.width * puSize.height > 32 ? true : false;
}
else if (!useISP)// HOR, VER and angular modes (MDIS)
{
bool filterFlag = false;
bool filterFlag = false;
if (predMode != dirMode ) // wide-anlge mode
{
......@@ -617,7 +617,7 @@ void IntraPrediction::initPredIntraParams(const PredictionUnit & pu, const CompA
// Selelection of either ([1 2 1] / 4 ) refrence filter OR Gaussian 4-tap interpolation filter
if (filterFlag)
{
const bool isRefFilter = isIntegerSlope(absAng);
const bool isRefFilter = isIntegerSlope(absAng);
#if JVET_N0435_WAIP_HARMONIZATION
m_ipaParam.refFilterFlag = isRefFilter && puSize.width * puSize.height > 32;
#else
......@@ -649,7 +649,7 @@ void IntraPrediction::xPredIntraAng( const CPelBuf &pSrc, PelBuf &pDst, const Ch
const bool bIsModeVer = m_ipaParam.isModeVer;
const int whRatio = m_ipaParam.whRatio;
const int hwRatio = m_ipaParam.hwRatio;
const int multiRefIdx = m_ipaParam.multiRefIndex;
const int multiRefIdx = m_ipaParam.multiRefIndex;
const int intraPredAngle = m_ipaParam.intraPredAngle;
const int invAngle = m_ipaParam.invAngle;
......@@ -798,7 +798,7 @@ void IntraPrediction::xPredIntraAng( const CPelBuf &pSrc, PelBuf &pDst, const Ch
CHECK(scale < 0 || scale > 31, "PDPC: scale < 0 || scale > 31");
if (m_ipaParam.applyPDPC)
{
if (m_ipaParam.intraPredAngle == 32) // intra prediction modes: 2 and VDIA
if (m_ipaParam.intraPredAngle == 32) // intra prediction modes: 2 and VDIA
{
int wT = 16 >> std::min(31, ((y << 1) >> scale));
......@@ -1586,7 +1586,7 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
}
//assert 420 chroma subsampling
CompArea lumaArea = CompArea( COMPONENT_Y, pu.chromaFormat, chromaArea.lumaPos(), recalcSize( pu.chromaFormat, CHANNEL_TYPE_CHROMA, CHANNEL_TYPE_LUMA, chromaArea.size() ) );//needed for correct pos/size (4x4 Tus)
#if JVET_N0671_CCLM
CHECK(lumaArea.width == chromaArea.width && CHROMA_444 != pu.chromaFormat, "");
CHECK(lumaArea.height == chromaArea.height && CHROMA_444 != pu.chromaFormat && CHROMA_422 != pu.chromaFormat, "");
......@@ -1723,7 +1723,7 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
{
piSrc = pRecSrc0 - iRecStride;
#if JVET_N0671_CCLM
#if JVET_N0671_CCLM
if ((i == 0 && !bLeftAvaillable) || (i == uiCWidth + addedAboveRight - 1 + logSubWidthC))
#else //!JVET_N0671_CCLM
if (i == 0 && !bLeftAvaillable)
......@@ -1747,7 +1747,7 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
else if( pu.cs->sps->getCclmCollocatedChromaFlag() )
{
piSrc = pRecSrc0 - iRecStride2;
#if JVET_N0671_CCLM
if ((i == 0 && !bLeftAvaillable) || (i == uiCWidth + addedAboveRight - 1 + logSubWidthC))
#else //!JVET_N0671_CCLM
......@@ -1778,7 +1778,7 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
else
{
piSrc = pRecSrc0 - iRecStride2;
#if JVET_N0671_CCLM
if ((i == 0 && !bLeftAvaillable) || (i == uiCWidth + addedAboveRight - 1 + logSubWidthC))
#else //!JVET_N0671_CCLM
......@@ -1822,7 +1822,7 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
{
addedLeftBelow = avaiLeftBelowUnits*chromaUnitHeight;
}
for (int j = 0; j < uiCHeight + addedLeftBelow; j++)
{
if( pu.cs->sps->getCclmCollocatedChromaFlag() )
......@@ -1926,7 +1926,7 @@ void IntraPrediction::xGetLumaRecPixels(const PredictionUnit &pu, CompArea chrom
else
{
#if JVET_N0671_CCLM
#if JVET_N0671_CCLM
if ((i == 0 && !bLeftAvaillable) || (i == uiCWidth - 1 + logSubWidthC))
#else //JVET_N0671_CCLM
if ( i == 0 && !bLeftAvaillable )
......@@ -2130,7 +2130,7 @@ void IntraPrediction::xGetLMParameters(const PredictionUnit &pu, const Component
}
}
cnt = cntL + cntT;
if (cnt == 2)
{
selectLumaPix[3] = selectLumaPix[0]; selectChromaPix[3] = selectChromaPix[0];
......
......@@ -77,7 +77,7 @@ private:
static const uint8_t m_aucIntraFilter[MAX_NUM_CHANNEL_TYPE][MAX_INTRA_FILTER_DEPTHS];
struct IntraPredParam //parameters of Intra Prediction
struct IntraPredParam //parameters of Intra Prediction
{
bool refFilterFlag;
bool applyPDPC;
......@@ -89,15 +89,15 @@ private:
int invAngle;
bool interpolationFlag;
IntraPredParam() :
refFilterFlag ( false ),
applyPDPC ( false ),
isModeVer ( false ),
multiRefIndex ( -1 ),
whRatio ( 0 ),
hwRatio ( 0 ),
IntraPredParam() :
refFilterFlag ( false ),
applyPDPC ( false ),
isModeVer ( false ),
multiRefIndex ( -1 ),
whRatio ( 0 ),
hwRatio ( 0 ),
intraPredAngle ( std::numeric_limits<int>::max() ),
invAngle ( std::numeric_limits<int>::max() ),
invAngle ( std::numeric_limits<int>::max() ),
interpolationFlag ( false ) {}
};
......@@ -125,7 +125,7 @@ protected:
#if JVET_N0435_WAIP_HARMONIZATION
static bool isIntegerSlope(const int absAng) { return (0 == (absAng & 0x1F)); }
#else
static bool isIntegerSlope ( const int absAng ) { return (0 == (absAng & 0x1F)) && absAng <=32; } // integer-slope modes 2, DIA_IDX and VDIA_IDX. "absAng <=32" restricts wide-angle integer modes
static bool isIntegerSlope ( const int absAng ) { return (0 == (absAng & 0x1F)) && absAng <=32; } // integer-slope modes 2, DIA_IDX and VDIA_IDX. "absAng <=32" restricts wide-angle integer modes
#endif
#if JVET_N0413_RDPCM
......@@ -163,7 +163,7 @@ public:
void predIntraChromaLM(const ComponentID compID, PelBuf &piPred, const PredictionUnit &pu, const CompArea& chromaArea, int intraDir);
void xGetLumaRecPixels(const PredictionUnit &pu, CompArea chromaArea);
/// set parameters from CU data for accessing intra data
void initIntraPatternChType (const CodingUnit &cu, const CompArea &area, const bool forceRefFilterFlag = false); // use forceRefFilterFlag to get both filtered and unfiltered buffers
void initIntraPatternChType (const CodingUnit &cu, const CompArea &area, const bool forceRefFilterFlag = false); // use forceRefFilterFlag to get both filtered and unfiltered buffers
#if JVET_N0217_MATRIX_INTRAPRED
// Matrix-based intra prediction
......
......@@ -43,7 +43,7 @@
#include "MipData.h"
namespace Mip
namespace Mip
{
PredictorMIP::PredictorMIP():
m_reducedBoundary (MIP_MAX_INPUT_SIZE),
......@@ -457,8 +457,8 @@ namespace Mip
void PredictorMIP::xComputeMatrixTimesRedBndryPlusBias( int*const result, const int* const input,
const short*matrix, const short*bias,
const bool leaveHorOut, const bool leaveVerOut,
const int shiftMatrix, const int shiftBias,
const bool leaveHorOut, const bool leaveVerOut,
const int shiftMatrix, const int shiftBias,
const bool transpose, const bool needUpsampling )
{
const int inputSize = m_reducedBoundarySize.width + m_reducedBoundarySize.height;
......@@ -476,7 +476,7 @@ namespace Mip
const int intermediateHeight = transpose ? m_reducedPredictionSize.width : m_reducedPredictionSize.height;
const int xStep = leaveHorOut ? 2 : 1;
const int yStep = leaveVerOut ? intermediateWidth : 0;
int posRes = 0;
int posBias = 0;
for (int y = 0; y < intermediateHeight; y++)
......
......@@ -89,7 +89,7 @@ namespace Mip
void xComputeMatrixTimesRedBndryPlusBias( int*const result, const int* const input,
const short*matrix, const short*bias,
const bool leaveHorOut, const bool leaveVerOut,
const bool leaveHorOut, const bool leaveVerOut,
const int shiftMatrix, const int shiftBias,
const bool transpose, const bool needUpsampling );
};
......
......@@ -54,7 +54,7 @@ enum MvPrecision
MV_PRECISION_HALF = 3, // 1/2-pel
MV_PRECISION_QUARTER = 4, // 1/4-pel (the precision of regular MV difference signaling), shift 4 bits from 4-pel
MV_PRECISION_SIXTEENTH = 6, // 1/16-pel (the precision of internal MV), shift 6 bits from 4-pel
MV_PRECISION_INTERNAL = 2 + MV_FRACTIONAL_BITS_INTERNAL,
MV_PRECISION_INTERNAL = 2 + MV_FRACTIONAL_BITS_INTERNAL,
};
/// basic motion vector class
......
......@@ -3034,7 +3034,7 @@ Distortion RdCost::xGetSSE_WTD( const DistParam &rcDtParam )
#else
const size_t cShift = (rcDtParam.compID==COMPONENT_Y) ? 0 : 1; // assume 420, could use getComponentScaleX, getComponentScaleY
#endif
Distortion uiSum = 0;
uint32_t uiShift = DISTORTION_PRECISION_ADJUSTMENT(rcDtParam.bitDepth) << 1;
for( ; iRows != 0; iRows-- )
......
......@@ -793,7 +793,7 @@ void Slice::copySliceInfo(Slice *pSrc, bool cpyAlmostAll)
#if JVET_N0054_JOINT_CHROMA
m_iSliceChromaQpDelta[JOINT_CbCr] = pSrc->m_iSliceChromaQpDelta[JOINT_CbCr];
#endif
for (i = 0; i < NUM_REF_PIC_LIST_01; i++)
{
for (j = 0; j < MAX_NUM_REF; j++)
......@@ -1139,7 +1139,7 @@ void Slice::checkLeadingPictureRestrictions(PicList& rcListPic) const
{
if(this->getAssociatedIRAPType() == NAL_UNIT_CODED_SLICE_CRA)
{
if(pcSlice->getPOC() < this->getAssociatedIRAPPOC() &&
if(pcSlice->getPOC() < this->getAssociatedIRAPPOC() &&
(
#if !JVET_M0101_HLS
pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_N_LP ||
......@@ -1800,7 +1800,7 @@ SPS::SPS()
#endif
, m_affineAmvrEnabledFlag ( false )
, m_DMVR ( false )
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
, m_MMVD ( false )
#endif
, m_SBT ( false )
......
......@@ -255,7 +255,7 @@ public:
, m_noDepQuantConstraintFlag (false)
, m_noSignDataHidingConstraintFlag(false)
{}
bool getProgressiveSourceFlag() const { return m_progressiveSourceFlag; }
void setProgressiveSourceFlag(bool b) { m_progressiveSourceFlag = b; }
......@@ -1012,7 +1012,7 @@ private:
bool m_affineAmvrEnabledFlag;
bool m_DMVR;
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
bool m_MMVD;
#endif
bool m_SBT;
......@@ -1313,7 +1313,7 @@ public:
void setFpelMmvdEnabledFlag( bool b ) { m_fpelMmvdEnabledFlag = b; }
bool getUseDMVR()const { return m_DMVR; }
void setUseDMVR(bool b) { m_DMVR = b; }
#if JVET_N0127_MMVD_SPS_FLAG
#if JVET_N0127_MMVD_SPS_FLAG
bool getUseMMVD()const { return m_MMVD; }
void setUseMMVD(bool b) { m_MMVD = b; }
#endif
......@@ -1894,7 +1894,7 @@ private:
APS* m_aps;
bool m_tileGroupAlfEnabledFlag;
#endif
#if JVET_N0329_IBC_SEARCH_IMP
#if JVET_N0329_IBC_SEARCH_IMP
bool m_disableSATDForRd;
<