Wrap and simplify Video input

OnnxStack.Console/Examples/FeatureExtractorExample.cs

@@ -1,4 +1,5 @@
 using OnnxStack.Core.Image;
+using OnnxStack.Core.Video;
 using OnnxStack.FeatureExtractor.Pipelines;
 using OnnxStack.StableDiffusion.Config;
 using SixLabors.ImageSharp;
@@ -47,15 +48,14 @@ public async Task RunAsync()
  var timestamp = Stopwatch.GetTimestamp();
  OutputHelpers.WriteConsole($"Load pipeline`{pipeline.Name}`", ConsoleColor.Cyan);
 
- // Run Pipeline
+ // Run Image Pipeline
  var imageFeature = await pipeline.RunAsync(inputImage);
 
  OutputHelpers.WriteConsole($"Generating image", ConsoleColor.Cyan);
 
  // Save Image
  await imageFeature.SaveAsync(Path.Combine(_outputDirectory, $"{pipeline.Name}.png"));
 
-
  OutputHelpers.WriteConsole($"Unload pipeline", ConsoleColor.Cyan);
 
  //Unload

OnnxStack.Console/Examples/StableDiffusionBatch.cs

@@ -61,7 +61,7 @@ public async Task RunAsync()
  await foreach (var result in pipeline.RunBatchAsync(batchOptions, promptOptions, progressCallback: OutputHelpers.BatchProgressCallback))
  {
  // Create Image from Tensor result
- var image = result.ImageResult;
+ var image = new OnnxImage(result.Result);
 
  // Save Image File
  var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}_{result.SchedulerOptions.Seed}.png");

OnnxStack.Console/Examples/StableDiffusionExample.cs

@@ -67,14 +67,11 @@ public async Task RunAsync()
  OutputHelpers.WriteConsole($"Generating '{schedulerType}' Image...", ConsoleColor.Green);
 
  // Run pipeline
- var result = await pipeline.RunAsync(promptOptions, schedulerOptions, progressCallback: OutputHelpers.ProgressCallback);
-
- // Create Image from Tensor result
- var image = new OnnxImage(result);
+ var result = await pipeline.GenerateImageAsync(promptOptions, schedulerOptions, progressCallback: OutputHelpers.ProgressCallback);
 
  // Save Image File
  var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}_{schedulerOptions.SchedulerType}.png");
- await image.SaveAsync(outputFilename);
+ await result.SaveAsync(outputFilename);
 
  OutputHelpers.WriteConsole($"Image Created: {Path.GetFileName(outputFilename)}, Elapsed: {Stopwatch.GetElapsedTime(timestamp)}ms", ConsoleColor.Green);
  }

OnnxStack.Console/Examples/VideoToVideoExample.cs

@@ -1,6 +1,4 @@
-using OnnxStack.Core.Services;
-using OnnxStack.Core.Video;
-using OnnxStack.StableDiffusion.Common;
+using OnnxStack.Core.Video;
 using OnnxStack.StableDiffusion.Config;
 using OnnxStack.StableDiffusion.Enums;
 using OnnxStack.StableDiffusion.Pipelines;
@@ -11,12 +9,10 @@ public sealed class VideoToVideoExample : IExampleRunner
  {
  private readonly string _outputDirectory;
  private readonly StableDiffusionConfig _configuration;
- private readonly IVideoService _videoService;
 
- public VideoToVideoExample(StableDiffusionConfig configuration, IVideoService videoService)
+ public VideoToVideoExample(StableDiffusionConfig configuration)
  {
  _configuration = configuration;
- _videoService = videoService;
  _outputDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Examples", nameof(VideoToVideoExample));
  Directory.CreateDirectory(_outputDirectory);
  }
@@ -30,8 +26,7 @@ public VideoToVideoExample(StableDiffusionConfig configuration, IVideoService vi
  public async Task RunAsync()
  {
  // Load Video
- var targetFPS = 15;
- var videoInput = await VideoInput.FromFileAsync("C:\\Users\\Deven\\Pictures\\gidsgphy.gif", targetFPS);
+ var videoInput = await OnnxVideo.FromFileAsync("C:\\Users\\Deven\\Pictures\\gidsgphy.gif");
 
  // Loop though the appsettings.json model sets
  foreach (var modelSet in _configuration.ModelSets)
@@ -53,11 +48,10 @@ public async Task RunAsync()
  };
 
  // Run pipeline
- var result = await pipeline.RunAsync(promptOptions, progressCallback: OutputHelpers.FrameProgressCallback);
+ var result = await pipeline.GenerateVideoAsync(promptOptions, progressCallback: OutputHelpers.FrameProgressCallback);
 
  // Save Video File
- var outputFilename = Path.Combine(_outputDirectory, $"{modelSet.Name}.mp4");
- await VideoInput.SaveFileAsync(result, outputFilename, targetFPS);
+ await result.SaveAsync(Path.Combine(_outputDirectory, $"Result.mp4"));
  }
  }
  }

