videoi fix

Author: KSemenenko

docs/Features/GoLiveRuntime.md

@@ -21,7 +21,7 @@ The runtime now owns real browser media outputs for the composed program scene a
 
 - `Go Live` auto-seeds the first available browser camera into the scene when the scene is empty and the browser exposes a real camera list
 - the center program stage always shows the currently selected scene camera, while the right preview rail shows the current program source and only marks it live once recording or streaming is active
-- `Go Live` builds one browser-side program stream from the scene camera cards by drawing the selected primary camera full-frame and then layering additional included cameras as positioned overlays on a canvas
+- `Go Live` builds one browser-side program stream from the scene camera cards by drawing the selected primary camera full-frame; additional included cameras are layered as positioned overlays only when the operator explicitly chooses a multi-source layout instead of the default `Full` layout
 - the scene `AudioBus` is mixed into one program audio track through `AudioContext`, delay, and gain nodes before the final program stream is published or recorded
 - OBS browser output stays browser-only and exposes the composed program audio inside an OBS Browser Source environment
 - `VDO.Ninja` publishing uses the vendored official browser SDK and publishes the same composed `MediaStream` that powers preview, recording, and OBS

src/PrompterOne.Shared/Contracts/UiTestIds.cs

@@ -444,6 +444,9 @@ public static class GoLive
         public const string StreamIncludeCamera = "go-live-stream-include-camera";
         public const string StreamTextOverlay = "go-live-stream-text-overlay";
         public const string TakeToAir = "go-live-take-to-air";
+        public const string LayoutFull = "go-live-layout-full";
+        public const string LayoutSplit = "go-live-layout-split";
+        public const string LayoutPictureInPicture = "go-live-layout-picture-in-picture";
         public const string TwitchKey = "go-live-twitch-key";
         public const string TwitchToggle = "go-live-twitch-toggle";
         public const string TwitchUrl = "go-live-twitch-url";

src/PrompterOne.Shared/GoLive/Components/GoLiveSceneControls.razor

@@ -39,6 +39,7 @@
             <span class="gl-tools-label">Layout</span>
             <button type="button"
                     class="gl-scene-btn @(ActiveLayout == GoLiveSceneLayout.Full ? "active" : null)"
+                    data-testid="@UiTestIds.GoLive.LayoutFull"
                     @onclick="() => SelectLayout.InvokeAsync(GoLiveSceneLayout.Full)">
                 <svg width="14"
                      height="14"
@@ -52,6 +53,7 @@
             </button>
             <button type="button"
                     class="gl-scene-btn @(ActiveLayout == GoLiveSceneLayout.Split ? "active" : null)"
+                    data-testid="@UiTestIds.GoLive.LayoutSplit"
                     @onclick="() => SelectLayout.InvokeAsync(GoLiveSceneLayout.Split)">
                 <svg width="14"
                      height="14"
@@ -66,6 +68,7 @@
             </button>
             <button type="button"
                     class="gl-scene-btn @(ActiveLayout == GoLiveSceneLayout.PictureInPicture ? "active" : null)"
+                    data-testid="@UiTestIds.GoLive.LayoutPictureInPicture"
                     @onclick="() => SelectLayout.InvokeAsync(GoLiveSceneLayout.PictureInPicture)">
                 <svg width="14"
                      height="14"

src/PrompterOne.Shared/GoLive/Pages/GoLivePage.Runtime.cs

@@ -1,4 +1,5 @@
 using PrompterOne.Core.Models.Media;
+using PrompterOne.Shared.Components.GoLive;
 using PrompterOne.Shared.Services;
 
 namespace PrompterOne.Shared.Pages;
@@ -9,6 +10,7 @@ private GoLiveOutputRuntimeRequest BuildRuntimeRequest(SceneCameraSource? camera
         GoLiveOutputRequestFactory.Build(
             camera,
             MediaSceneService.State,
+            _activeSceneLayout != GoLiveSceneLayout.Full,
             _studioSettings.Streaming,
             _recordingPreferences,
             _sessionTitle);

src/PrompterOne.Shared/GoLive/Pages/GoLivePage.StudioSurface.cs

@@ -406,10 +406,22 @@ private Task AddSceneAsync()
         return Task.CompletedTask;
     }
 
-    private Task SelectSceneLayoutAsync(GoLiveSceneLayout layout)
+    private async Task SelectSceneLayoutAsync(GoLiveSceneLayout layout)
     {
         _activeSceneLayout = layout;
-        return Task.CompletedTask;
+        if (!GoLiveOutputRuntime.State.HasActiveOutputs)
+        {
+            return;
+        }
+
+        await EnsurePageReadyAsync();
+        var programCamera = ActiveCamera ?? SelectedCamera;
+        if (programCamera is null)
+        {
+            return;
+        }
+
+        await GoLiveOutputRuntime.UpdateProgramSourceAsync(BuildRuntimeRequest(programCamera));
     }
 
     private Task SelectTransitionKindAsync(GoLiveTransitionKind kind)

src/PrompterOne.Shared/GoLive/Services/GoLiveOutputRequestFactory.cs

