pwm: Add gray8 -> gray4/2 conversion.

Author: freezy

LibDmd/Common/FrameUtil.cs

@@ -513,6 +513,20 @@ public static byte[] ConvertGrayToGray(byte[] srcFrame, params byte[] mapping)
 			}
 		}
 
+		public static byte[] ConvertGray8ToGray(byte[] srcFrame, int bitLength)
+		{
+			using (Profiler.Start("FrameUtil.ConvertGray8ToGray")) {
+				var numDestColors = Math.Pow(2, bitLength);
+				var factor = 256 / numDestColors;
+
+				var destFrame = new byte[srcFrame.Length];
+				for (var i = 0; i < destFrame.Length; i++) {
+					destFrame[i] = (byte)Math.Floor(srcFrame[i] / factor);
+				}
+				return destFrame;
+			}
+		}
+
 		public static byte[] NewPlane(Dimensions dim)
 		{
 			var count = dim.Width / 8 * dim.Height;

LibDmd/Frame/DmdFrame.cs

@@ -248,6 +248,8 @@ public DmdFrame ConvertToGray2()
 						return Update(FrameUtil.ConvertGrayToGray(Data, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3), 2);
 					case 6:
 						return Update(FrameUtil.ConvertGrayToGray(Data, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,  0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3), 2);
+					case 8:
+						return Update(FrameUtil.ConvertGray8ToGray(Data, 2), 2);
 					case 16:
 						return Update(ImageUtil.ConvertRgb565ToGray(Dimensions, Data, 4), 2);
 					case 24:
@@ -275,6 +277,8 @@ public DmdFrame ConvertToGray4()
 						throw new ArgumentException("Frame is already gray4.");
 					case 6:
 						return Update(FrameUtil.ConvertGrayToGray(Data, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x4, 0x4, 0x4, 0x4, 0x5, 0x5, 0x5, 0x5, 0x6, 0x6, 0x6, 0x6, 0x7, 0x7, 0x7, 0x7, 0x8, 0x8, 0x8, 0x8, 0x9, 0x9, 0x9, 0x9, 0xa, 0xa, 0xa, 0xa, 0xb, 0xb, 0xb, 0xb, 0xc, 0xc, 0xc, 0xc, 0xd, 0xd, 0xd, 0xd, 0xe, 0xe, 0xe, 0xe, 0xf, 0xf, 0xf, 0xf), 4);
+					case 8:
+						return Update(FrameUtil.ConvertGray8ToGray(Data, 4), 4);
 					case 16:
 						return Update(ImageUtil.ConvertRgb565ToGray(Dimensions, Data, 16), 4);
 					case 24:

LibDmd/RenderGraph.cs

@@ -588,11 +588,16 @@ public IDisposable StartRendering(Action onCompleted, Action<Exception> onError
 						Connect(Source, dest, FrameFormat.Gray8, FrameFormat.Rgb565);
 						continue;
 					}
-					// gray4 -> rgb24
+					// gray8 -> rgb24
 					if (sourceGray8 != null && destRgb24 != null) {
 						Connect(Source, dest, FrameFormat.Gray8, FrameFormat.Rgb24);
 						continue;
 					}
+					// gray8 -> bitmap
+					if (sourceGray8 != null && destBitmap != null) {
+						Connect(Source, dest, FrameFormat.Gray8, FrameFormat.Bitmap);
+						continue;
+					}
 					// rgb565 -> rgb24
 					if (sourceRgb565 != null && destRgb24 != null) {
 						Connect(Source, dest, FrameFormat.Rgb565, FrameFormat.Rgb24);
@@ -650,6 +655,16 @@ public IDisposable StartRendering(Action onCompleted, Action<Exception> onError
 						Connect(Source, dest, FrameFormat.Gray4, FrameFormat.Gray2);
 						continue;
 					}
+					// gray8 -> gray4
+					if (sourceGray8 != null && destGray4 != null) {
+						Connect(Source, dest, FrameFormat.Gray8, FrameFormat.Gray4);
+						continue;
+					}
+					// gray8 -> gray2
+					if (sourceGray8 != null && destGray2 != null) {
+						Connect(Source, dest, FrameFormat.Gray8, FrameFormat.Gray2);
+						continue;
+					}
 					// colored gray6 -> rgb565
 					if (sourceColoredGray6 != null && destRgb565 != null) {
 						Connect(Source, dest, FrameFormat.ColoredGray6, FrameFormat.Rgb565);
@@ -960,6 +975,30 @@ private void Connect(ISource source, IDestination dest, FrameFormat from, FrameF
 					var sourceGray8 = source as IGray8Source;
 					switch (to) {
 
+						// gray8 -> gray4
+						case FrameFormat.Gray4:
+							AssertCompatibility(source, sourceGray8, dest, destGray4, from, to);
+							Subscribe(
+								sourceGray8.GetGray8Frames(!dest.NeedsDuplicateFrames),
+								frame => frame
+									.TransformHdScaling(destFixedSize, ScalerMode)
+									.ConvertToGray4()
+									.TransformGray(this, destFixedSize, destMultiSize),
+								destGray4.RenderGray4);
+							break;
+
+						// gray8 -> gray2
+						case FrameFormat.Gray2:
+							AssertCompatibility(source, sourceGray8, dest, destGray2, from, to);
+							Subscribe(
+								sourceGray8.GetGray8Frames(!dest.NeedsDuplicateFrames),
+								frame => frame
+									.TransformHdScaling(destFixedSize, ScalerMode)
+									.ConvertToGray2()
+									.TransformGray(this, destFixedSize, destMultiSize),
+								destGray2.RenderGray2);
+							break;
+
 						// gray8 -> gray8
 						case FrameFormat.Gray8:
 							AssertCompatibility(source, sourceGray8, dest, destGray8, from, to);
@@ -984,7 +1023,7 @@ private void Connect(ISource source, IDestination dest, FrameFormat from, FrameF
 							);
 							break;
 
-						// gray4 -> rgb24
+						// gray8 -> rgb24
 						case FrameFormat.Rgb24:
 							AssertCompatibility(source, sourceGray8, dest, destRgb24, from, to);
 							Subscribe(
@@ -996,6 +1035,19 @@ private void Connect(ISource source, IDestination dest, FrameFormat from, FrameF
 								destRgb24.RenderRgb24);
 							break;
 
+						// gray8 -> bitmap
+						case FrameFormat.Bitmap:
+							AssertCompatibility(source, sourceGray8, dest, destBitmap, from, to);
+							Subscribe(
+								sourceGray8.GetGray8Frames(!dest.NeedsDuplicateFrames),
+								frame => frame
+									.TransformHdScaling(destFixedSize, ScalerMode)
+									.ConvertGrayToBmp(_gray8Palette ?? _gray8Colors)
+									.Transform(this, destFixedSize, destMultiSize),
+								destBitmap.RenderBitmap);
+							break;
+
+
 						default:
 							throw new ArgumentOutOfRangeException(nameof(to), to, null);
 					}