Fix video input/output codec fields

Author: saddam213

TensorStack.Image.BitmapImage/Extensions.cs

@@ -69,15 +69,12 @@ public static Task SaveAsync(this ImageInput imageTensor, string filename)
         /// <param name="filePath">The file path.</param>
         internal static void Save(this WriteableBitmap bitmap, string filePath)
         {
-            ImageService.DefaultDispatcher.Invoke(() =>
+            var encoder = new PngBitmapEncoder();
+            encoder.Frames.Add(BitmapFrame.Create(bitmap));
+            using (FileStream stream = new FileStream(filePath, FileMode.Create, FileAccess.Write))
             {
-                var encoder = new PngBitmapEncoder();
-                encoder.Frames.Add(BitmapFrame.Create(bitmap));
-                using (FileStream stream = new FileStream(filePath, FileMode.Create, FileAccess.Write))
-                {
-                    encoder.Save(stream);
-                }
-            });
+                encoder.Save(stream);
+            }
         }
 
 
@@ -91,29 +88,27 @@ internal static WriteableBitmap ToBitmapImage(this ImageTensor imageTensor)
             var channels = imageTensor.Dimensions[1];
             var height = imageTensor.Dimensions[2];
             var width = imageTensor.Dimensions[3];
-            return ImageService.DefaultDispatcher.Invoke(() =>
-            {
-                if (channels == 1)
-                    return imageTensor.ToSingleChannelImage();
 
-                var stride = width * 4;
-                var pixelBuffer = new byte[height * stride];
-                var writeableBitmap = new WriteableBitmap(width, height, 96, 96, PixelFormats.Bgra32, null);
-                for (int y = 0; y < height; y++)
+            if (channels == 1)
+                return imageTensor.ToSingleChannelImage();
+
+            var stride = width * 4;
+            var pixelBuffer = new byte[height * stride];
+            var writeableBitmap = new WriteableBitmap(width, height, 96, 96, PixelFormats.Bgra32, null);
+            for (int y = 0; y < height; y++)
+            {
+                for (int x = 0; x < width; x++)
                 {
-                    for (int x = 0; x < width; x++)
-                    {
-                        int pixelIndex = (y * width + x) * 4;
-                        pixelBuffer[pixelIndex + 0] = GetByteValue(imageTensor[0, 2, y, x]); // B
-                        pixelBuffer[pixelIndex + 1] = GetByteValue(imageTensor[0, 1, y, x]); // G
-                        pixelBuffer[pixelIndex + 2] = GetByteValue(imageTensor[0, 0, y, x]); // R
-                        pixelBuffer[pixelIndex + 3] = channels == 4 ? GetByteValue(imageTensor[0, 3, y, x]) : byte.MaxValue; // A
-                    }
+                    int pixelIndex = (y * width + x) * 4;
+                    pixelBuffer[pixelIndex + 0] = GetByteValue(imageTensor[0, 2, y, x]); // B
+                    pixelBuffer[pixelIndex + 1] = GetByteValue(imageTensor[0, 1, y, x]); // G
+                    pixelBuffer[pixelIndex + 2] = GetByteValue(imageTensor[0, 0, y, x]); // R
+                    pixelBuffer[pixelIndex + 3] = channels == 4 ? GetByteValue(imageTensor[0, 3, y, x]) : byte.MaxValue; // A
                 }
-                writeableBitmap.WritePixels(new Int32Rect(0, 0, width, height), pixelBuffer, stride, 0);
-                writeableBitmap.Freeze();
-                return writeableBitmap;
-            });
+            }
+            writeableBitmap.WritePixels(new Int32Rect(0, 0, width, height), pixelBuffer, stride, 0);
+            writeableBitmap.Freeze();
+            return writeableBitmap;
         }
 
 

TensorStack.Image.BitmapImage/ImageInput.cs

@@ -31,6 +31,8 @@ public ImageInput(WriteableBitmap image)
             : base(image.ToTensor())
         {
             _image = image;
+            if (!_image.IsFrozen)
+                _image.Freeze();
         }
 
         /// <summary>
