修复媒体信息更新问题 (#271)

Author: Richasy

src/ViewModels/Components/FlyleafPlayerViewModel/FlyleafPlayerViewModel.Methods.cs

@@ -32,13 +32,13 @@ public sealed partial class FlyleafPlayerViewModel
     /// <returns><see cref="MediaStats"/>.</returns>
     public MediaStats GetMediaInformation()
     {
-        if (Player == null || !((Player)Player).CanPlay)
+        if (Player is not Player player || !player.CanPlay)
         {
             return null;
         }
 
-        var video = ((Player)Player).Video;
-        var audio = ((Player)Player).Audio;
+        var video = player.Video;
+        var audio = player.Audio;
         var fps = video?.FPS ?? -1;
         var width = video.Width;
         var height = video.Height;
@@ -66,6 +66,7 @@ public MediaStats GetMediaInformation()
             AudioChannels = channels,
         };
 
+        IsStatsUpdated = true;
         return mediaInfo;
     }
 

src/ViewModels/Components/FlyleafPlayerViewModel/FlyleafPlayerViewModel.Properties.cs

@@ -78,4 +78,7 @@ public sealed partial class FlyleafPlayerViewModel
 
     /// <inheritdoc/>
     public bool IsMediaStatsSupported => true;
+
+    /// <inheritdoc/>
+    public bool IsStatsUpdated { get; set; }
 }

src/ViewModels/Components/FlyleafPlayerViewModel/FlyleafPlayerViewModel.cs

@@ -46,7 +46,7 @@ public void Initialize()
                 LogLevel = LogLevel.Debug,
                 LogOutput = ":debug",
 #endif
-                UIRefresh = false,
+                UIRefresh = true,
                 UICurTimePerSecond = true,
             };
             Engine.Start(engineConfig);
@@ -57,15 +57,15 @@ public void Initialize()
         var config = new Config();
         config.Subtitles.Enabled = true;
         config.Player.SeekAccurate = true;
-        config.Decoder.ZeroCopy = ZeroCopy.Auto;
         config.Video.VideoProcessor = SettingsToolkit.ReadLocalSetting(SettingNames.VideoProcessor, VideoProcessors.D3D11);
         config.Video.VideoAcceleration = SettingsToolkit.ReadLocalSetting(SettingNames.VideoAcceleration, true);
         config.Video.SwsForce = SettingsToolkit.ReadLocalSetting(SettingNames.DecodeType, DecodeType.HardwareDecode) == DecodeType.SoftwareDecode;
         config.Video.SwsHighQuality = true;
-        config.Video.VSync = 1;
+        config.Video.VSync = 0;
         config.Video.ClearScreenOnOpen = true;
         config.Video.Swap10Bit = true;
-        config.Player.MinBufferDuration = TimeSpan.FromSeconds(5).Ticks;
+        config.Player.MinBufferDuration = TimeSpan.FromSeconds(10).Ticks;
+        config.Decoder.LowDelay = true;
 
         var player = new Player(config);
         player.PropertyChanged += OnPlayerPropertyChanged;
@@ -150,7 +150,7 @@ public void Play()
     public void SeekTo(TimeSpan time)
     {
         if (time.TotalMilliseconds >= Duration.TotalMilliseconds
-            || Math.Abs(time.TotalSeconds - Position.TotalSeconds) < 1)
+            || Math.Abs(time.TotalSeconds - Position.TotalSeconds) < 2)
         {
             return;
         }

src/ViewModels/Components/NativePlayerViewModel/NativePlayerViewModel.Properties.cs

@@ -77,4 +77,7 @@ public sealed partial class NativePlayerViewModel
 
     /// <inheritdoc/>
     public bool IsMediaStatsSupported => false;
+
+    /// <inheritdoc/>
+    public bool IsStatsUpdated { get; set; }
 }

src/ViewModels/Components/PlayerDetailViewModel/PlayerDetailViewModel.cs

@@ -247,6 +247,7 @@ private async Task ChangeFormatAsync(FormatInformation information)
         }
 
         Player.Stop();
+        Player.IsStatsUpdated = false;
         if (_videoType is VideoType.Video
             or VideoType.Pgc)
         {

src/ViewModels/IPlayerViewModel.cs

@@ -126,6 +126,11 @@ public interface IPlayerViewModel : INotifyPropertyChanged, IDisposable
     /// </summary>
     bool IsMediaStatsSupported { get; }
 
+    /// <summary>
+    /// 是否已经更新媒体信息.
+    /// </summary>
+    bool IsStatsUpdated { get; set; }
+
     /// <summary>
     /// 初始化.
     /// </summary>

src/ViewModels/Views/LivePlayerPageViewModel/LivePlayerPageViewModel.Methods.cs

@@ -108,8 +108,8 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
     {
         if (e.PropertyName.Equals(nameof(PlayerDetail.Status))
             && PlayerDetail.Status == PlayerStatus.Playing
-            && !_isStatsUpdated
             && PlayerDetail.Player != null
+            && !PlayerDetail.Player.IsStatsUpdated
             && PlayerDetail.Player.IsMediaStatsSupported)
         {
             UpdateLiveMediaInformation();
@@ -129,6 +129,5 @@ private void UpdateLiveMediaInformation()
             PlayUrl = PlayerDetail.GetLivePlayUrl(),
         };
         Stats = media;
-        _isStatsUpdated = true;
     }
 }

src/ViewModels/Views/LivePlayerPageViewModel/LivePlayerPageViewModel.Properties.cs

@@ -20,7 +20,6 @@ public sealed partial class LivePlayerPageViewModel
     private DispatcherTimer _heartBeatTimer;
     private string _presetRoomId;
     private Window _attachedWindow;
