Skip to content

Fix initialization of video/stream toggle #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix initialization of video/stream toggle #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a68a5e
Fix initialization of video/stream toggle
ZebraNorth Oct 10, 2025
cafbd99
Fix enabling screen after play
ZebraNorth Oct 19, 2025
028f06a
Fix the standby texture
ZebraNorth Oct 19, 2025
2ac17e2
Merge pull request #1 from ZebraNorth/fix-multiple-screens
ZebraNorth Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Assets/USharpVideo/Scripts/USharpVideoPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,8 +1333,13 @@ public void RegisterControlHandler(VideoControlHandler newControlHandler)
VideoPlayerManager manager = GetVideoManager();
newControlHandler.SetVolume(manager.GetVolume());
newControlHandler.SetMuted(manager.IsMuted());

if (IsUsingUnityPlayer())
newControlHandler.SetToVideoPlayerMode();
else
newControlHandler.SetToStreamPlayerMode();
}

public void UnregisterControlHandler(VideoControlHandler controlHandler)
{
if (_registeredControlHandlers == null)
Expand Down Expand Up @@ -1442,6 +1447,8 @@ public void RegisterScreenHandler(VideoScreenHandler newScreenHandler)
return;
}

newScreenHandler.UpdateVideoTexture(_lastAssignedRenderTexture, IsUsingAVProPlayer());

VideoScreenHandler[] newControlHandlers = new VideoScreenHandler[_registeredScreenHandlers.Length + 1];
_registeredScreenHandlers.CopyTo(newControlHandlers, 0);
_registeredScreenHandlers = newControlHandlers;
Expand Down Expand Up @@ -1490,7 +1497,7 @@ private void UpdateRenderTexture()

foreach (VideoScreenHandler handler in _registeredScreenHandlers)
{
if (handler)
if (handler && handler.GetVideoTexture() != renderTexture)
{
handler.UpdateVideoTexture(renderTexture, IsUsingAVProPlayer());
}
Expand Down
11 changes: 1 addition & 10 deletions Assets/USharpVideo/Scripts/Utility/VideoScreenHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,9 @@ public class VideoScreenHandler : UdonSharpBehaviour
private Renderer targetRenderer;
private Texture lastRenderTexture;

private void Start()
{
targetRenderer = GetComponent<Renderer>();

OnEnable();
}

private void OnEnable()
{
targetRenderer = GetComponent<Renderer>();
SetSourceVideoPlayer(sourceVideoPlayer);
}

Expand All @@ -57,9 +51,6 @@ public Texture GetVideoTexture()

public void UpdateVideoTexture(Texture renderTexture, bool isAVPro)
{
if (renderTexture == lastRenderTexture)
return;

if (targetRenderer)
{
Material rendererMat;
Expand Down