Fix video frame result callback

Author: saddam213

OnnxStack.StableDiffusion/Pipelines/Base/PipelineBase.cs

@@ -218,7 +218,6 @@ protected async IAsyncEnumerable<DenseTensor<float>> DiffuseVideoAsync(IDiffuser
 
             var frameIndex = 0;
             var videoFrames = promptOptions.InputVideo.Frames;
-            var schedulerFrameCallback = CreateBatchCallback(progressCallback, videoFrames.Count, () => frameIndex);
             foreach (var videoFrame in videoFrames)
             {
                 if (promptOptions.DiffuserType == DiffuserType.ControlNet || promptOptions.DiffuserType == DiffuserType.ControlNetImage)
@@ -234,7 +233,7 @@ protected async IAsyncEnumerable<DenseTensor<float>> DiffuseVideoAsync(IDiffuser
                     promptOptions.InputImage = videoFrame;
                 }
 
-                var frameResultTensor = await diffuser.DiffuseAsync(promptOptions, schedulerOptions, promptEmbeddings, performGuidance, schedulerFrameCallback, cancellationToken);
+                var frameResultTensor = await diffuser.DiffuseAsync(promptOptions, schedulerOptions, promptEmbeddings, performGuidance, progressCallback, cancellationToken);
 
                 // Frame Progress
                 ReportBatchProgress(progressCallback, ++frameIndex, videoFrames.Count, frameResultTensor);
@@ -296,7 +295,9 @@ protected Action<DiffusionProgress> CreateBatchCallback(Action<DiffusionProgress
                 StepValue = progress.StepValue,
                 StepTensor = progress.StepTensor,
                 BatchMax = batchCount,
-                BatchValue = batchIndex()
+                BatchValue = batchIndex(),
+                BatchTensor = progress.BatchTensor,
+                Message = progress.Message
             });
         }
 

OnnxStack.UI/Views/VideoToVideoView.xaml.cs

@@ -379,11 +379,13 @@ private Action<DiffusionProgress> ProgressCallback()
                     if (_cancelationTokenSource.IsCancellationRequested)
                         return;
 
+                    if (progress.BatchTensor is null)
+                        ProgressText = $"Frame: {progress.BatchValue:D2}/{_videoFrames.Frames.Count}  |  Step: {progress.StepValue:D2}/{progress.StepMax:D2}";
+
                     if (progress.BatchTensor is not null)
                     {
                         PreviewResult = Utils.CreateBitmap(new OnnxImage(progress.BatchTensor).GetImageBytes());
                         PreviewSource = UpdatePreviewFrame(progress.BatchValue - 1);
-                        ProgressText = $"Video Frame {progress.BatchValue} of {_videoFrames.Frames.Count} complete";
                     }
 
                     if (ProgressText != progress.Message && progress.BatchMax == 0)