Png chunk reader codec bitmap

binding/Binding/SKBitmap.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.IO;
+using System.Threading;
 
 namespace SkiaSharp
 {
@@ -37,8 +38,6 @@ public static SKFilterQuality ToFilterQuality (this SKBitmapResizeMethod method)
 	}
 
 	// TODO: keep in mind SKBitmap may be going away (according to Google)
-	// TODO: `ComputeIsOpaque` may be useful
-	// TODO: `GenerationID` may be useful
 	// TODO: `GetAddr` and `GetPixel` are confusing
 
 	public unsafe class SKBitmap : SKObject, ISKSkipObjectRegistration
@@ -115,6 +114,56 @@ protected override void Dispose (bool disposing) =>
 		protected override void DisposeNative () =>
 			SkiaApi.sk_bitmap_destructor (Handle);
 
+		// Other
+
+		public bool SetInfo(SKImageInfo info)
+		{
+			// bool 	setInfo (const SkImageInfo &imageInfo, size_t rowBytes=0)
+			return SetInfo(info, 0);
+		}
+
+		public bool SetInfo(SKImageInfo info, int rowBytes)
+		{
+			var cinfo = SKImageInfoNative.FromManaged(ref info);
+			return SkiaApi.sk_bitmap_set_info(Handle, &cinfo, (IntPtr)rowBytes);
+		}
+
+		public bool ComputeIsOpaque()
+		{
+			return SkiaApi.sk_bitmap_compute_is_opaque(Handle);
+		}
+
+		// AllocPixels
+
+		public void AllocPixels(SKImageInfo info)
+		{
+			AllocPixels(info, info.RowBytes);
+		}
+
+		public void AllocPixels(SKImageInfo info, int rowBytes)
+		{
+			if (!TryAllocPixels(info, rowBytes))
+			{
+				SKImageInfo i = Info;
+				throw new OutOfMemoryException("SkBitmap::tryAllocPixels failed "
+					+ "ColorType:" + i.ColorType + "AlphaType:" + i.AlphaType +
+					"[w:" + i.Width + " h:" + i.Height + "] rb:" + RowBytes
+				);
+			}
+		}
+
+		public void AllocPixels(SKImageInfo info, SKBitmapAllocFlags flags)
+		{
+			if (!TryAllocPixels(info, flags))
+			{
+				SKImageInfo i = Info;
+				throw new OutOfMemoryException("SkBitmap::tryAllocPixels failed "
+					+ "ColorType:" + i.ColorType + "AlphaType:" + i.AlphaType +
+					"[w:" + i.Width + " h:" + i.Height + "] rb:" + RowBytes
+				);
+			}
+		}
+
 		// TryAllocPixels
 
 		public bool TryAllocPixels (SKImageInfo info)
@@ -317,6 +366,8 @@ public bool ExtractAlpha (SKBitmap destination, SKPaint paint, out SKPointI offs
 			}
 		}
 
+		public SKImage AsImage () => SKImage.FromBitmap (this);
+
 		// properties
 
 		public bool ReadyToDraw => SkiaApi.sk_bitmap_ready_to_draw (Handle);
@@ -361,6 +412,10 @@ public int ByteCount {
 			get { return (int)SkiaApi.sk_bitmap_get_byte_count (Handle); }
 		}
 
+		public uint GenerationId {
+			get { return (uint)SkiaApi.sk_bitmap_get_generation_id(Handle); }
+		}
+
 		// *Pixels*
 
 		public IntPtr GetPixels () =>
@@ -401,6 +456,14 @@ public void SetColorTable (SKColorTable ct)
 
 		// more properties
 