@@ -19,14 +19,15 @@ public static class GoLiveOutputRequestFactory
     public static GoLiveOutputRuntimeRequest Build(
         SceneCameraSource? primaryCamera,
         MediaSceneState scene,
+        bool allowOverlaySources,
         StreamStudioSettings streaming,
         SettingsPagePreferences recordingPreferences,
         string recordingFileStem)
     {
         var liveKitDestination = ResolveLiveKitDestination(streaming);
         var vdoNinjaDestination = ResolveVdoNinjaDestination(streaming);
         var programVideo = ResolveProgramVideo(streaming.OutputResolution);
-        var videoSources = BuildVideoSources(primaryCamera, scene.Cameras);
+        var videoSources = BuildVideoSources(primaryCamera, scene.Cameras, allowOverlaySources);
         var audioInputs = BuildAudioInputs(scene);
         var recording = BuildRecordingExport(recordingPreferences, recordingFileStem);
 
@@ -171,7 +172,8 @@ private static GoLiveProgramVideoSettings ResolveProgramVideo(StreamingResolutio
 
     private static IReadOnlyList<GoLiveOutputVideoSource> BuildVideoSources(
         SceneCameraSource? primaryCamera,
-        IReadOnlyList<SceneCameraSource> cameras)
+        IReadOnlyList<SceneCameraSource> cameras,
+        bool allowOverlaySources)
     {
         return cameras.Select(camera => new GoLiveOutputVideoSource(
                 SourceId: camera.SourceId,
@@ -186,13 +188,26 @@ private static IReadOnlyList<GoLiveOutputVideoSource> BuildVideoSources(
                     camera.Transform.MirrorHorizontal,
                     camera.Transform.MirrorVertical,
                     camera.Transform.Visible,
-                    camera.Transform.IncludeInOutput,
+                    ShouldIncludeInOutput(camera, primaryCamera, allowOverlaySources),
                     camera.Transform.ZIndex,
                     camera.Transform.Opacity),
                 IsPrimary: string.Equals(camera.SourceId, primaryCamera?.SourceId, StringComparison.Ordinal)))
             .ToList();
     }
 
+    private static bool ShouldIncludeInOutput(
+        SceneCameraSource camera,
+        SceneCameraSource? primaryCamera,
+        bool allowOverlaySources)
+    {
+        if (string.Equals(camera.SourceId, primaryCamera?.SourceId, StringComparison.Ordinal))
+        {
+            return true;
+        }
+
+        return allowOverlaySources && camera.Transform.IncludeInOutput;
+    }
+
     private static int ResolveAudioChannelCount(string channelLabel)
     {
         return string.Equals(channelLabel, RecordingPreferenceCatalog.AudioChannels.Mono, StringComparison.Ordinal)

tests/PrompterOne.App.Tests/GoLive/GoLiveSessionInteractionTests.cs

@@ -283,6 +283,7 @@ record => string.Equals(record.Identifier, StartLocalRecordingInteropMethod, Str
 
         Assert.Equal(AppTestData.Camera.FirstSourceId, request.PrimarySourceId);
         Assert.Equal(2, request.VideoSources.Count);
+        Assert.Equal(1, request.VideoSources.Count(source => source.IsRenderable));
         Assert.Equal(2, request.AudioInputs.Count);
         Assert.Equal(StreamingResolutionLabel, request.ProgramVideo.ResolutionLabel);
         Assert.Equal(VideoFrameRateLabel, request.ProgramVideo.FrameRateLabel);
@@ -295,6 +296,34 @@ record => string.Equals(record.Identifier, StartLocalRecordingInteropMethod, Str
         Assert.True(request.Recording.PreferFilePicker);
     }
 
+    [Fact]
+    public void GoLivePage_StartRecording_WithPictureInPictureLayout_KeepsOverlaySourcesRenderable()
+    {
+        SeedSceneState(CreateSceneWithTwoAudioInputs());
+        SeedStudioSettings(StudioSettings.Default with
+        {
+            Streaming = StudioSettings.Default.Streaming with
+            {
+                LocalRecordingEnabled = true,
+                OutputResolution = StreamingResolutionPreset.FullHd1080p30
+            }
+        });
+
+        Services.GetRequiredService<NavigationManager>().NavigateTo(AppTestData.Routes.GoLiveDemo);
+        var cut = Render<GoLivePage>();
+
+        cut.WaitForAssertion(() => Assert.NotNull(cut.FindByTestId(UiTestIds.GoLive.Page)));
+        cut.FindByTestId(UiTestIds.GoLive.LayoutPictureInPicture).Click();
+        cut.FindByTestId(UiTestIds.GoLive.StartRecording).Click();
+
+        var invocation = Assert.Single(
+            _harness.JsRuntime.InvocationRecords,
+            record => string.Equals(record.Identifier, StartLocalRecordingInteropMethod, StringComparison.Ordinal));
+        var request = Assert.IsType<GoLiveOutputRuntimeRequest>(invocation.Arguments[1]);
+
+        Assert.Equal(2, request.VideoSources.Count(source => source.IsRenderable));
+    }
+
     private static MediaSceneState CreateTwoCameraScene() =>
         new(
             [

tests/PrompterOne.App.UITests/GoLive/GoLiveShellSessionFlowTests.cs

@@ -157,6 +157,7 @@ await page.WaitForFunctionAsync(
             var recordingState = runtimeState.GetProperty("recording");
 
             Assert.Equal(BrowserTestConstants.GoLive.SecondSourceId, programState.GetProperty("primarySourceId").GetString());
+            Assert.Equal(1, programState.GetProperty("videoSourceCount").GetInt32());
             Assert.True(programState.GetProperty("width").GetInt32() > 0);
             Assert.True(programState.GetProperty("height").GetInt32() > 0);
             Assert.False(string.IsNullOrWhiteSpace(recordingState.GetProperty("fileName").GetString()));