MoonsideGames
/
MoonWorks
1
0
Fork 1
Code Issues 4 Pull Requests Projects Releases 1 Activity

some more threading changes

refresh2
cosmonaut 2024-03-11 18:04:50 -07:00
parent 0fbe241848
commit 871b32d742
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Video/VideoPlayer.cs
View File

@ -154,7 +154,7 @@ namespace MoonWorks.Video
lastTimestamp = 0; lastTimestamp = 0;
timeElapsed = 0; timeElapsed = 0;
InitializeDav1dStream(); ResetDav1dStream();
State = VideoState.Stopped; State = VideoState.Stopped;
} }
@ -168,7 +168,13 @@ namespace MoonWorks.Video
ResetTask?.Wait(); ResetTask?.Wait();
ResetSecondaryStreamTask?.Wait(); ResetSecondaryStreamTask?.Wait();
Stop(); timer.Stop();
timer.Reset();
lastTimestamp = 0;
timeElapsed = 0;
State = VideoState.Stopped;
Video.StreamA.Unload(); Video.StreamA.Unload();
Video.StreamB.Unload(); Video.StreamB.Unload();
@ -211,8 +217,8 @@ namespace MoonWorks.Video
timer.Stop(); timer.Stop();
timer.Reset(); timer.Reset();
ResetTask = Task.Run(CurrentStream.Reset); ResetSecondaryStreamTask = Task.Run(CurrentStream.Reset);
ResetTask.ContinueWith(HandleTaskException, TaskContinuationOptions.OnlyOnFaulted); ResetSecondaryStreamTask.ContinueWith(HandleTaskException, TaskContinuationOptions.OnlyOnFaulted);
if (Loop) if (Loop)
{ {
@ -332,9 +338,26 @@ namespace MoonWorks.Video
private void InitializeDav1dStream() private void InitializeDav1dStream()
{ {
Video.StreamA.Load(); ReadNextFrameTask?.Wait();
Video.StreamB.Load(); ReadNextFrameTask = null;
ResetTask?.Wait();
ResetTask = null;
ResetSecondaryStreamTask?.Wait();
ResetSecondaryStreamTask = null;
ResetTask = Task.Run(Video.StreamA.Load);
ResetTask.ContinueWith(HandleTaskException, TaskContinuationOptions.OnlyOnFaulted);
ResetSecondaryStreamTask = Task.Run(Video.StreamB.Load);
ResetSecondaryStreamTask.ContinueWith(HandleTaskException, TaskContinuationOptions.OnlyOnFaulted);
CurrentStream = Video.StreamA;
currentFrame = -1;
}
private void ResetDav1dStream()
{
ReadNextFrameTask?.Wait(); ReadNextFrameTask?.Wait();
ReadNextFrameTask = null; ReadNextFrameTask = null;