Fix clear video race condition

saddam213 · saddam213 · commit 5d83acf13c51 · 2025-11-02T16:48:35.000+13:00
diff --git a/Examples/TensorStack.Example.Extractors/Services/ExtractorService.cs b/Examples/TensorStack.Example.Extractors/Services/ExtractorService.cs
@@ -18,6 +18,7 @@ public class ExtractorService : ServiceBase, IExtractorService
     {
         private readonly Settings _settings;
         private readonly IMediaService _mediaService;
+        private ExtractorModel _currentModel;
         private IPipeline _currentPipeline;
         private CancellationTokenSource _cancellationTokenSource;
         private bool _isLoaded;
@@ -35,6 +36,10 @@ public ExtractorService(Settings settings, IMediaService mediaService)
             _mediaService = mediaService;
         }
 
+        /// <summary>
+        /// Gets the model.
+        public ExtractorModel Model => _currentModel;
+
         /// <summary>
         /// Gets a value indicating whether this instance is loaded.
         /// </summary>
@@ -89,6 +94,7 @@ public async Task LoadAsync(ExtractorModel model, Device device)
                         await _currentPipeline.UnloadAsync(cancellationToken);
                     }
 
+                    _currentModel = model;
                     _currentConfig = new ExtractorConfig
                     {
                         Path = model.Path,
@@ -115,6 +121,7 @@ public async Task LoadAsync(ExtractorModel model, Device device)
                 _currentPipeline?.Dispose();
                 _currentPipeline = null;
                 _currentConfig = null;
+                _currentModel = null;
                 throw;
             }
             finally
@@ -373,6 +380,7 @@ public async Task UnloadAsync()
                 _currentPipeline.Dispose();
                 _currentPipeline = null;
                 _currentConfig = null;
+                _currentModel = null;
             }
 
             IsLoaded = false;
@@ -384,6 +392,7 @@ public async Task UnloadAsync()
 
     public interface IExtractorService
     {
+        ExtractorModel Model { get; }
         bool IsLoaded { get; }
         bool IsLoading { get; }
         bool IsExecuting { get; }
diff --git a/Examples/TensorStack.Example.Extractors/Views/ImageExtractorView.xaml.cs b/Examples/TensorStack.Example.Extractors/Views/ImageExtractorView.xaml.cs
@@ -9,6 +9,7 @@
 using TensorStack.Extractors.Common;
 using TensorStack.Image;
 using TensorStack.WPF;
+using TensorStack.WPF.Controls;
 using TensorStack.WPF.Services;
 
 namespace TensorStack.Example.Views
@@ -173,6 +174,16 @@ public bool IsTransparent
         }
 
 
+        public override Task OpenAsync(OpenViewArgs args = null)
+        {
+            if (ExtractorService.IsLoaded)
+            {
+                SelectedModel = ExtractorService.Model;
+            }
+            return base.OpenAsync(args);
+        }
+
+
         private async Task LoadAsync()
         {
             var timestamp = Stopwatch.GetTimestamp();
diff --git a/Examples/TensorStack.Example.Extractors/Views/VideoExtractorView.xaml b/Examples/TensorStack.Example.Extractors/Views/VideoExtractorView.xaml
@@ -166,6 +166,7 @@
                     <Border Margin="4">
                         <Grid Margin="20" >
                             <CommonControls:VideoStreamElement 
+                                x:Name="ResultControl"
                                 SplitterVisibility="Auto"
                                 SplitterPosition="Source"
                                 SplitterDirection="LeftToRight"
diff --git a/Examples/TensorStack.Example.Extractors/Views/VideoExtractorView.xaml.cs b/Examples/TensorStack.Example.Extractors/Views/VideoExtractorView.xaml.cs
@@ -10,6 +10,7 @@
 using TensorStack.Extractors.Common;
 using TensorStack.Video;
 using TensorStack.WPF;
+using TensorStack.WPF.Controls;
 using TensorStack.WPF.Services;
 
 namespace TensorStack.Example.Views
@@ -176,6 +177,16 @@ public bool IsTransparent
         }
 
 
+        public override Task OpenAsync(OpenViewArgs args = null)
+        {
+            if (ExtractorService.IsLoaded)
+            {
+                SelectedModel = ExtractorService.Model;
+            }
+            return base.OpenAsync(args);
+        }
+
+
         private async Task LoadAsync()
         {
             var timestamp = Stopwatch.GetTimestamp();
@@ -215,10 +226,8 @@ private bool CanUnload()
 
         private async Task ExecuteAsync()
         {
+            await ResultControl.ClearAsync();
             var timestamp = Stopwatch.GetTimestamp();
-            Progress.Clear();
-            ResultVideo = default;
-            CompareVideo = default;
 
             // Run Extractor
             var resultVideo = _selectedModel.Type switch
diff --git a/Examples/TensorStack.Example.Upscaler/Services/UpscaleService.cs b/Examples/TensorStack.Example.Upscaler/Services/UpscaleService.cs
@@ -17,6 +17,7 @@ public class UpscaleService : ServiceBase, IUpscaleService
     {
         private readonly Settings _settings;
         private readonly IMediaService _mediaService;
+        private UpscaleModel _currentModel;
         private UpscalePipeline _currentPipeline;
         private CancellationTokenSource _cancellationTokenSource;
         private bool _isLoaded;
@@ -34,6 +35,11 @@ public UpscaleService(Settings settings, IMediaService mediaService)
             _mediaService = mediaService;
         }
 
+        /// <summary>
+        /// Gets the model.
+        /// </summary>
+        public UpscaleModel Model => _currentModel;
+
         /// <summary>
         /// Gets a value indicating whether this instance is loaded.
         /// </summary>
@@ -88,6 +94,7 @@ public async Task LoadAsync(UpscaleModel model, Device device)
                         await _currentPipeline.UnloadAsync(cancellationToken);
                     }
 
+                    _currentModel = model;
                     _currentConfig = new UpscalerConfig
                     {
                         Channels = model.Channels,
@@ -107,6 +114,7 @@ public async Task LoadAsync(UpscaleModel model, Device device)
                 _currentPipeline?.Dispose();
                 _currentPipeline = null;
                 _currentConfig = null;
+                _currentModel = null;
                 throw;
             }
             finally
@@ -209,6 +217,7 @@ public async Task UnloadAsync()
                 _currentPipeline.Dispose();
                 _currentPipeline = null;
                 _currentConfig = null;
+                _currentModel = null;
             }
 
             IsLoaded = false;
@@ -220,6 +229,7 @@ public async Task UnloadAsync()
 
     public interface IUpscaleService
     {
+        UpscaleModel Model { get; }
         bool IsLoaded { get; }
         bool IsLoading { get; }
         bool IsExecuting { get; }
diff --git a/Examples/TensorStack.Example.Upscaler/Views/ImageUpscaleView.xaml.cs b/Examples/TensorStack.Example.Upscaler/Views/ImageUpscaleView.xaml.cs
@@ -97,6 +97,16 @@ public int TileOverlap
         }
 
 
+        public override Task OpenAsync(OpenViewArgs args = null)
+        {
+            if (UpscaleService.IsLoaded)
+            {
+                SelectedModel = UpscaleService.Model;
+            }
+            return base.OpenAsync(args);
+        }
+
+
         private async Task LoadAsync()
         {
             var timestamp = Stopwatch.GetTimestamp();
diff --git a/Examples/TensorStack.Example.Upscaler/Views/InterpolationView.xaml b/Examples/TensorStack.Example.Upscaler/Views/InterpolationView.xaml
@@ -109,6 +109,7 @@
                     <Border Margin="4">
                         <Grid Margin="20" >
                             <CommonControls:VideoStreamElement 
+                                x:Name="ResultControl"
                                 SplitterVisibility="Auto"
                                 SplitterPosition="Source"
                                 SplitterDirection="LeftToRight"
diff --git a/Examples/TensorStack.Example.Upscaler/Views/InterpolationView.xaml.cs b/Examples/TensorStack.Example.Upscaler/Views/InterpolationView.xaml.cs
@@ -112,10 +112,8 @@ private bool CanUnload()
 
         private async Task ExecuteAsync()
         {
+            await ResultControl.ClearAsync();
             var timestamp = Stopwatch.GetTimestamp();
-            Progress.Clear();
-            ResultVideo = default;
-            CompareVideo = default;
 
             // Run Interpolation
             var resultVideo = await InterpolationService.ExecuteAsync(new InterpolationRequest
diff --git a/Examples/TensorStack.Example.Upscaler/Views/VideoUpscaleView.xaml b/Examples/TensorStack.Example.Upscaler/Views/VideoUpscaleView.xaml
@@ -117,6 +117,7 @@
                     <Border Margin="4">
                         <Grid Margin="20" >
                             <CommonControls:VideoStreamElement 
+                                x:Name="ResultControl"
                                 SplitterVisibility="Auto"
                                 SplitterPosition="Source"
                                 SplitterDirection="LeftToRight"
diff --git a/Examples/TensorStack.Example.Upscaler/Views/VideoUpscaleView.xaml.cs b/Examples/TensorStack.Example.Upscaler/Views/VideoUpscaleView.xaml.cs
@@ -103,6 +103,16 @@ public int TileOverlap
         }
 
 
+        public override Task OpenAsync(OpenViewArgs args = null)
+        {
+            if (UpscaleService.IsLoaded)
+            {
+                SelectedModel = UpscaleService.Model;
+            }
+            return base.OpenAsync(args);
+        }
+
+
         private async Task LoadAsync()
         {
             var timestamp = Stopwatch.GetTimestamp();
@@ -142,10 +152,8 @@ private bool CanUnload()
 
         private async Task ExecuteAsync()
         {
+            await ResultControl.ClearAsync();
             var timestamp = Stopwatch.GetTimestamp();
-            Progress.Clear();
-            ResultVideo = default;
-            CompareVideo = default;
 
             // Run Upscaler
             var upscaledVideo = await UpscaleService.ExecuteAsync(new UpscaleVideoRequest
diff --git a/TensorStack.Common/Tensor/ImageTensor.cs b/TensorStack.Common/Tensor/ImageTensor.cs
@@ -187,12 +187,9 @@ public ImageTensor CloneAs()
         /// <exception cref="System.ArgumentOutOfRangeException">Pixel ({x},{y}) out of range ({imageTensor.Width}x{imageTensor.Height}).</exception>
         public ImagePixel GetPixel(int x, int y)
         {
-            if (x >= Width || y >= Height)
-                throw new ArgumentOutOfRangeException($"Pixel ({x},{y}) out of range ({Width}x{Height}).");
-
-            var pixelIndex = y * Width + x;
             var span = Memory.Span;
             var stride = Height * Width;
+            var pixelIndex = y * Width + x;
             return new ImagePixel(
                 span[0 * stride + pixelIndex],
                 span[1 * stride + pixelIndex],
@@ -212,19 +209,41 @@ public ImagePixel GetPixel(int x, int y)
         /// <exception cref="System.ArgumentOutOfRangeException">Pixel ({x},{y}) out of range ({imageTensor.Width}x{imageTensor.Height}).</exception>
         public void SetPixel(int x, int y, ImagePixel color)
         {
-            if (x >= Width || y >= Height)
-                throw new ArgumentOutOfRangeException($"Pixel ({x},{y}) out of range ({Width}x{Height}).");
-
-            int pixelIndex = y * Width + x;
             var span = Memory.Span;
-            int stride = Height * Width;
+            var stride = Height * Width;
+            var pixelIndex = y * Width + x;
             span[0 * stride + pixelIndex] = color.R;
             span[1 * stride + pixelIndex] = color.G;
             span[2 * stride + pixelIndex] = color.B;
             span[3 * stride + pixelIndex] = color.A;
         }
 
 
+        /// <summary>
+        /// Processes the pixels.
+        /// </summary>
+        /// <param name="processor">The processor.</param>
+        public void ProcessPixels(Func<ImagePixel, ImagePixel> processor)
+        {
+            var span = Memory.Span;
+            var pixelCount = Height * Width;
+            var stride = pixelCount;
+            var r = span.Slice(0 * stride, stride);
+            var g = span.Slice(1 * stride, stride);
+            var b = span.Slice(2 * stride, stride);
+            var a = span.Slice(3 * stride, stride);
+            for (int i = 0; i < pixelCount; i++)
+            {
+                var px = new ImagePixel(r[i], g[i], b[i], a[i]);
+                px = processor(px);
+                r[i] = px.R;
+                g[i] = px.G;
+                b[i] = px.B;
+                a[i] = px.A;
+            }
+        }
+
+
         /// <summary>
         /// Throws if Dimensions are invalid.
         /// </summary>
@@ -250,7 +269,7 @@ private static Memory<float> ProcessChannels(Tensor<float> inputTensor)
 
             var height = inputTensor.Dimensions[2];
             var width = inputTensor.Dimensions[3];
-            int pixelCount = height * width;
+            var pixelCount = height * width;
             var output = new float[pixelCount * 4];
             var inputSpan = inputTensor.Memory.Span;
             var outputSpan = output.AsSpan();
diff --git a/TensorStack.WPF/Controls/VideoStreamElement.xaml.cs b/TensorStack.WPF/Controls/VideoStreamElement.xaml.cs
@@ -171,13 +171,13 @@ public BitmapSource Placeholder
         public string FileSource
         {
             get { return _fileSource; }
-            set { _fileSource = value; NotifyPropertyChanged(); }
+            set { SetProperty(ref _fileSource, value); }
         }
 
         public string FileOverlaySource
         {
             get { return _fileOverlaySource; }
-            set { _fileOverlaySource = value; NotifyPropertyChanged(); }
+            set { SetProperty(ref _fileOverlaySource, value); }
         }
 
         public MediaState MediaState
@@ -189,14 +189,14 @@ public MediaState MediaState
                 VideoControl.LoadedBehavior = _mediaState;
                 if (HasOverlayVideo)
                     VideoOverlayControl.LoadedBehavior = _mediaState;
-                NotifyPropertyChanged();
+                SetProperty(ref _mediaState, value);
             }
         }
 
         public TimeSpan ProgressPosition
         {
             get { return _progressPosition; }
-            set { _progressPosition = value; NotifyPropertyChanged(); }
+            set { SetProperty(ref _progressPosition, value); }
         }
 
 
@@ -243,7 +243,7 @@ private Task OnValueChanged()
         /// <summary>
         /// Clears thes control
         /// </summary>
-        private Task ClearAsync()
+        public Task ClearAsync()
         {
             MediaState = MediaState.Close;
             FileSource = null;
