Refactor video projects

Author: saddam213

TensorStack.Video.Windows/TensorStack.Video.Windows.csproj

@@ -21,6 +21,8 @@
 
   <!--Common Packages-->
   <ItemGroup>
+    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
+    <PackageReference Include="OpenCvSharp4" Version="4.11.0.20250507" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
   </ItemGroup>
 

TensorStack.Video/VideoInput.cs renamed to TensorStack.Video.Windows/VideoInput.cs

@@ -10,9 +10,9 @@ namespace TensorStack.Video
     /// <summary>
     /// Class to handle processing of a video stream.
     /// </summary>
-    public class VideoInput : VideoTensor
+    public class VideoInput : VideoInputBase
     {
-        private string _filename;
+        private readonly string _sourceFile;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VideoInput"/> class.
@@ -23,24 +23,46 @@ public class VideoInput : VideoTensor
         /// <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)
-            : this(VideoManager.LoadVideoTensor(filename, widthOverride, heightOverride, frameRateOverride, resizeMode))
-        {
-            _filename = filename;
-        }
+            : this(filename, VideoManager.LoadVideoTensor(filename, widthOverride, heightOverride, frameRateOverride, resizeMode)) { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VideoInput"/> class.
         /// </summary>
+        /// <param name="filename">The filename.</param>
         /// <param name="videoTensor">The video tensor.</param>
-        public VideoInput(VideoTensor videoTensor) : base(videoTensor, videoTensor.FrameRate) { }
+        public VideoInput(string filename, VideoTensor videoTensor)
+            : base(videoTensor)
+        {
+            _sourceFile = filename;
+        }
+
+
+        /// <summary>
+        /// Gets the source video filename.
+        /// </summary>
+        public override string SourceFile => _sourceFile;
+
 
         /// <summary>
-        /// Gets the filename.
+        /// Save the Video to file
         /// </summary>
-        /// <value>The filename.</value>
-        public string Filename => _filename;
+        /// <param name="filename">The filename.</param>
+        public override void Save(string filename)
+        {
+            throw new System.NotImplementedException();
+        }
 
 
+        /// <summary>
+        /// Save the Video to file
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <param name="cancellationToken">The cancellation token</param>
+        public override Task SaveAsync(string filename, CancellationToken cancellationToken = default)
+        {
+            return SaveAsync(filename, frameRateOverride: default, cancellationToken: cancellationToken);
+        }
+
         /// <summary>
         /// Save the VideoTensor to file
         /// </summary>
@@ -60,7 +82,7 @@ public async Task SaveAsync(string filename, string videoCodec = "mp4v", float?
         /// <returns>VideoStream.</returns>
         public VideoInputStream CreateStream()
         {
-            return new VideoInputStream(_filename);
+            return new VideoInputStream(_sourceFile);
         }
 
 
@@ -70,17 +92,7 @@ public VideoInputStream CreateStream()
         /// <returns>Task&lt;VideoInputStream&gt;.</returns>
         public Task<VideoInputStream> CreateStreamAsync()
         {
-            return VideoInputStream.CreateAsync(_filename);
-        }
-
-
-        /// <summary>
-        /// Sets the filename.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        public void SetFilename(string filename)
-        {
-            _filename = filename;
+            return VideoInputStream.CreateAsync(_sourceFile);
         }
 
 
@@ -95,7 +107,8 @@ public void SetFilename(string filename)
         /// <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 VideoManager.LoadVideoTensorAsync(filename, widthOverride, heightOverride, frameRateOverride, resizeMode, cancellationToken));
+            return new VideoInput(filename, await VideoManager.LoadVideoTensorAsync(filename, widthOverride, heightOverride, frameRateOverride, resizeMode, cancellationToken));
         }
+
     }
 }

TensorStack.Video/VideoInputStream.cs renamed to TensorStack.Video.Windows/VideoInputStream.cs

@@ -12,69 +12,23 @@
 
 namespace TensorStack.Video
 {
-    public class VideoInputStream
+    public class VideoInputStream : VideoInputStreamBase
     {
-        private readonly VideoInfo _videoInfo;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VideoInputStream"/> class.
-        /// </summary>
-        /// <param name="videoInfo">The video information.</param>
-        /// <param name="videoCodec">The video codec.</param>
-        public VideoInputStream(VideoInfo videoInfo)
-        {
-            _videoInfo = videoInfo;
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="VideoInputStream"/> class.
         /// </summary>
         /// <param name="filename">The filename.</param>
         /// <param name="videoCodec">The video codec.</param>
         /// <exception cref="System.Exception">Failed to open video file.</exception>
-        public VideoInputStream(string filename) 
+        public VideoInputStream(string filename)
             : this(VideoManager.LoadVideoInfo(filename)) { }
 
         /// <summary>
-        /// Gets the filename.
-        /// </summary>
-        /// <value>The filename.</value>
-        public string Filename => _videoInfo.FileName;
-
-        /// <summary>
-        /// Gets the video width.
-        /// </summary>
-        public int Width => _videoInfo.Width;
-
-        /// <summary>
-        /// Gets the video height.
-        /// </summary>
-        public int Height => _videoInfo.Height;
-
-        /// <summary>
-        /// Gets the video frame rate.
-        /// </summary>
-        public float FrameRate => _videoInfo.FrameRate;
-
-        /// <summary>
-        /// Gets the video frame count.
-        /// </summary>
-        public int FrameCount => _videoInfo.FrameCount;
-
-        /// <summary>
-        /// Gets the video codec.
-        /// </summary>
-        public string VideoCodec => _videoInfo.VideoCodec;
-
-        /// <summary>
-        /// Gets the duration.
-        /// </summary>
-        public TimeSpan Duration => _videoInfo.Duration;
-
-        /// <summary>
-        /// Gets the thumbnail.
+        /// Initializes a new instance of the <see cref="VideoInputStream"/> class.
         /// </summary>
-        public ImageTensor Thumbnail => _videoInfo.Thumbnail;
+        /// <param name="videoInfo">The video information.</param>
+        private VideoInputStream(VideoInfo videoInfo)
+            : base(videoInfo) { }
 
 
         /// <summary>
@@ -87,7 +41,7 @@ public VideoInputStream(string filename)
         /// <returns>IAsyncEnumerable&lt;ImageFrame&gt;.</returns>
         public IAsyncEnumerable<VideoFrame> GetAsync(int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Stretch, CancellationToken cancellationToken = default)
         {
-            return VideoManager.ReadStreamAsync(_videoInfo.FileName, frameRateOverride, widthOverride, heightOverride, resizeMode, cancellationToken);
+            return VideoManager.ReadStreamAsync(SourceFile, frameRateOverride, widthOverride, heightOverride, resizeMode, cancellationToken);
         }
 
 
@@ -103,7 +57,7 @@ public IAsyncEnumerable<VideoFrame> GetAsync(int? widthOverride = default, int?
         /// <returns>Task.</returns>
         public Task SaveAsync(IAsyncEnumerable<VideoFrame> stream, string filename, string videoCodec = "mp4v", int? widthOverride = null, int? heightOverride = null, float? frameRateOverride = null, CancellationToken cancellationToken = default)
         {
-            return VideoManager.WriteVideoStreamAsync(_videoInfo.FileName, stream, videoCodec, widthOverride, heightOverride, frameRateOverride, cancellationToken);
+            return VideoManager.WriteVideoStreamAsync(SourceFile, stream, videoCodec, widthOverride, heightOverride, frameRateOverride, cancellationToken);
         }
 
 
@@ -134,10 +88,10 @@ public async Task<VideoTensor> CreateTensorAsync(int? widthOverride = default, i
         /// <exception cref="System.Exception">Destination video already exists</exception>
         public async Task<VideoInputStream> MoveAsync(string newFilename, bool overwrite = true)
         {
-            if (!File.Exists(Filename))
+            if (!File.Exists(SourceFile))
                 throw new Exception("Source video not found");
 
-            File.Move(Filename, newFilename, overwrite);
+            File.Move(SourceFile, newFilename, overwrite);
             return await CreateAsync(newFilename);
         }
 
@@ -152,10 +106,10 @@ public async Task<VideoInputStream> MoveAsync(string newFilename, bool overwrite
         /// <exception cref="System.Exception">Destination video already exists</exception>
         public async Task<VideoInputStream> CopyAsync(string newFilename, bool overwrite = true)
         {
-            if (!File.Exists(Filename))
+            if (!File.Exists(SourceFile))
                 throw new Exception("Source video not found");
 
-            File.Copy(Filename, newFilename, overwrite);
+            File.Copy(SourceFile, newFilename, overwrite);
             return await CreateAsync(newFilename);
         }
 

TensorStack.Video/VideoManager.cs renamed to TensorStack.Video.Windows/VideoManager.cs

@@ -81,7 +81,7 @@ public static Task<VideoInfo> LoadVideoInfoAsync(string filename, int thumbSize
         /// <param name="heightOverride">The height.</param>
         ///  <param name="frameRateOverride">The frame rate.</param>
         /// <returns>VideoTensor.</returns>
-        internal static VideoTensor LoadVideoTensor(string videoFile, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop)
+        public static VideoTensor LoadVideoTensor(string videoFile, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop)
         {
             return ReadVideo(videoFile, widthOverride, heightOverride, frameRateOverride, resizeMode);
         }
@@ -96,7 +96,7 @@ internal static VideoTensor LoadVideoTensor(string videoFile, int? widthOverride
         /// <param name="height">The height.</param>
         /// <param name="cancellationToken">The cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <returns>Task&lt;VideoTensor&gt;.</returns>
-        internal static Task<VideoTensor> LoadVideoTensorAsync(string videoFile, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop, CancellationToken cancellationToken = default)
+        public static Task<VideoTensor> LoadVideoTensorAsync(string videoFile, int? widthOverride = default, int? heightOverride = default, float? frameRateOverride = default, ResizeMode resizeMode = ResizeMode.Crop, CancellationToken cancellationToken = default)
         {
             return Task.Run(() => ReadVideo(videoFile, widthOverride, heightOverride, frameRateOverride, resizeMode, cancellationToken));
         }
@@ -455,5 +455,133 @@ private static async Task WriteVideoFramesAsync(string videoOutputFile, IAsyncEn
             // Block
             await Task.WhenAll(readerTask, processTask, writerTask);
         }
+
+
+
+        /// <summary>
+        /// Converts Matrix to Tensor.
+        /// </summary>
+        /// <param name="matrix">The matrix.</param>
+        /// <returns>Tensor&lt;System.Single&gt;.</returns>
+        internal static unsafe ImageTensor ToTensor(this Mat matrix, Size cropSize = default)
+        {
+            int cropX = 0;
+            int cropY = 0;
+            int height = matrix.Rows;
+            int width = matrix.Cols;
+
+            if (cropSize != default)
+            {
+                if (width == cropSize.Width)
+                {
+                    cropY = (height - cropSize.Height) / 2;
+                    height = cropSize.Height;
+                }
+                else if (height == cropSize.Height)
+                {
+                    cropX = (width - cropSize.Width) / 2;
+                    width = cropSize.Width;
+                }
+            }
+
+            var imageTensor = new ImageTensor([1, 4, height, width]);
+            var destination = imageTensor.Memory.Span;
+
+            unsafe
+            {
+                var source = matrix.DataPointer;
+                int srcStride = matrix.Cols * 3;
+                int dstStride = height * width;
+                for (int y = 0; y < height; y++)
+                {
+                    for (int x = 0; x < width; x++)
+                    {
+                        int srcIndex = ((y + cropY) * matrix.Cols + (x + cropX)) * 3;
+                        int dstIndex = y * width + x;
+
+                        destination[0 * dstStride + dstIndex] = GetFloatValue(source[srcIndex + 2]); // R
+                        destination[1 * dstStride + dstIndex] = GetFloatValue(source[srcIndex + 1]); // G
+                        destination[2 * dstStride + dstIndex] = GetFloatValue(source[srcIndex + 0]); // B
+                        destination[3 * dstStride + dstIndex] = GetFloatValue(byte.MaxValue);        // A
+                    }
+                }
+            }
+
+            return imageTensor;
+        }
+
+
+        /// <summary>
+        /// Converts Tensor to OpenCv Matrix.
+        /// </summary>
+        /// <param name="tensor">The tensor.</param>
+        /// <returns>Mat.</returns>
+        internal static unsafe Mat ToMatrix(this Tensor<float> tensor)
+        {
+            var channels = tensor.Dimensions[1];
+            var height = tensor.Dimensions[2];
+            var width = tensor.Dimensions[3];
+
+            var matrix = new Mat(height, width, MatType.CV_8UC3);
+            var source = tensor.Span;
+            var destination = matrix.DataPointer;
+            for (int y = 0; y < height; y++)
+            {
+                for (int x = 0; x < width; x++)
+                {
+                    int offset = y * width + x;
+
+                    if (channels == 1)
+                    {
+                        byte gray = GetByteValue(source[offset]);
+                        destination[offset * 3 + 0] = gray; // B
+                        destination[offset * 3 + 1] = gray; // G
+                        destination[offset * 3 + 2] = gray; // R
+                    }
+                    else
+                    {
+                        destination[offset * 3 + 0] = GetByteValue(source[2 * width * height + offset]); // B
+                        destination[offset * 3 + 1] = GetByteValue(source[1 * width * height + offset]); // G
+                        destination[offset * 3 + 2] = GetByteValue(source[0 * width * height + offset]); // R
+                    }
+                }
+            }
+
+            return matrix;
+        }
+
+
+        /// <summary>
+        /// Gets the normalized byte value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        internal static byte GetByteValue(this float value)
+        {
+            return (byte)Math.Clamp((value + 1.0f) * 0.5f * 255f, 0, 255);
+        }
+
+
+        /// <summary>
+        /// Gets the normalized float value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        internal static float GetFloatValue(this byte value)
+        {
+            return (value / 255f) * 2.0f - 1.0f;
+        }
+
+
+        /// <summary>
+        /// Null if zero.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>System.Nullable&lt;System.Int32&gt;.</returns>
+        internal static int? NullIfZero(this int? value)
+        {
+            if (value.HasValue && value.Value == 0)
+                return null;
+
+            return value;
+        }
     }
 }