tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Encode444 using YCbCrForwardConverter<TPixel>

pull/475/head
Anton Firszov 8 years ago
parent
be325d823c
commit
bcd33b608e
1 changed files with 39 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs

86
src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
View File

@ -232,10 +232,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
this.WriteDefineHuffmanTables(componentCount); this.WriteDefineHuffmanTables(componentCount);
// Write the image data. // Write the image data.
using (PixelAccessor<TPixel> pixels = image.Lock()) this.WriteStartOfScan(image);
{
this.WriteStartOfScan(pixels);
}
// Write the End Of Image marker. // Write the End Of Image marker.
this.buffer[0] = OrigJpegConstants.Markers.XFF; this.buffer[0] = OrigJpegConstants.Markers.XFF;
@ -439,14 +436,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
/// </summary> /// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam> /// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="pixels">The pixel accessor providing access to the image pixels.</param> /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
private void Encode444<TPixel>(PixelAccessor<TPixel> pixels) private void Encode444<TPixel>(Image<TPixel> pixels)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
// TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.) // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
Block8x8F b = default(Block8x8F); // (Partially done with YCbCrForwardConverter<TPixel>)
Block8x8F cb = default(Block8x8F);
Block8x8F cr = default(Block8x8F);
Block8x8F temp1 = default(Block8x8F); Block8x8F temp1 = default(Block8x8F);
Block8x8F temp2 = default(Block8x8F); Block8x8F temp2 = default(Block8x8F);
@ -460,42 +454,36 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
YCbCrForwardConverter<TPixel> pixelConverter = YCbCrForwardConverter<TPixel>.Create(); YCbCrForwardConverter<TPixel> pixelConverter = YCbCrForwardConverter<TPixel>.Create();
fixed (RgbToYCbCrTables* tables = &rgbToYCbCrTables) for (int y = 0; y < pixels.Height; y += 8)
{ {
using (PixelArea<TPixel> rgbBytes = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz)) for (int x = 0; x < pixels.Width; x += 8)
{ {
for (int y = 0; y < pixels.Height; y += 8) pixelConverter.Convert(pixels.Frames.RootFrame, x, y);
{
for (int x = 0; x < pixels.Width; x += 8) prevDCY = this.WriteBlock(
{ QuantIndex.Luminance,
ToYCbCr(pixels, tables, x, y, ref b, ref cb, ref cr, rgbBytes); prevDCY,
&pixelConverter.Y,
prevDCY = this.WriteBlock( &temp1,
QuantIndex.Luminance, &temp2,
prevDCY, &onStackLuminanceQuantTable,
&b, unzig.Data);
&temp1, prevDCCb = this.WriteBlock(
&temp2, QuantIndex.Chrominance,
&onStackLuminanceQuantTable, prevDCCb,
unzig.Data); &pixelConverter.Cb,
prevDCCb = this.WriteBlock( &temp1,
QuantIndex.Chrominance, &temp2,
prevDCCb, &onStackChrominanceQuantTable,
&cb, unzig.Data);
&temp1, prevDCCr = this.WriteBlock(
&temp2, QuantIndex.Chrominance,
&onStackChrominanceQuantTable, prevDCCr,
unzig.Data); &pixelConverter.Cr,
prevDCCr = this.WriteBlock( &temp1,
QuantIndex.Chrominance, &temp2,
prevDCCr, &onStackChrominanceQuantTable,
&cr, unzig.Data);
&temp1,
&temp2,
&onStackChrominanceQuantTable,
unzig.Data);
}
}
} }
} }
} }
@ -866,8 +854,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
/// Writes the StartOfScan marker. /// Writes the StartOfScan marker.
/// </summary> /// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam> /// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="pixels">The pixel accessor providing access to the image pixels.</param> /// <param name="image">The pixel accessor providing access to the image pixels.</param>
private void WriteStartOfScan<TPixel>(PixelAccessor<TPixel> pixels) private void WriteStartOfScan<TPixel>(Image<TPixel> image)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
// TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.) // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
@ -877,10 +865,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
switch (this.subsample) switch (this.subsample)
{ {
case JpegSubsample.Ratio444: case JpegSubsample.Ratio444:
this.Encode444(pixels); this.Encode444(image);
break; break;
case JpegSubsample.Ratio420: case JpegSubsample.Ratio420:
this.Encode420(pixels); using (var pixels = image.Lock())
{
this.Encode420(pixels);
}
break; break;
} }

Write Preview
Loading…
Cancel
Save