+		public SKPixmap Pixmap {
+			get {
+				var pixmap = new SKPixmap (SkiaApi.sk_bitmap_get_pixmap (Handle), false); // pixmap is owned by this
+				pixmap.pixelSource = this;
+				return pixmap;
+			}
+		}
+
 		public byte[] Bytes {
 			get {
 				var array = GetPixelSpan ().ToArray ();
@@ -723,6 +786,27 @@ public bool InstallPixels (SKImageInfo info, IntPtr pixels, int rowBytes, SKBitm
 			return SkiaApi.sk_bitmap_install_pixels (Handle, &cinfo, (void*)pixels, (IntPtr)rowBytes, proxy, (void*)ctx);
 		}
 
+		public bool ReadPixels (SKImageInfo info, IntPtr dstpixels, int rowBytes, int x, int y)
+		{
+			if (GetPixels() == null) return false;
+			return Pixmap.ReadPixels(info, dstPixels, rowBytes, x, y);
+		}
+
+		public bool ReadPixels(SKPixmap dstPixmap) => ReadPixels(dstPixmap, 0, 0);
+
+		public bool ReadPixels(SKPixmap pixmap, int x, int y)
+		{
+			if (GetPixels() == null) return false;
+    		return Pixmap.ReadPixels(dst.Info, dst.Pixels, dst.RowBytes, srcX, srcY);
+		}
+
+		public bool WritePixels(SKPixmap pixmap) => WritePixels(pixmap, 0, 0);
+
+		public bool WritePixels(SKPixmap dstPixmap, int x, int y)
+		{
+			return SkiaApi.sk_bitmap_write_pixels_at_location(Handle, dstPixmap.Handle, x, y);
+		}
+
 		public bool InstallPixels (SKPixmap pixmap)
 		{
 			return SkiaApi.sk_bitmap_install_pixels_with_pixmap (Handle, pixmap.Handle);

binding/Binding/SKCodec.cs

@@ -4,7 +4,6 @@
 
 namespace SkiaSharp
 {
-	// TODO: `Create(...)` should have overloads that accept a SKPngChunkReader
 	// TODO: missing the `QueryYuv8` and `GetYuv8Planes` members
 
 	public unsafe class SKCodec : SKObject, ISKSkipObjectRegistration
@@ -14,6 +13,25 @@ internal SKCodec (IntPtr handle, bool owns)
 		{
 		}
 
+		/// <summary>
+		/// For container formats that contain both still images and image sequences,
+		/// <br></br> instruct the decoder how the output should be selected. (Refer to comments
+		/// <br></br> for each value for more details.)
+		/// </summary>
+		public enum SelectionPolicy
+		{
+			/// <summary>
+			/// If the container format contains both still images and image sequences,
+			/// <br></br> SKCodec should choose one of the still images. This is the default.
+			/// </summary>
+			preferStillImage,
+			/// <summary>
+			/// If the container format contains both still images and image sequences,
+			/// <br></br> SKCodec should choose one of the image sequences for animation.
+			/// </summary>
+			preferAnimation
+		}
+
 		protected override void Dispose (bool disposing) =>
 			base.Dispose (disposing);
 
@@ -42,6 +60,13 @@ public SKImageInfo Info {
 		public SKEncodedImageFormat EncodedFormat =>
 			SkiaApi.sk_codec_get_encoded_format (Handle);
 
+		public SKSizeI Dimensions
+		{
+			get {
+				return Info.Size;
+			}
+		}
+
 		public SKSizeI GetScaledDimensions (float desiredScale)
 		{
 			SKSizeI dimensions;
@@ -282,48 +307,119 @@ public int GetOutputScanline (int inputScanline) =>
 		public static SKCodec Create (string filename) =>
 			Create (filename, out var result);
 
-		public static SKCodec Create (string filename, out SKCodecResult result)
+		public static SKCodec Create(string filename, SKPngChunkReader chunkReader) =>
+			Create(filename, out var result, chunkReader, SelectionPolicy.preferStillImage);
+
+		public static SKCodec Create(string filename, SelectionPolicy selectionPolicy) =>
+			Create(filename, out var result, null, selectionPolicy);
+
+		public static SKCodec Create(string filename, SKPngChunkReader chunkReader, SelectionPolicy selectionPolicy) =>
+			Create(filename, out var result, chunkReader, selectionPolicy);
+
+
+
+		public static SKCodec Create(string filename, out SKCodecResult result) =>
+			Create(filename, out result, null, SelectionPolicy.preferStillImage);
+
+		public static SKCodec Create(string filename, out SKCodecResult result, SKPngChunkReader chunkReader) =>
+			Create (filename, out result, chunkReader, SelectionPolicy.preferStillImage);
+
+		public static SKCodec Create(string filename, out SKCodecResult result, SelectionPolicy selectionPolicy) =>
+			Create (filename, out result, null, selectionPolicy);
+
+		public static SKCodec Create (string filename, out SKCodecResult result, SKPngChunkReader chunkReader, SelectionPolicy selectionPolicy)
 		{
 			var stream = SKFileStream.OpenStream (filename);
 			if (stream == null) {
 				result = SKCodecResult.InternalError;
 				return null;
 			}
 
-			return Create (stream, out result);
+			return Create (stream, out result, chunkReader, selectionPolicy);
 		}
 
+
+
 		public static SKCodec Create (Stream stream) =>
 			Create (stream, out var result);
 
+		public static SKCodec Create(Stream stream, SKPngChunkReader chunkReader) =>
+			Create(stream, out var result, chunkReader);
+
+		public static SKCodec Create(Stream stream, SelectionPolicy selectionPolicy) =>
+			Create(stream, out var result, selectionPolicy);
+
+		public static SKCodec Create(Stream stream, SKPngChunkReader chunkReader, SelectionPolicy selectionPolicy) =>
+			Create(stream, out var result, chunkReader, selectionPolicy);
+
+
+
 		public static SKCodec Create (Stream stream, out SKCodecResult result) =>
 			Create (WrapManagedStream (stream), out result);
 
+		public static SKCodec Create(Stream stream, out SKCodecResult result, SKPngChunkReader chunkReader) =>
+			Create(WrapManagedStream(stream), out result, chunkReader);
+
+		public static SKCodec Create(Stream stream, out SKCodecResult result, SelectionPolicy selectionPolicy) =>
+			Create(WrapManagedStream(stream), out result, selectionPolicy);
+
+		public static SKCodec Create(Stream stream, out SKCodecResult result, SKPngChunkReader chunkReader, SelectionPolicy selectionPolicy) =>
+			Create(WrapManagedStream(stream), out result, chunkReader, selectionPolicy);
+
+
+
 		public static SKCodec Create (SKStream stream) =>
 			Create (stream, out var result);
 
-		public static SKCodec Create (SKStream stream, out SKCodecResult result)
+		public static SKCodec Create(SKStream stream, SKPngChunkReader chunkReader) =>
+			Create(stream, out var result, chunkReader);
+
+		public static SKCodec Create(SKStream stream, SelectionPolicy selectionPolicy) =>
+			Create(stream, out var result, selectionPolicy);
+
+		public static SKCodec Create(SKStream stream, SKPngChunkReader chunkReader, SelectionPolicy selectionPolicy) =>
+			Create(stream, out var result, chunkReader, selectionPolicy);
+
+
+
+		public static SKCodec Create(SKStream stream, out SKCodecResult result) =>
+			Create(stream, out result, null);
+
+		public static SKCodec Create(SKStream stream, out SKCodecResult result, SKPngChunkReader chunkReader) =>
+			Create(stream, out result, chunkReader, SelectionPolicy.preferStillImage);
+
+		public static SKCodec Create(SKStream stream, out SKCodecResult result, SelectionPolicy selectionPolicy) =>
+			Create(stream, out result, null, selectionPolicy);
+
+		public static SKCodec Create(SKStream stream, out SKCodecResult result, SKPngChunkReader chunkReader, SelectionPolicy selectionPolicy)
 		{
 			if (stream == null)
-				throw new ArgumentNullException (nameof (stream));
+				throw new ArgumentNullException(nameof(stream));
 			if (stream is SKFileStream filestream && !filestream.IsValid)
-				throw new ArgumentException ("File stream was not valid.", nameof(stream));
+				throw new ArgumentException("File stream was not valid.", nameof(stream));
 
-			fixed (SKCodecResult* r = &result) {
-				var codec = GetObject (SkiaApi.sk_codec_new_from_stream (stream.Handle, r));
-				stream.RevokeOwnership (codec);
+			fixed (SKCodecResult* r = &result)
+			{
+				var codec = GetObject(SkiaApi.sk_codec_new_from_stream(stream.Handle, r, chunkReader == null ? IntPtr.Zero : chunkReader.Handle, (SKCodecSelectionPolicy)selectionPolicy));
+				stream.RevokeOwnership(codec);
 				return codec;
 			}
 		}
 
+
 		// create (data)
 
 		public static SKCodec Create (SKData data)
+		{
+			return Create(data, null);
+		}
+
+		public static SKCodec Create(SKData data, SKPngChunkReader chunkReader)
 		{
 			if (data == null)
-				throw new ArgumentNullException (nameof (data));
+				throw new ArgumentNullException(nameof(data));
 
-			return GetObject (SkiaApi.sk_codec_new_from_data (data.Handle));
+			return GetObject(SkiaApi.sk_codec_new_from_data(data.Handle, chunkReader == null ? IntPtr.Zero : chunkReader.Handle));
 		}
 
 		// utils