Skip to content
Snippets Groups Projects
Commit 74868f8a authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Merge branch 'clean24' into 'master'

Fix formatting: braces, spaces, indentation

See merge request !1824
parents 1650a14c 81d36e32
No related branches found
No related tags found
No related merge requests found
...@@ -506,19 +506,21 @@ void InterpolationFilter::filterCopy( const ClpRng& clpRng, const Pel *src, int ...@@ -506,19 +506,21 @@ void InterpolationFilter::filterCopy( const ClpRng& clpRng, const Pel *src, int
} }
} }
else else
for (row = 0; row < height; row++)
{ {
for (col = 0; col < width; col++) for (row = 0; row < height; row++)
{ {
Pel val = src[ col ]; for (col = 0; col < width; col++)
val = rightShift_round((val + IF_INTERNAL_OFFS), shift); {
Pel val = src[col];
val = rightShift_round((val + IF_INTERNAL_OFFS), shift);
dst[col] = ClipPel( val, clpRng ); dst[col] = ClipPel(val, clpRng);
JVET_J0090_CACHE_ACCESS( &src[col], __FILE__, __LINE__ ); JVET_J0090_CACHE_ACCESS(&src[col], __FILE__, __LINE__);
} }
src += srcStride; src += srcStride;
dst += dstStride; dst += dstStride;
}
} }
} }
} }
...@@ -790,7 +792,6 @@ void InterpolationFilter::filterHor(const ComponentID compID, Pel const *src, in ...@@ -790,7 +792,6 @@ void InterpolationFilter::filterHor(const ComponentID compID, Pel const *src, in
else else
{ {
filterHor<NTAPS_LUMA>( clpRng, src, srcStride, dst, dstStride, width, height, isLast, m_lumaFilter[frac], biMCForDMVR ); filterHor<NTAPS_LUMA>( clpRng, src, srcStride, dst, dstStride, width, height, isLast, m_lumaFilter[frac], biMCForDMVR );
} }
} }
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment