git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 20:14:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine image: ++optimization

Browse source 
apply fast track to fast up the image rasterization.

only shifted image doesn't need to have the matrix-transform computation,
we can avoid it by just shifting offset xy by simple caculating.

@Issue: https://github.com/Samsung/thorvg/issues/206
This commit is contained in:
Hermet Park 2021-11-15 14:47:11 +09:00 • committed by Hermet Park
parent 0fcdba8a4b
commit c9377708a9
3 changed files with 72 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/sw_engine/tvgSwCommon.h
View file

@ -224,6 +224,11 @@ struct SwImage
SwRleData* rle = nullptr;
uint32_t* data = nullptr;
uint32_t w, h, stride;
int32_t x = 0; //shift x
int32_t y = 0; //shift y
float scale;
bool transformed = false;
};
struct SwBlender

27
src/lib/sw_engine/tvgSwImage.cpp
View file

@ -67,6 +67,13 @@ static bool _genOutline(SwImage* image, const Matrix* transform, SwMpool* mpool,
}
static inline bool _onlyShifted(const Matrix* m)
{
if (mathEqual(m->e11, 1.0f) && mathEqual(m->e22, 1.0f) && mathZero(m->e12) && mathZero(m->e21)) return true;
return false;
}
/************************************************************************/
/* External Class Implementation */
/************************************************************************/
@ -74,8 +81,26 @@ static bool _genOutline(SwImage* image, const Matrix* transform, SwMpool* mpool,
bool imagePrepare(SwImage* image, const Matrix* transform, const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid)
{
image->transformed = !_onlyShifted(transform);
bool fastTrack;
//Figure out the scale factor by transform matrix
if (image->transformed) {
auto scaleX = sqrtf((transform->e11 * transform->e11) + (transform->e21 * transform->e21));
auto scaleY = sqrtf((transform->e22 * transform->e22) + (transform->e12 * transform->e12));
//TODO:If the x and y axis scale is different, a separate interpolation algorithm for each axis should be applied.
image->scale = (fabsf(scaleX - scaleY) > 0.01f) ? 1.0f : scaleX;
fastTrack = false;
//Fast track: Non-transformed image but just shifted.
} else {
image->scale = 1.0f;
image->x = -static_cast<uint32_t>(round(transform->e13));
image->y = -static_cast<uint32_t>(round(transform->e23));
fastTrack = true;
}
if (!_genOutline(image, transform, mpool, tid)) return false;
return mathUpdateOutlineBBox(image->outline, clipRegion, renderRegion, false);
return mathUpdateOutlineBBox(image->outline, clipRegion, renderRegion, fastTrack);
}

87
src/lib/sw_engine/tvgSwRaster.cpp
View file

@ -243,11 +243,11 @@ static bool _translucentImageRle(SwSurface* surface, const SwImage* image, uint3
for (uint32_t i = 0; i < image->rle->size; ++i, ++span) {
auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto src = image->data + span->x + span->y * image->stride;
auto img = image->data + (span->y + image->y) * image->stride + (span->x + image->x);
auto alpha = ALPHA_MULTIPLY(span->coverage, opacity);
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++src) {
*src = ALPHA_BLEND(*src, alpha);
*dst = *src + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(*src));
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img) {
auto src = ALPHA_BLEND(*img, alpha);
*dst = src + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(src));
}
}
return true;
@ -259,22 +259,21 @@ static bool _translucentImageRleMask(SwSurface* surface, const SwImage* image, u
TVGLOG("SW_ENGINE", "Image Rle Alpha Mask / Inverse Alpha Mask Composition");
auto span = image->rle->spans;
auto img = image->data;
auto cbuffer = surface->compositor->image.data;
for (uint32_t i = 0; i < image->rle->size; ++i, ++span) {
auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto cmp = &cbuffer[span->y * surface->stride + span->x];
auto src = img + span->y * image->stride + span->x;
auto img = image->data + (span->y + image->y) * image->stride + (span->x + image->x);
auto alpha = ALPHA_MULTIPLY(span->coverage, opacity);
if (alpha == 255) {
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
auto tmp = ALPHA_BLEND(*src, blendMethod(*cmp));
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++img) {
auto tmp = ALPHA_BLEND(*img, blendMethod(*cmp));
*dst = tmp + ALPHA_BLEND(*dst, surface->blender.ialpha(tmp));
}
} else {
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
auto tmp = ALPHA_BLEND(*src, ALPHA_MULTIPLY(alpha, blendMethod(*cmp)));
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++img) {
auto tmp = ALPHA_BLEND(*img, ALPHA_MULTIPLY(alpha, blendMethod(*cmp)));
*dst = tmp + ALPHA_BLEND(*dst, surface->blender.ialpha(tmp));
}
}
@ -554,10 +553,16 @@ static bool _rasterImageRle(SwSurface* surface, const SwImage* image)
for (uint32_t i = 0; i < image->rle->size; ++i, ++span) {
auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto src = image->data + span->x + span->y * image->stride;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++src) {
*src = ALPHA_BLEND(*src, span->coverage);
*dst = *src + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(*src));
auto img = image->data + (span->y + image->y) * image->stride + (span->x + image->x);
if (span->coverage == 255) {
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img) {
*dst = *img;
}
} else {
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img) {
auto src = ALPHA_BLEND(*img, span->coverage);
*dst = src + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(src));
}
}
}
return true;
@ -858,7 +863,7 @@ static bool _rasterTranslucentDownScaleImage(SwSurface* surface, const SwImage*
static bool _translucentImage(SwSurface* surface, const SwImage* image, uint32_t opacity, const SwBBox& region)
{
auto dbuffer = &surface->buffer[region.min.y * surface->stride + region.min.x];
auto sbuffer = image->data + region.min.x + region.min.y * image->stride;
auto sbuffer = image->data + (region.min.y + image->y) * image->stride + (region.min.x + image->x);
for (auto y = region.min.y; y < region.max.y; ++y) {
auto dst = dbuffer;
@ -882,7 +887,7 @@ static bool _translucentImageMask(SwSurface* surface, const SwImage* image, uint
TVGLOG("SW_ENGINE", "Image Alpha Mask / Inverse Alpha Mask Composition");
auto sbuffer = image->data + (region.min.y * image->w) + region.min.x;
auto sbuffer = image->data + (region.min.y + image->y) * image->stride + (region.min.x + image->x);
auto cbuffer = surface->compositor->image.data + (region.min.y * surface->stride) + region.min.x; //compositor buffer
for (uint32_t y = 0; y < h2; ++y) {
@ -918,7 +923,7 @@ static bool _rasterTranslucentImage(SwSurface* surface, const SwImage* image, ui
static bool _rasterImage(SwSurface* surface, const SwImage* image, const SwBBox& region)
{
auto dbuffer = &surface->buffer[region.min.y * surface->stride + region.min.x];
auto sbuffer = image->data + region.min.x + region.min.y * image->stride;
auto sbuffer = image->data + (region.min.y + image->y) * image->stride + (region.min.x + image->x);
for (auto y = region.min.y; y < region.max.y; ++y) {
auto dst = dbuffer;
@ -1532,57 +1537,47 @@ void rasterUnpremultiply(SwSurface* surface)
bool rasterImage(SwSurface* surface, SwImage* image, const Matrix* transform, const SwBBox& bbox, uint32_t opacity)
{
Matrix itransform;
auto scale = 1.0f;
bool transformed = false;
static constexpr float DOWN_SCALE_TOLERANCE = 0.5f;
//Figure out the scale factor by transform matrix
if (transform) {
if (!mathInverse(transform, &itransform)) return false;
scale = sqrtf((transform->e11 * transform->e11) + (transform->e21 * transform->e21));
auto scaleY = sqrtf((transform->e22 * transform->e22) + (transform->e12 * transform->e12));
//TODO:If the x and y axis scale is different, a separate interpolation algorithm for each axis should be applied.
if (fabsf(scale - scaleY) > 0.01f) scale = 1.0f;
if (!mathIdentity(transform)) transformed = true;
} else mathIdentity(&itransform);
uint32_t halfScale = static_cast<uint32_t>(0.5f / image->scale);
if (halfScale == 0) halfScale = 1;
auto translucent = _translucent(surface, opacity);
auto downScaleTolerance = 0.5f;
auto halfScale = static_cast<uint32_t>(0.5f / scale);
if (halfScale == 0) halfScale = 1;
//Clipped Image
if (image->rle) {
if (transformed) {
if (image->transformed) {
Matrix itransform;
if (!mathInverse(transform, &itransform)) return false;
if (translucent) {
if (mathEqual(scale, 1.0f)) return _rasterTranslucentImageRle(surface, image, opacity, &itransform);
else if (scale < downScaleTolerance) return _rasterTranslucentDownScaleImageRle(surface, image, opacity, &itransform, halfScale);
if (mathEqual(image->scale, 1.0f)) return _rasterTranslucentImageRle(surface, image, opacity, &itransform);
else if (image->scale < DOWN_SCALE_TOLERANCE) return _rasterTranslucentDownScaleImageRle(surface, image, opacity, &itransform, halfScale);
else return _rasterTranslucentUpScaleImageRle(surface, image, opacity, &itransform);
} else {
if (mathEqual(scale, 1.0f)) return _rasterImageRle(surface, image, &itransform);
else if (scale < downScaleTolerance) return _rasterDownScaleImageRle(surface, image, &itransform, halfScale);
if (mathEqual(image->scale, 1.0f)) return _rasterImageRle(surface, image, &itransform);
else if (image->scale < DOWN_SCALE_TOLERANCE) return _rasterDownScaleImageRle(surface, image, &itransform, halfScale);
else return _rasterUpScaleImageRle(surface, image, &itransform);
}
//Fast track
//OPTIMIZE ME: Support non transformed image. Only shifted image can use these routines.
//Fast track: Only shifted image can go into this routine.
} else {
if (translucent) return _rasterTranslucentImageRle(surface, image, opacity);
return _rasterImageRle(surface, image);
}
//Whole Image
} else {
if (transformed) {
if (image->transformed) {
Matrix itransform;
if (!mathInverse(transform, &itransform)) return false;
if (translucent) {
if (mathEqual(scale, 1.0f)) return _rasterTranslucentImage(surface, image, opacity, bbox, &itransform);
else if (scale < downScaleTolerance) return _rasterTranslucentDownScaleImage(surface, image, opacity, bbox, &itransform, halfScale);
if (mathEqual(image->scale, 1.0f)) return _rasterTranslucentImage(surface, image, opacity, bbox, &itransform);
else if (image->scale < DOWN_SCALE_TOLERANCE) return _rasterTranslucentDownScaleImage(surface, image, opacity, bbox, &itransform, halfScale);
else return _rasterTranslucentUpScaleImage(surface, image, opacity, bbox, &itransform);
} else {
if (mathEqual(scale, 1.0f)) return _rasterImage(surface, image, bbox, &itransform);
else if (scale < downScaleTolerance) return _rasterDownScaleImage(surface, image, bbox, &itransform, halfScale);
if (mathEqual(image->scale, 1.0f)) return _rasterImage(surface, image, bbox, &itransform);
else if (image->scale < DOWN_SCALE_TOLERANCE) return _rasterDownScaleImage(surface, image, bbox, &itransform, halfScale);
else return _rasterUpScaleImage(surface, image, bbox, &itransform);
}
//Fast track
//OPTIMIZE ME: Support non transformed image. Only shifted image can use these routines.
//Fast track: Only shifted image can go into this routine.
} else {
if (translucent) return _rasterTranslucentImage(surface, image, opacity, bbox);
return _rasterImage(surface, image, bbox);