OnnxStack.Core/Extensions/TensorExtension.cs

@@ -1,5 +1,6 @@
 using Microsoft.ML.OnnxRuntime.Tensors;
 using System;
+using System.Collections.Generic;
 
 namespace OnnxStack.Core
 {
@@ -54,6 +55,26 @@ public static void NormalizeMinMax(this DenseTensor<float> tensor)
  }
 
 
+ /// <summary>
+ /// Splits the tensor across the batch dimension.
+ /// </summary>
+ /// <param name="tensor">The tensor.</param>
+ /// <returns></returns>
+ public static IEnumerable<DenseTensor<float>> SplitBatch(this DenseTensor<float> tensor)
+ {
+ var count = tensor.Dimensions[0];
+ var dimensions = tensor.Dimensions.ToArray();
+ dimensions[0] = 1;
+
+ var newLength = (int)tensor.Length / count;
+ for (int i = 0; i < count; i++)
+ {
+ var start = i * newLength;
+ yield return new DenseTensor<float>(tensor.Buffer.Slice(start, newLength), dimensions);
+ }
+ }
+
+
  /// <summary>
  /// Concatenates the specified tensors along the specified axis.
  /// </summary>

OnnxStack.Core/Image/OnnxImage.cs

@@ -10,7 +10,7 @@
 
 namespace OnnxStack.Core.Image
 {
- public class OnnxImage : IDisposable
+ public sealed class OnnxImage : IDisposable
  {
  private readonly Image<Rgba32> _imageData;
 
@@ -222,6 +222,10 @@ public void Resize(int height, int width, ResizeMode resizeMode = ResizeMode.Cro
  });
  }
 
+ public OnnxImage Clone()
+ {
+ return new OnnxImage(_imageData);
+ }
 
  /// <summary>
  /// Saves the specified image to file.

OnnxStack.Core/Model/OnnxInferenceParameters.cs

@@ -5,7 +5,7 @@
 
 namespace OnnxStack.Core.Model
 {
- public class OnnxInferenceParameters : IDisposable
+ public sealed class OnnxInferenceParameters : IDisposable
  {
  private readonly RunOptions _runOptions;
  private readonly OnnxMetadata _metadata;

OnnxStack.Core/Model/OnnxMetadata.cs

@@ -2,7 +2,7 @@
 
 namespace OnnxStack.Core.Model
 {
- public record OnnxMetadata
+ public sealed record OnnxMetadata
  {
  /// <summary>
  /// Gets or sets the inputs.

OnnxStack.Core/Model/OnnxNamedMetadata.cs

@@ -3,7 +3,7 @@
 
 namespace OnnxStack.Core.Model
 {
- public record OnnxNamedMetadata(string Name, NodeMetadata Value)
+ public sealed record OnnxNamedMetadata(string Name, NodeMetadata Value)
  {
  internal static OnnxNamedMetadata Create(KeyValuePair<string, NodeMetadata> metadata)
  {

OnnxStack.Core/Model/OnnxValueCollection.cs

@@ -4,7 +4,7 @@
 
 namespace OnnxStack.Core.Model
 {
- public class OnnxValueCollection : IDisposable
+ public sealed class OnnxValueCollection : IDisposable
  {
  private readonly List<OnnxNamedMetadata> _metaData;
  private readonly Dictionary<string, OrtValue> _values;

OnnxStack.Core/Registration.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using OnnxStack.Common.Config;
 using OnnxStack.Core.Config;
-using OnnxStack.Core.Services;
 
 namespace OnnxStack.Core
 {