修复播放崩溃的问题 (#821)

* 调整弹幕加载逻辑 * Update
Richasy · Oct 15, 2024 · 7f5d650 · 7f5d650
1 parent db50d11
commit 7f5d650
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 105 deletions.
diff --git a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/BiliPlayer.Methods.cs b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/BiliPlayer.Methods.cs
@@ -278,7 +278,6 @@ private void OnRootPointerEntered(object sender, PointerRoutedEventArgs e)
 
     private void OnRootPointerMoved(object sender, PointerRoutedEventArgs e)
     {
-        _gestureRecognizer.ProcessMoveEvents(e.GetIntermediatePoints((UIElement)sender));
         HandlePointerEvent(e);
     }
 

diff --git a/src/Desktop/BiliCopilot.UI/Controls/Danmaku/LiveDanmakuPanel.xaml b/src/Desktop/BiliCopilot.UI/Controls/Danmaku/LiveDanmakuPanel.xaml
@@ -8,5 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid" Visibility="{x:Bind ViewModel.IsShowDanmaku, Mode=OneWay}" />
+    <Grid
+        x:Name="RootGrid"
+        x:Load="{x:Bind ViewModel.CanShowDanmaku, Mode=OneWay}"
+        Visibility="{x:Bind ViewModel.IsShowDanmaku, Mode=OneWay}" />
 </local:DanmakuControlBase>
diff --git a/src/Desktop/BiliCopilot.UI/Controls/Danmaku/LiveDanmakuPanel.xaml.cs b/src/Desktop/BiliCopilot.UI/Controls/Danmaku/LiveDanmakuPanel.xaml.cs
@@ -129,7 +129,7 @@ private void ResetDanmakuStyle()
 
     private void Redraw()
     {
-        DispatcherQueue.TryEnqueue(() =>
+        DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
         {
             _danmakuController?.Close();
             _danmakuController = new DanmakuFrostMaster(RootGrid, this.Get<ILogger<DanmakuFrostMaster>>());

diff --git a/src/Desktop/BiliCopilot.UI/Controls/Danmaku/VideoDanmakuPanel.xaml b/src/Desktop/BiliCopilot.UI/Controls/Danmaku/VideoDanmakuPanel.xaml
@@ -8,5 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid" Visibility="{x:Bind ViewModel.IsShowDanmaku, Mode=OneWay}" />
+    <Grid
+        x:Name="RootGrid"
+        x:Load="{x:Bind ViewModel.CanShowDanmaku, Mode=OneWay}"
+        Visibility="{x:Bind ViewModel.IsShowDanmaku, Mode=OneWay}" />
 </local:DanmakuControlBase>
diff --git a/src/Desktop/BiliCopilot.UI/Controls/Danmaku/VideoDanmakuPanel.xaml.cs b/src/Desktop/BiliCopilot.UI/Controls/Danmaku/VideoDanmakuPanel.xaml.cs
@@ -104,12 +104,13 @@ private async void OnDanmakuListAddedAsync(object? sender, IReadOnlyList<Danmaku
         _cachedDanmakus = _cachedDanmakus.Concat(items).Distinct().ToList();
         if (isFirstLoad)
         {
-            await Task.Delay(150);
+            await Task.Delay(250);
             Redraw(true);
-            return;
         }
-
-        _danmakuController?.AddDanmakuList(items);
+        else
+        {
+            _danmakuController?.AddDanmakuList(items);
+        }
     }
 
     private void OnRequestClearDanmaku(object? sender, EventArgs e)
@@ -194,16 +195,10 @@ private void Redraw(bool force = false)
             return;
         }
 
-        DispatcherQueue?.TryEnqueue(() =>
+        DispatcherQueue?.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
         {
-            if (_danmakuController is not null)
-            {
-                _danmakuController?.Clear();
-            }
-            else
-            {
-                _danmakuController = new DanmakuFrostMaster(RootGrid, this.Get<ILogger<DanmakuFrostMaster>>());
-            }
+            _danmakuController?.Close();
+            _danmakuController = new DanmakuFrostMaster(RootGrid, this.Get<ILogger<DanmakuFrostMaster>>());
 
             if (_cachedDanmakus.Any())
             {
@@ -212,11 +207,6 @@ private void Redraw(bool force = false)
 
             _danmakuController.UpdateTime(Convert.ToUInt32(_lastProgress * 1000));
             ResetDanmakuStyle();
-
-            if (!ViewModel.IsPaused)
-            {
-                _danmakuController.Resume();
-            }
         });
     }
 }
diff --git a/src/Desktop/BiliCopilot.UI/ViewModels/Core/DanmakuViewModel/DanmakuViewModel.cs b/src/Desktop/BiliCopilot.UI/ViewModels/Core/DanmakuViewModel/DanmakuViewModel.cs
@@ -91,6 +91,7 @@ public void ClearAll()
         _duration = 0;
         _aid = string.Empty;
         _cid = string.Empty;
+        CanShowDanmaku = false;
         ClearDanmaku();
     }
 
@@ -146,10 +147,10 @@ private async Task LoadDanmakusAsync(int duration)
 
         if (totalDanmakus.Count > 0)
         {
+            CanShowDanmaku = true;
             ListAdded?.Invoke(this, totalDanmakus);
         }
 
-        Redraw();
         IsLoading = false;
     }
 
