Commit b17113bb authored by Frederic Barbier's avatar Frederic Barbier

Cleanup trailing whitespaces

parent 04aeeec8
......@@ -550,7 +550,7 @@ void AdaptiveLoopFilter::filterBlk( AlfClassifier** classifier, const PelUnitBuf
int transposeIdx = 0;
const int clsSizeY = 4;
const int clsSizeX = 4;
bool pcmFlags2x2[4] = {0,0,0,0};
CHECK( startHeight % clsSizeY, "Wrong startHeight in filtering" );
......@@ -605,9 +605,9 @@ void AdaptiveLoopFilter::filterBlk( AlfClassifier** classifier, const PelUnitBuf
// check which chroma 2x2 blocks use PCM
// chroma PCM may not be aligned with 4x4 ALF processing grid
for( blkY=0; blkY<4; blkY+=2 )
for( blkY=0; blkY<4; blkY+=2 )
{
for( blkX=0; blkX<4; blkX+=2 )
for( blkX=0; blkX<4; blkX+=2 )
{
Position pos(j+startWidth+blkX, i+startHeight+blkY);
CodingUnit* cu = isDualTree ? cs.getCU(pos, CH_C) : cs.getCU(recalcPosition(nChromaFormat, CH_C, CH_L, pos), CH_L);
......@@ -677,11 +677,11 @@ void AdaptiveLoopFilter::filterBlk( AlfClassifier** classifier, const PelUnitBuf
for( int jj = 0; jj < clsSizeX; jj++ )
{
// skip 2x2 PCM chroma blocks
if( bChroma && isPCMFilterDisabled )
{
if( pcmFlags2x2[2*(ii>>1) + (jj>>1)] )
if( pcmFlags2x2[2*(ii>>1) + (jj>>1)] )
{
pImg0++;
pImg1++;
......
......@@ -1461,7 +1461,7 @@ void InterPrediction::motionCompensation4Triangle( CodingUnit &cu, MergeCtx &tri
}
}
#endif
triangleMrgCtx.setMergeInfo( pu, candIdx1 );
PU::spanMotionInfo( pu );
motionCompensation( pu, predBuf );
......
......@@ -427,12 +427,12 @@ void InterpolationFilter::filter(const ClpRng& clpRng, Pel const *src, int srcSt
#if JVET_M0147_DMVR
if (biMCForDMVR)
{
if( isFirst )
if( isFirst )
{
shift = IF_FILTER_PREC_BILINEAR - (IF_INTERNAL_PREC_BILINEAR - clpRng.bd);
offset = 1 << (shift - 1);
}
else
else
{
shift = 4;
offset = 1 << (shift - 1);
......
......@@ -272,7 +272,7 @@ typedef std::pair<int, int> TrCost;
#endif
#if JVET_M0445_MCTS
#ifndef HEVC_TILES_WPP
#ifndef HEVC_TILES_WPP
#define HEVC_TILES_WPP 1
#endif
#if !HEVC_TILES_WPP
......
......@@ -4555,7 +4555,7 @@ bool PU::getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx& mrgCtx, b
found = true;
}
}
}
}
if (!found)
{
mi.mv[0] = mrgCtx.mvFieldNeighbours[(count << 1) + 0].mv;
......
......@@ -365,7 +365,7 @@ static void simdFilter5x5Blk( AlfClassifier** classifier, const PelUnitBuf &recD
const int clsSizeY = 4;
const int clsSizeX = 4;
bool pcmFlags2x2[4] = {0,0,0,0};
Pel pcmRec2x2[16];
......@@ -430,16 +430,16 @@ static void simdFilter5x5Blk( AlfClassifier** classifier, const PelUnitBuf &recD
// check which chroma 2x2 blocks use PCM
// chroma PCM may not be aligned with 4x4 ALF processing grid
for( blkY=0; blkY<4; blkY+=2 )
for( blkY=0; blkY<4; blkY+=2 )
{
for( blkX=0; blkX<4; blkX+=2 )
for( blkX=0; blkX<4; blkX+=2 )
{
Position pos(j+startWidth+blkX, i+startHeight+blkY);
CodingUnit* cu = isDualTree ? cs.getCU(pos, CH_C) : cs.getCU(recalcPosition(nChromaFormat, CH_C, CH_L, pos), CH_L);
*flags++ = cu->ipcm ? 1 : 0;
// save original samples from 2x2 PCM blocks
if( cu->ipcm )
if( cu->ipcm )
{
*pcmRec++ = pRec[(blkY+0)*dstStride + (blkX+0)];
*pcmRec++ = pRec[(blkY+0)*dstStride + (blkX+1)];
......@@ -573,18 +573,18 @@ static void simdFilter5x5Blk( AlfClassifier** classifier, const PelUnitBuf &recD
} //<-- end of k-loop
pRec -= ( 4 * dstStride );
// restore 2x2 PCM chroma blocks
if( bChroma && isPCMFilterDisabled )
{
int blkX, blkY;
bool *flags = pcmFlags2x2;
Pel *pcmRec = pcmRec2x2;
for( blkY=0; blkY<4; blkY+=2 )
for( blkY=0; blkY<4; blkY+=2 )
{
for( blkX=0; blkX<4; blkX+=2 )
for( blkX=0; blkX<4; blkX+=2 )
{
if( *flags++ )
if( *flags++ )
{
pRec[(blkY+0)*dstStride + (blkX+0)] = *pcmRec++;
pRec[(blkY+0)*dstStride + (blkX+1)] = *pcmRec++;
......@@ -665,7 +665,7 @@ static void simdFilter7x7Blk( AlfClassifier** classifier, const PelUnitBuf &recD
const int clsSizeY = 4;
const int clsSizeX = 4;
bool pcmFlags2x2[4] = {0,0,0,0};
Pel pcmRec2x2[16];
......@@ -740,7 +740,7 @@ static void simdFilter7x7Blk( AlfClassifier** classifier, const PelUnitBuf &recD
*flags++ = cu->ipcm ? 1 : 0;
// save original samples from 2x2 PCM blocks
if( cu->ipcm )
if( cu->ipcm )
{
*pcmRec++ = pRec[(blkY+0)*dstStride + (blkX+0)];
*pcmRec++ = pRec[(blkY+0)*dstStride + (blkX+1)];
......@@ -892,7 +892,7 @@ static void simdFilter7x7Blk( AlfClassifier** classifier, const PelUnitBuf &recD
}
pRec -= ( 4 * dstStride );
// restore 2x2 PCM chroma blocks
if( bChroma && isPCMFilterDisabled )
{
......@@ -903,7 +903,7 @@ static void simdFilter7x7Blk( AlfClassifier** classifier, const PelUnitBuf &recD
{
for( blkX=0; blkX<4; blkX+=2 )
{
if( *flags++ )
if( *flags++ )
{
pRec[(blkY+0)*dstStride + (blkX+0)] = *pcmRec++;
pRec[(blkY+0)*dstStride + (blkX+1)] = *pcmRec++;
......
......@@ -1131,12 +1131,12 @@ static void simdFilter( const ClpRng& clpRng, Pel const *src, int srcStride, Pel
#if JVET_M0147_DMVR
if (biMCForDMVR)
{
if( isFirst )
if( isFirst )
{
shift = IF_FILTER_PREC_BILINEAR - (IF_INTERNAL_PREC_BILINEAR - clpRng.bd);
offset = 1 << (shift - 1);
}
else
else
{
shift = 4;
offset = 1 << (shift - 1);
......
......@@ -1668,7 +1668,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
READ_FLAG(uiCode, "tile_group_alf_enabled_flag");
if (uiCode)
{
READ_CODE(5, uiCode, "tile_group_aps_id");
READ_CODE(5, uiCode, "tile_group_aps_id");
pcSlice->setAPSId(uiCode);
pcSlice->setAPS(parameterSetManager->getAPS(uiCode));
pcSlice->setTileGroupAlfEnabledFlag(true);
......
......@@ -2772,7 +2772,7 @@ void EncCu::xCheckRDCostMergeTriangle2Nx2N( CodingStructure *&tempCS, CodingStru
tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
return;
}
#endif
#endif
m_pcInterSearch->motionCompensation( pu, triangleBuffer[mergeCand] );
}
}
......@@ -4228,7 +4228,7 @@ bool EncCu::xCheckRDCostInterIMV( CodingStructure *&tempCS, CodingStructure *&be
#endif
}
#if JVET_M0445_MCTS
#if JVET_M0445_MCTS
if( m_pcEncCfg->getMCTSEncConstraint() && ( ( cu.firstPU->refIdx[L0] < 0 && cu.firstPU->refIdx[L1] < 0 ) || ( !( MCTSHelper::checkMvBufferForMCTSConstraint( *cu.firstPU ) ) ) ) )
{
// Do not use this mode
......
......@@ -410,7 +410,7 @@ static bool verifyPlane(Pel* dst,
{
const uint32_t csx =getComponentScaleX(compID, cFormat);
const uint32_t csy =getComponentScaleY(compID, cFormat);
#if EXTENSION_360_VIDEO
const uint32_t stride = stride444;
#else
......@@ -418,11 +418,11 @@ static bool verifyPlane(Pel* dst,
#endif
const uint32_t fullWidth = (width444 + padX444) >> csx;
const uint32_t fullHeight = (height444 +padY444) >> csy;
Pel *dstBuf = dst;
const Pel mask = ~((1 << bitDepth) - 1);
for (uint32_t y = 0; y < fullHeight; y++, dstBuf+= stride)
{
for (uint32_t x = 0; x < fullWidth; x++)
......@@ -433,7 +433,7 @@ static bool verifyPlane(Pel* dst,
}
}
}
return true;
}
......@@ -885,7 +885,7 @@ bool VideoIOYuv::read ( PelUnitBuf& pic, PelUnitBuf& picOrg, const InputColourSp
{
return false;
}
if (! verifyPlane( dst, stride444, width444, height444, pad_h444, pad_v444, compID, format, m_fileBitdepth[chType]) )
{
EXIT("Source image contains values outside the specified bit range!");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment