Skip to content

perf(image): remove per-pixel allocs + redundant merged-image copy (MAPCO-11321) #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shimoncohen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

perf(image): remove per-pixel allocs + redundant merged-image copy (MAPCO-11321) #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions MergerLogic/ImageProcessing/TileMerger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ public TileMerger(ITileScaler tileScaler, ILogger<TileMerger> logger)
}

this._logger.LogDebug($"[{MethodBase.GetCurrentMethod()?.Name}] {imageCollection.Count} where found for merge, start 'imageMagic' merging");
using (var mergedImage = imageCollection.Flatten(MagickColor.FromRgba(0, 0, 0, 0)))
{
ImageFormatter.RemoveImageDateAttributes(mergedImage);

mergedImage.ColorSpace = ColorSpace.sRGB;
mergedImage.ColorType = mergedImage.HasAlpha ? ColorType.TrueColorAlpha : ColorType.TrueColor;
image = new MagickImage(mergedImage);
this._logger.LogDebug($"[{MethodBase.GetCurrentMethod()?.Name}] 'imageMagic' merging finished");
}
// Flatten returns an image independent of the collection, so it outlives the
// collection's disposal without an extra full-image copy.
IMagickImage<byte> mergedImage = imageCollection.Flatten(MagickColor.FromRgba(0, 0, 0, 0))!;
ImageFormatter.RemoveImageDateAttributes(mergedImage);

mergedImage.ColorSpace = ColorSpace.sRGB;
mergedImage.ColorType = mergedImage.HasAlpha ? ColorType.TrueColorAlpha : ColorType.TrueColor;
image = mergedImage;
this._logger.LogDebug($"[{MethodBase.GetCurrentMethod()?.Name}] 'imageMagic' merging finished");
}
break;
}
Expand Down
8 changes: 6 additions & 2 deletions MergerLogic/ImageProcessing/TileScaler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,16 @@ public TileScaler(IMetricsProvider metricsProvider, ILogger<TileScaler> logger)
int maxRowOffset = TILE_SIZE * scaledChannels;
int pixelRowBytes = TILE_SIZE * channels;

// Read the whole source pixel buffer once instead of allocating a byte[] per source pixel.
var srcValues = srcPixels.GetValues()!;
int srcStride = baseImage.Width * channels;

//loop relevant source pixels
for (int i = pixelX; i < maxSrcX; i++)
{
for (int j = pixelY; j < maxSrcY; j++)
{
var srcPixel = srcPixels.GetValue(i, j);
int srcPixelIdx = (j * srcStride) + (i * channels);
var targetXStart = (i - pixelX) * scale;
var targetYStart = (j - pixelY) * scale;
var targetPixelIdxStart = (targetXStart + (TILE_SIZE * targetYStart)) * channels;
Expand All @@ -99,7 +103,7 @@ public TileScaler(IMetricsProvider metricsProvider, ILogger<TileScaler> logger)
for (int pixelRowOffset = 0; pixelRowOffset < maxRowOffset; pixelRowOffset += pixelRowBytes)
{
int pixelIdx = targetPixelIdxStart + pixelColOffset + pixelRowOffset;
srcPixel!.CopyTo(pixels, pixelIdx); //copy all channels
Array.Copy(srcValues, srcPixelIdx, pixels, pixelIdx, channels); //copy all channels
}
}
}
Expand Down
Loading