@ -3,7 +3,6 @@
using System ; using System ;
using System.Runtime.CompilerServices ; using System.Runtime.CompilerServices ;
using System.Runtime.InteropServices ;
using SixLabors.ImageSharp.Advanced ; using SixLabors.ImageSharp.Advanced ;
using SixLabors.ImageSharp.Memory ; using SixLabors.ImageSharp.Memory ;
using SixLabors.ImageSharp.PixelFormats ; using SixLabors.ImageSharp.PixelFormats ;
@ -27,70 +26,33 @@ namespace SixLabors.ImageSharp.Processing.Processors.Binarization
/// <param name="sourceRectangle">The source area to process for the current processor instance.</param>
/// <param name="sourceRectangle">The source area to process for the current processor instance.</param>
public AdaptiveThresholdProcessor ( Configuration configuration , AdaptiveThresholdProcessor definition , Image < TPixel > source , Rectangle sourceRectangle ) public AdaptiveThresholdProcessor ( Configuration configuration , AdaptiveThresholdProcessor definition , Image < TPixel > source , Rectangle sourceRectangle )
: base ( configuration , source , sourceRectangle ) : base ( configuration , source , sourceRectangle )
{ = > this . definition = definition ;
this . definition = definition ;
}
/// <inheritdoc/>
/// <inheritdoc/>
protected override void OnFrameApply ( ImageFrame < TPixel > source ) protected override void OnFrameApply ( ImageFrame < TPixel > source )
{ {
var intersec t = Rectangle . Intersect ( this . SourceRectangle , source . Bounds ( ) ) ; var interes t = Rectangle . Intersect ( this . SourceRectangle , source . Bounds ( ) ) ;
Configuration configuration = this . Configuration ; Configuration configuration = this . Configuration ;
TPixel upper = this . definition . Upper . ToPixel < TPixel > ( ) ; TPixel upper = this . definition . Upper . ToPixel < TPixel > ( ) ;
TPixel lower = this . definition . Lower . ToPixel < TPixel > ( ) ; TPixel lower = this . definition . Lower . ToPixel < TPixel > ( ) ;
float thresholdLimit = this . definition . ThresholdLimit ; float thresholdLimit = this . definition . ThresholdLimit ;
int startY = intersect . Y ; // ClusterSize defines the size of cluster to used to check for average.
int endY = intersect . Bottom ; // Tweaked to support up to 4k wide pixels and not more. 4096 / 16 is 256 thus the '-1'
int startX = intersect . X ; byte clusterSize = ( byte ) Math . Clamp ( interest . Width / 1 6F , 0 , 2 5 5 ) ;
int endX = intersect . Right ;
int width = intersect . Width ;
int height = intersect . Height ;
// ClusterSize defines the size of cluster to used to check for average. Tweaked to support up to 4k wide pixels and not more. 4096 / 16 is 256 thus the '-1'
byte clusterSize = ( byte ) Math . Truncate ( ( width / 1 6f ) - 1 ) ;
Buffer2D < TPixel > sourceBuffer = source . PixelBuffer ; using Buffer2D < ulong > intImage = source . CalculateIntegralImage ( interest ) ;
RowOperation operation = new ( configuration , interest , source . PixelBuffer , intImage , upper , lower , thresholdLimit , clusterSize ) ;
// Using pooled 2d buffer for integer image table and temp memory to hold Rgb24 converted pixel data.
ParallelRowIterator . IterateRows < RowOperation , L8 > (
using ( Buffer2D < ulong > intImage = this . Configuration . MemoryAllocator . Allocate2D < ulong > ( width , height ) ) configuration ,
{ interest ,
Rgba32 rgb = default ; in operation ) ;
for ( int x = startX ; x < endX ; x + + )
{
ulong sum = 0 ;
for ( int y = startY ; y < endY ; y + + )
{
Span < TPixel > row = sourceBuffer . DangerousGetRowSpan ( y ) ;
ref TPixel rowRef = ref MemoryMarshal . GetReference ( row ) ;
ref TPixel color = ref Unsafe . Add ( ref rowRef , x ) ;
color . ToRgba32 ( ref rgb ) ;
sum + = ( ulong ) ( rgb . R + rgb . G + rgb . B ) ;
if ( x - startX ! = 0 )
{
intImage [ x - startX , y - startY ] = intImage [ x - startX - 1 , y - startY ] + sum ;
}
else
{
intImage [ x - startX , y - startY ] = sum ;
}
}
}
var operation = new RowOperation ( intersect , source . PixelBuffer , intImage , upper , lower , thresholdLimit , clusterSize , startX , endX , startY ) ;
ParallelRowIterator . IterateRows (
configuration ,
intersect ,
in operation ) ;
}
} }
private readonly struct RowOperation : IRowOperation private readonly struct RowOperation : IRowOperation < L8 >
{ {
private readonly Configuration configuration ;
private readonly Rectangle bounds ; private readonly Rectangle bounds ;
private readonly Buffer2D < TPixel > source ; private readonly Buffer2D < TPixel > source ;
private readonly Buffer2D < ulong > intImage ; private readonly Buffer2D < ulong > intImage ;
@ -98,62 +60,58 @@ namespace SixLabors.ImageSharp.Processing.Processors.Binarization
private readonly TPixel lower ; private readonly TPixel lower ;
private readonly float thresholdLimit ; private readonly float thresholdLimit ;
private readonly int startX ; private readonly int startX ;
private readonly int endX ;
private readonly int startY ; private readonly int startY ;
private readonly byte clusterSize ; private readonly byte clusterSize ;
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]
public RowOperation ( public RowOperation (
Configuration configuration ,
Rectangle bounds , Rectangle bounds ,
Buffer2D < TPixel > source , Buffer2D < TPixel > source ,
Buffer2D < ulong > intImage , Buffer2D < ulong > intImage ,
TPixel upper , TPixel upper ,
TPixel lower , TPixel lower ,
float thresholdLimit , float thresholdLimit ,
byte clusterSize , byte clusterSize )
int startX ,
int endX ,
int startY )
{ {
this . configuration = configuration ;
this . bounds = bounds ; this . bounds = bounds ;
this . startX = bounds . X ;
this . startY = bounds . Y ;
this . source = source ; this . source = source ;
this . intImage = intImage ; this . intImage = intImage ;
this . upper = upper ; this . upper = upper ;
this . lower = lower ; this . lower = lower ;
this . thresholdLimit = thresholdLimit ; this . thresholdLimit = thresholdLimit ;
this . startX = startX ;
this . endX = endX ;
this . startY = startY ;
this . clusterSize = clusterSize ; this . clusterSize = clusterSize ;
} }
/// <inheritdoc/>
/// <inheritdoc/>
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]
public void Invoke ( int y ) public void Invoke ( int y , Span < L8 > span )
{ {
Rgba32 rgb = default ; Span < TPixel > rowSpan = this . source . DangerousGetRowSpan ( y ) . Slice ( this . startX , span . Length ) ;
Span < TPixel > pixelRow = this . source . DangerousGetRowSpan ( y ) ; PixelOperations < TPixel > . Instance . ToL8 ( this . configuration , rowSpan , span ) ;
for ( int x = this . startX ; x < this . endX ; x + + ) int maxX = this . bounds . Width - 1 ;
int maxY = this . bounds . Height - 1 ;
for ( int x = 0 ; x < rowSpan . Length ; x + + )
{ {
TPixel pixel = pixelRow [ x ] ; int x1 = Math . Clamp ( x - this . clusterSize + 1 , 0 , maxX ) ;
pixel . ToRgba32 ( ref rgb ) ; int x2 = Math . Min ( x + this . clusterSize + 1 , maxX ) ;
int y1 = Math . Clamp ( y - this . startY - this . clusterSize + 1 , 0 , maxY ) ;
var x1 = Math . Max ( x - this . startX - this . clusterSize + 1 , 0 ) ; int y2 = Math . Min ( y - this . startY + this . clusterSize + 1 , maxY ) ;
var x2 = Math . Min ( x - this . startX + this . clusterSize + 1 , this . bounds . Width - 1 ) ;
var y1 = Math . Max ( y - this . startY - this . clusterSize + 1 , 0 ) ;
var y2 = Math . Min ( y - this . startY + this . clusterSize + 1 , this . bounds . Height - 1 ) ;
var count = ( uint ) ( ( x2 - x1 ) * ( y2 - y1 ) ) ; uint count = ( uint ) ( ( x2 - x1 ) * ( y2 - y1 ) ) ;
var sum = ( long ) Math . Min ( this . intImage [ x2 , y2 ] - this . intImage [ x1 , y2 ] - this . intImage [ x2 , y1 ] + this . intImage [ x1 , y1 ] , long . MaxValue ) ; ulong sum = Math . Min ( this . intImage [ x2 , y2 ] - this . intImage [ x1 , y2 ] - this . intImage [ x2 , y1 ] + this . intImage [ x1 , y1 ] , ulong . MaxValue ) ;
if ( ( rgb . R + rgb . G + rgb . B ) * count < = sum * this . thresholdLimit ) if ( span [ x ] . PackedValue * count < = sum * this . thresholdLimit )
{ {
this . source [ x , y ] = this . lower ; rowSpan [ x ] = this . lower ;
} }
else else
{ {
this . source [ x , y ] = this . upper ; rowSpan [ x ] = this . upper ;
} }
} }
} }
James Jackson-South
4 years ago
GitHub