-    private bool _isStatsUpdated;
 
     [ObservableProperty]
     private LivePlayerView _view;

src/ViewModels/Views/LivePlayerPageViewModel/LivePlayerPageViewModel.cs

@@ -86,7 +86,6 @@ public void Dispose()
     private void Reset()
     {
         View = null;
-        _isStatsUpdated = false;
         ResetTimers();
         ResetPublisher();
         ResetOverview();

src/ViewModels/Views/PgcPlayerPageViewModel/PgcPlayerPageViewModel.Methods.cs

@@ -252,8 +252,8 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
     {
         if (e.PropertyName == nameof(PlayerDetail.Status)
             && PlayerDetail.Status == PlayerStatus.Playing
-            && !_isStatsUpdated
             && PlayerDetail.Player != null
+            && !PlayerDetail.Player.IsStatsUpdated
             && PlayerDetail.Player.IsMediaStatsSupported)
         {
             var info = PlayerDetail.Player.GetMediaInformation();
@@ -268,8 +268,6 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
                 AudioUrl = PlayerDetail.GetAudioPlayUrl(),
             };
             Stats = media;
-
-            _isStatsUpdated = true;
         }
     }
 }

src/ViewModels/Views/PgcPlayerPageViewModel/PgcPlayerPageViewModel.Properties.cs

@@ -21,7 +21,6 @@ public sealed partial class PgcPlayerPageViewModel
     private Action _playNextEpisodeAction;
     private Action _playPreviousEpisodeAction;
     private Window _attachedWindow;
-    private bool _isStatsUpdated;
 
     [ObservableProperty]
     private bool _isReloading;

src/ViewModels/Views/PgcPlayerPageViewModel/PgcPlayerPageViewModel.cs

@@ -84,7 +84,6 @@ public void Dispose()
     private void Clear()
     {
         View = null;
-        _isStatsUpdated = false;
         ResetOverview();
         ResetOperation();
         ResetCommunityInformation();

src/ViewModels/Views/SettingsPageViewModel/SettingsPageViewModel.cs

@@ -59,6 +59,7 @@ public void InitializeSettings()
         IsNotificationEnabled = ReadSetting(SettingNames.IsNotifyEnabled, true);
         IsVideoDynamicNotificationEnabled = ReadSetting(SettingNames.DynamicNotificationEnabled, true);
         VideoProcessor = ReadSetting(SettingNames.VideoProcessor, VideoProcessors.D3D11);
+        IsVideoNativePlayer = PlayerType == PlayerType.Native;
         WebPlayerInit();
         PreferCodecInit();
         DecodeInit();

src/ViewModels/Views/VideoPlayerPageViewModel/VideoPlayerPageViewModel.Methods.cs

@@ -327,8 +327,8 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
     {
         if (e.PropertyName == nameof(PlayerDetail.Status)
             && PlayerDetail.Status == PlayerStatus.Playing
-            && !_isStatsUpdated
             && PlayerDetail.Player != null
+            && !PlayerDetail.Player.IsStatsUpdated
             && PlayerDetail.Player.IsMediaStatsSupported)
         {
             var info = PlayerDetail.Player.GetMediaInformation();
@@ -343,8 +343,6 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
                 AudioUrl = PlayerDetail.GetAudioPlayUrl(),
             };
             Stats = media;
-
-            _isStatsUpdated = true;
         }
     }
 }

src/ViewModels/Views/VideoPlayerPageViewModel/VideoPlayerPageViewModel.Properties.cs

@@ -23,7 +23,6 @@ public sealed partial class VideoPlayerPageViewModel
     private Action _playPreviousVideoAction;
     private bool _isInPrivate;
     private Window _attachedWindow;
-    private bool _isStatsUpdated;
 
     [ObservableProperty]
     private VideoPlayerView _view;

src/ViewModels/Views/VideoPlayerPageViewModel/VideoPlayerPageViewModel.cs

@@ -106,7 +106,6 @@ public void Dispose()
     private void Reset()
     {
         View = null;
-        _isStatsUpdated = false;
         ResetPublisher();
         ResetOverview();
         ResetOperation();

src/ViewModels/Views/WebDavPlayerPageViewModel/WebDavPlayerPageViewModel.Methods.cs

@@ -198,8 +198,8 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
     {
         if (e.PropertyName == nameof(PlayerDetail.Status)
             && PlayerDetail.Status == PlayerStatus.Playing
-            && !_isStatsUpdated
             && PlayerDetail.Player != null
+            && !PlayerDetail.Player.IsStatsUpdated
             && PlayerDetail.Player.IsMediaStatsSupported)
         {
             var info = PlayerDetail.Player.GetMediaInformation();
@@ -210,8 +210,6 @@ private void OnPlayerDetailPropertyChanged(object sender, PropertyChangedEventAr
 
             var media = new VideoMediaStats(info);
             Stats = media;
-
-            _isStatsUpdated = true;
         }
     }
 }

src/ViewModels/Views/WebDavPlayerPageViewModel/WebDavPlayerPageViewModel.Properties.cs

@@ -20,7 +20,6 @@ public sealed partial class WebDavPlayerPageViewModel
     private WebDavConfig _config;
     private Action _playNextVideoAction;
     private Action _playPreviousVideoAction;
-    private bool _isStatsUpdated;
     private Window _attachedWindow;
 
     [ObservableProperty]

src/ViewModels/Views/WebDavPlayerPageViewModel/WebDavPlayerPageViewModel.cs

@@ -98,7 +98,6 @@ private void Reset()
     {
         Playlist.Clear();
         ResetInfo();
-        _isStatsUpdated = false;
     }
 
     [RelayCommand]