@@ -171,6 +172,7 @@ private async Task SendDanmakuAsync(string text)
     [RelayCommand]
     private void AddDanmaku(string text)
     {
+        CanShowDanmaku = true;
         RequestAddSingleDanmaku?.Invoke(this, text);
     }
 
@@ -208,11 +210,6 @@ partial void OnIsShowDanmakuChanged(bool value)
         {
             Redraw();
         }
-        else
-        {
-            ClearDanmaku();
-            ResetStyle();
-        }
 
         SettingsToolkit.WriteLocalSetting(Models.Constants.SettingNames.IsShowDanmaku, value);
     }

diff --git a/src/Desktop/BiliCopilot.UI/ViewModels/Core/SubtitleViewModel.cs b/src/Desktop/BiliCopilot.UI/ViewModels/Core/SubtitleViewModel.cs
@@ -96,7 +96,6 @@ public void ClearAll()
         _aid = default;
         _cid = default;
         _subtitles = default;
-        Metas = default;
         SelectedMeta = default;
         _position = 0;
         IsAvailable = false;

diff --git a/...liCopilot.UI/ViewModels/View/VideoPlayerPageViewModel/VideoPlayerPageViewModel.Methods.cs b/...liCopilot.UI/ViewModels/View/VideoPlayerPageViewModel/VideoPlayerPageViewModel.Methods.cs
@@ -177,12 +177,7 @@ private void ClearView()
         BvId = default;
         FavoriteFolders = default;
         HasNextVideo = false;
-
-        Formats = default;
         SelectedFormat = default;
-
-        Sections = default;
-        SelectedSection = default;
     }
 
     private void CalcPlayerHeight()

diff --git a/src/Libs/Danmaku.Core/DanmakuFrostMaster.cs b/src/Libs/Danmaku.Core/DanmakuFrostMaster.cs
@@ -46,7 +46,11 @@ public DanmakuFrostMaster(Grid rootGrid, ILogger<DanmakuFrostMaster> logger = de
                 return;
             }
 
-            var canvas = new CanvasSwapChainPanel();
+            var canvas = new CanvasAnimatedControl();
+            canvas.UseSharedDevice = true;
+            canvas.DpiScale = (float)rootGrid.XamlRoot.RasterizationScale;
+            canvas.ClearColor = Colors.Transparent;
+            canvas.Background = new SolidColorBrush(Colors.Transparent);
             rootGrid.Children.Add(canvas);
             Logger.SetLogger(logger);
 
@@ -179,6 +183,7 @@ public void Seek(uint targetMs)
             }
 
             _isSeeking = true;
+            Stop();
             lock (_danmakuList)
             {
                 _lastIndex = 0;
@@ -192,10 +197,9 @@ public void Seek(uint targetMs)
                             break;
                         }
                     }
-
-                    _render?.Start();
                 }
                 _lastTimeMs = targetMs;
+                Resume();
                 _isSeeking = false;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
         private void OnRootPointerMoved(object sender, PointerRoutedEventArgs e)
         {
-            _gestureRecognizer.ProcessMoveEvents(e.GetIntermediatePoints((UIElement)sender));
             HandlePointerEvent(e);
         }
@@ Expand Down @@