@@ -56,7 +58,7 @@ public ImageInput(string filename)
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         /// <param name="resizeMode">The resize mode.</param>
-        public ImageInput(string filename, int width, int height, ResizeMode resizeMode = ResizeMode.Stretch) 
+        public ImageInput(string filename, int width, int height, ResizeMode resizeMode = ResizeMode.Stretch)
             : this(ImageService.Load(filename))
         {
             Resize(width, height, resizeMode);

TensorStack.Image.BitmapImage/ImageService.cs

@@ -4,16 +4,13 @@
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Threading;
 
 namespace TensorStack.Image
 {
     public static class ImageService
     {
         const string RotationQuery = "System.Photo.Orientation";
-        internal static Dispatcher DefaultDispatcher => Application.Current.Dispatcher;
-
-
+   
         /// <summary>
         /// Loads image from file.
         /// </summary>

TensorStack.TextGeneration/Pipelines/Florence/FlorenceOptions.cs

@@ -13,7 +13,11 @@ public record FlorenceOptions : GenerateOptions
         public CoordinateBox<float> Region { get; set; }
     }
 
-    public record FlorenceSearchOptions : FlorenceOptions;
+    public record FlorenceSearchOptions : FlorenceOptions
+    {
+        public FlorenceSearchOptions(){ }
+        public FlorenceSearchOptions(FlorenceOptions options) : base(options) { }
+    }
 
 
 

TensorStack.Video/Extensions.cs

@@ -24,10 +24,10 @@ public static class Extensions
         /// <param name="height">The height.</param>
         /// <param name="videoCodec">The video codec.</param>
         /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        public static async Task SaveAync(this IAsyncEnumerable<ImageTensor> imageFrames, string videoFile, float framerate, int? widthOverride = null, int? heightOverride = null, string videoCodec = "mp4v", CancellationToken cancellationToken = default)
+        public static async Task SaveAync(this IAsyncEnumerable<ImageTensor> imageFrames, string videoFile, float framerate, string videoCodec = "mp4v", int? widthOverride = null, int? heightOverride = null, CancellationToken cancellationToken = default)
         {
             var videoFrames = imageFrames.AsVideoFrames(framerate, cancellationToken);
-            await VideoService.WriteVideoStreamAsync(videoFile, videoFrames, widthOverride, heightOverride, framerate, videoCodec, cancellationToken);
+            await VideoService.WriteVideoStreamAsync(videoFile, videoFrames, videoCodec, widthOverride, heightOverride, framerate, cancellationToken);
         }
 
 
@@ -39,9 +39,9 @@ public static async Task SaveAync(this IAsyncEnumerable<ImageTensor> imageFrames
         /// <param name="framerate">The framerate.</param>
         /// <param name="videoCodec">The video codec.</param>
         /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        public static async Task SaveAync(this IAsyncEnumerable<VideoFrame> videoFrames, string videoFile, int? widthOverride = null, int? heightOverride = null, float? frameRateOverride = null, string videoCodec = "mp4v", CancellationToken cancellationToken = default)
+        public static async Task SaveAync(this IAsyncEnumerable<VideoFrame> videoFrames, string videoFile, string videoCodec = "mp4v", int? widthOverride = null, int? heightOverride = null, float? frameRateOverride = null, CancellationToken cancellationToken = default)
         {
-            await VideoService.WriteVideoStreamAsync(videoFile, videoFrames, widthOverride, heightOverride, frameRateOverride, videoCodec, cancellationToken);
+            await VideoService.WriteVideoStreamAsync(videoFile, videoFrames, videoCodec, widthOverride, heightOverride, frameRateOverride, cancellationToken);
         }
 
 
@@ -59,11 +59,11 @@ public static async Task SaveAync(this IAsyncEnumerable<VideoFrame> videoFrames,
         /// <param name="frameRateOverride">The output frame rate override.</param>
         /// <param name="videoCodec">The video codec.</param>
         /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        public static async Task<VideoInputStream> SaveAync(this VideoInputStream videoInput, string videoFile, Func<VideoFrame, Task<VideoFrame>> frameProcessor, int readBuffer = 16, int writeBuffer = 16, int? widthOverride = null, int? heightOverride = null, float? frameRateOverride = null, string videoCodec = "mp4v", CancellationToken cancellationToken = default)
+        public static async Task<VideoInputStream> SaveAync(this VideoInputStream videoInput, string videoFile, Func<VideoFrame, Task<VideoFrame>> frameProcessor, int readBuffer = 16, int writeBuffer = 16, string videoCodec = "mp4v", int? widthOverride = null, int? heightOverride = null, float? frameRateOverride = null, CancellationToken cancellationToken = default)
         {
             var videoFrames = videoInput.GetAsync(cancellationToken: cancellationToken);
-            await VideoService.WriteVideoStreamAsync(videoFile, videoFrames, frameProcessor, readBuffer, writeBuffer, widthOverride, heightOverride, frameRateOverride, videoCodec, cancellationToken);
-            return new VideoInputStream(videoFile, videoCodec);
+            await VideoService.WriteVideoStreamAsync(videoFile, videoFrames, frameProcessor, readBuffer, writeBuffer, videoCodec, widthOverride, heightOverride, frameRateOverride, cancellationToken);
+            return await VideoInputStream.CreateAsync(videoFile);
         }
 
 

TensorStack.Video/VideoInfo.cs

@@ -5,8 +5,15 @@
 
 namespace TensorStack.Video
 {
-    public readonly record struct VideoInfo(string FileName, int Width, int Height, float FrameRate, int FrameCount, ImageTensor Thumbnail)
+    public record VideoInfo
     {
+        public string FileName { get; init; }
+        public int Width { get; init; }
+        public int Height { get; init; }
+        public float FrameRate { get; init; }
+        public int FrameCount { get; init; }
+        public string VideoCodec { get; init; }
+        public ImageTensor Thumbnail { get; init; }
         public TimeSpan Duration => TimeSpan.FromSeconds(FrameCount / FrameRate);
     }
 }

TensorStack.Video/VideoInput.cs

@@ -12,7 +12,6 @@ namespace TensorStack.Video
     /// </summary>
     public class VideoInput : VideoTensor
     {
-        private readonly string _videoCodec;
         private string _filename;
 
         /// <summary>
@@ -23,8 +22,8 @@ public class VideoInput : VideoTensor
         /// <param name="height">The height.</param>
         /// <param name="frameRate">The frame rate.</param>
         /// <param name="videoCodec">The video codec.</param>
-        public VideoInput(string filename, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop, string videoCodec = "mp4v")
-            : this(VideoService.LoadVideoTensor(filename, widthOverride, heightOverride, frameRateOverride, resizeMode), videoCodec)
+        public VideoInput(string filename, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop)
+            : this(VideoService.LoadVideoTensor(filename, widthOverride, heightOverride, frameRateOverride, resizeMode))
         {
             _filename = filename;
         }
@@ -33,11 +32,7 @@ public VideoInput(string filename, int? widthOverride = default, int? heightOver
         /// Initializes a new instance of the <see cref="VideoInput"/> class.
         /// </summary>
         /// <param name="videoTensor">The video tensor.</param>
-        public VideoInput(VideoTensor videoTensor, string videoCodec = "mp4v")
-            : base(videoTensor, videoTensor.FrameRate)
-        {
-            _videoCodec = videoCodec;
-        }
+        public VideoInput(VideoTensor videoTensor) : base(videoTensor, videoTensor.FrameRate) { }
 
         /// <summary>
         /// Gets the filename.
@@ -53,34 +48,29 @@ public VideoInput(VideoTensor videoTensor, string videoCodec = "mp4v")
         /// <param name="framerateOverride">The framerate.</param>
         /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <returns>A Task representing the asynchronous operation.</returns>
-        public async Task SaveAsync(string filename, float? frameRateOverride = default, CancellationToken cancellationToken = default)
+        public async Task SaveAsync(string filename, string videoCodec = "mp4v", float? frameRateOverride = default, CancellationToken cancellationToken = default)
         {
-            await VideoService.SaveVideoTensorAync(filename, this, frameRateOverride, _videoCodec, cancellationToken);
+            await VideoService.SaveVideoTensorAync(filename, this, videoCodec, frameRateOverride, cancellationToken);
         }
 
 
         /// <summary>
-        /// Load as VideoInput asynchronously
+        /// Creates the stream.
         /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <param name="widthOverride">The width.</param>
-        /// <param name="heightOverride">The height.</param>
-        /// <param name="frameRateOverride ">The frame rate.</param>
-        /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <returns>A Task&lt;VideoInput&gt; representing the asynchronous operation.</returns>
-        public static async Task<VideoInput> LoadAsync(string filename, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop, CancellationToken cancellationToken = default)
+        /// <returns>VideoStream.</returns>
+        public VideoInputStream CreateStream()
         {
-            return new VideoInput(await VideoService.LoadVideoTensorAsync(filename, widthOverride, heightOverride, frameRateOverride, resizeMode, cancellationToken));
+            return new VideoInputStream(_filename);
         }
 
 
         /// <summary>
-        /// Creates the stream.
+        /// Creates the stream asynchronously.
         /// </summary>
-        /// <returns>VideoStream.</returns>
-        public VideoInputStream CreateStream()
+        /// <returns>Task&lt;VideoInputStream&gt;.</returns>
+        public Task<VideoInputStream> CreateStreamAsync()
         {
-            return new VideoInputStream(_filename, _videoCodec);
+            return VideoInputStream.CreateAsync(_filename);
         }
 
 
@@ -93,5 +83,19 @@ public void SetFilename(string filename)
             _filename = filename;
         }
 
+
+        /// <summary>
+        /// Create a VideoInput asynchronously
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <param name="widthOverride">The width.</param>
+        /// <param name="heightOverride">The height.</param>
+        /// <param name="frameRateOverride ">The frame rate.</param>
+        /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
+        /// <returns>A Task&lt;VideoInput&gt; representing the asynchronous operation.</returns>
+        public static async Task<VideoInput> CreateAsync(string filename, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop, CancellationToken cancellationToken = default)
+        {
+            return new VideoInput(await VideoService.LoadVideoTensorAsync(filename, widthOverride, heightOverride, frameRateOverride, resizeMode, cancellationToken));
+        }
     }
 }