#831 #767 #723 #587 支持设置优先播放器类型

ywmoyue · Sep 29, 2024 · 56acfcf · 56acfcf
1 parent b239e72
commit 56acfcf
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 23 deletions.
diff --git a/src/BiliLite.UWP/BiliLite.UWP.csproj b/src/BiliLite.UWP/BiliLite.UWP.csproj
@@ -207,6 +207,7 @@
     <Compile Include="Models\Common\Danmaku\BiliDanmakuItem.cs" />
     <Compile Include="Models\Common\Dynamic\DynamicUgcSeasonCardModel.cs" />
     <Compile Include="Models\Common\MarkdownViewerPagerParameter.cs" />
+    <Compile Include="Models\Common\Player\RealPlayerType.cs" />
     <Compile Include="Models\Common\Player\PlaySpeedMenu.cs" />
     <Compile Include="Models\Common\Season\EpisodeSkip.cs" />
     <Compile Include="Models\Common\Player\PlayerSkipItem.cs" />

diff --git a/src/BiliLite.UWP/Controls/Player.xaml.cs b/src/BiliLite.UWP/Controls/Player.xaml.cs
@@ -325,6 +325,7 @@ private MediaSourceConfig CreateFFmpegInteropConfig(string userAgent, string ref
             if (referer != null && referer.Length > 0)
             {
                 _ffmpegConfig.FFmpegOptions.Add("referer", referer);
+                _ffmpegConfig.FFmpegOptions.Add("headers", $"Referer: {referer}");
             }
 
             _ffmpegConfig.VideoDecoderMode = passthrough ? VideoDecoderMode.ForceSystemDecoder : VideoDecoderMode.ForceFFmpegSoftwareDecoder;
@@ -520,7 +521,7 @@ public async Task<PlayerOpenResult> PlayerDashUseNative(BiliDashPlayUrlInfo dash
                         message = "创建MediaSource失败"
                     };
                 }
-
+                
                 m_playerVideo.Source = MediaSource.CreateFromAdaptiveMediaSource(mediaSource);
                 Buffering = true;
 
@@ -665,6 +666,7 @@ public async Task<PlayerOpenResult> PlayDashUseFFmpegInterop(BiliDashPlayUrlInfo
                 //关闭正在播放的视频
                 ClosePlay();
                 var _ffmpegConfig = CreateFFmpegInteropConfig(userAgent, referer);
+
                 if (isLocal)
                 {
 

diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs
@@ -1566,31 +1566,29 @@ private async Task<PlayerOpenResult> ChangeQualityPlayVideo(BiliPlayUrlInfo qual
             };
             if (quality.PlayUrlType == BiliPlayUrlType.DASH)
             {
-                var audio = audioQuality == null ? quality.DashInfo.Audio : audioQuality.Audio;
-                var video = quality.DashInfo.Video;
-
-                result = await Player.PlayerDashUseNative(quality.DashInfo, quality.UserAgent, quality.Referer, positon: _postion);
+                var realPlayerType = (RealPlayerType)SettingService.GetValue(SettingConstants.Player.USE_REAL_PLAYER_TYPE, (int)SettingConstants.Player.DEFAULT_USE_REAL_PLAYER_TYPE);
+                if (realPlayerType==RealPlayerType.Native)
+                {
+                    result = await Player.PlayerDashUseNative(quality.DashInfo, quality.UserAgent, quality.Referer, positon: _postion);
 
-                if (!result.result)
+                    if (!result.result)
+                    {
+                        result = await Player.PlayDashUseFFmpegInterop(quality.DashInfo, quality.UserAgent, quality.Referer,
+                            positon: _postion);
+                    }
+                }
+                else
                 {
-                    var mpd_url = new PlayerAPI().GenerateMPD(new Models.GenerateMPDModel()
+                    result = await Player.PlayDashUseFFmpegInterop(quality.DashInfo, quality.UserAgent, quality.Referer,
+                        positon: _postion);
+
+                    if (!result.result)
                     {
-                        AudioBandwidth = audio.BandWidth.ToString(),
-                        AudioCodec = audio.Codecs,
-                        AudioID = audio.ID.ToString(),
-                        AudioUrl = audio.Url,
-                        Duration = quality.DashInfo.Duration,
-                        DurationMS = quality.Timelength,
-                        VideoBandwidth = video.BandWidth.ToString(),
-                        VideoCodec = video.Codecs,
-                        VideoID = video.ID.ToString(),
-                        VideoFrameRate = video.FrameRate.ToString(),
-                        VideoHeight = video.Height,
-                        VideoWidth = video.Width,
-                        VideoUrl = video.Url,
-                    });
-                    result = await Player.PlayDashUrlUseFFmpegInterop(mpd_url, quality.UserAgent, quality.Referer, positon: _postion);
+
+                        result = await Player.PlayerDashUseNative(quality.DashInfo, quality.UserAgent, quality.Referer, positon: _postion);
+                    }
                 }
+
             }
             else if (quality.PlayUrlType == BiliPlayUrlType.SingleFLV)
             {

diff --git a/src/BiliLite.UWP/Controls/Settings/PlaySettingsControl.xaml b/src/BiliLite.UWP/Controls/Settings/PlaySettingsControl.xaml
@@ -42,6 +42,18 @@
                        DisplayMemberPath="Name"></ComboBox>
         </controls:SettingsCard>
 
+        <controls:SettingsCard Header="优先播放器类型"
+                               Description="如果遇到加载卡顿、磁盘占用高等问题，请尝试修改优先播放器类型">
+            <controls:SettingsCard.HeaderIcon>
+                <font:FontAwesome Icon="Solid_PhotoVideo"></font:FontAwesome>
+            </controls:SettingsCard.HeaderIcon>
+            <ComboBox x:Name="ComboBoxUseRealPlayerType" SelectedIndex="0" MinWidth="200"
+                      SelectedValuePath="Value"
+                      DisplayMemberPath="Content"
+                      ItemsSource="{x:Bind m_realPlayerTypes.Options}">
+            </ComboBox>
+        </controls:SettingsCard>
+
         <!--<TextBlock  Margin="0 16 0 8" FontSize="16" Visibility="Collapsed">优先使用FFmpeg播放器</TextBlock>
         <ToggleSwitch x:Name="swPriorityFFmpeg" Visibility="Collapsed"></ToggleSwitch>
 

diff --git a/src/BiliLite.UWP/Controls/Settings/PlaySettingsControl.xaml.cs b/src/BiliLite.UWP/Controls/Settings/PlaySettingsControl.xaml.cs
@@ -7,6 +7,7 @@
 using BiliLite.Services;
 using BiliLite.ViewModels.Settings;
 using System.Linq;
+using BiliLite.Models.Common.Player;
 
 //https://go.microsoft.com/fwlink/?LinkId=234236 上介绍了“用户控件”项模板
 
@@ -16,6 +17,7 @@ public sealed partial class PlaySettingsControl : UserControl
     {
         private readonly PlaySettingsControlViewModel m_viewModel;
         private readonly PlaySpeedMenuService m_playSpeedMenuService;
+        private readonly RealPlayerTypes m_realPlayerTypes = new RealPlayerTypes();
 
         public PlaySettingsControl()
         {
@@ -34,6 +36,13 @@ private void LoadPlayer()
             {
                 SettingService.SetValue(SettingConstants.Player.DEFAULT_VIDEO_TYPE, (int)cbVideoType.SelectedValue);
             };
+            //优先播放器类型
+            var realPlayerType = (RealPlayerType)SettingService.GetValue(SettingConstants.Player.USE_REAL_PLAYER_TYPE, (int)SettingConstants.Player.DEFAULT_USE_REAL_PLAYER_TYPE);
+            ComboBoxUseRealPlayerType.SelectedItem = realPlayerType;
+            ComboBoxUseRealPlayerType.SelectionChanged += (e, args) =>
+            {
+                SettingService.SetValue(SettingConstants.Player.USE_REAL_PLAYER_TYPE, (int)ComboBoxUseRealPlayerType.SelectedValue);
+            };
             //视频倍速
             var speeds = m_playSpeedMenuService.MenuItems
                 .Select(x => x.Value)

diff --git a/src/BiliLite.UWP/Models/Common/Player/RealPlayerType.cs b/src/BiliLite.UWP/Models/Common/Player/RealPlayerType.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace BiliLite.Models.Common.Player
+{
+    public enum RealPlayerType
+    {
+        Native,
+        FFmpegInterop,
+    }
+
+    public class RealPlayerTypes
+    {
+        public List<RealPlayerTypeOption> Options = new List<RealPlayerTypeOption>()
+        {
+            new RealPlayerTypeOption() { Value = RealPlayerType.Native },
+            new RealPlayerTypeOption() { Value = RealPlayerType.FFmpegInterop },
+        };
+    }
+
+    public class RealPlayerTypeOption
+    {
+        public RealPlayerType Value { get; set; }
+
+        public string Content => Value.ToString();
+    }
+}
diff --git a/src/BiliLite.UWP/Models/Common/SettingConstants.cs b/src/BiliLite.UWP/Models/Common/SettingConstants.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using BiliLite.Models.Attributes;
+using BiliLite.Models.Common.Player;
 using BiliLite.Services;
 
 namespace BiliLite.Models.Common
@@ -584,6 +585,15 @@ public class Live
 
         public class Player
         {
+            /// <summary>
+            /// 优先使用播放器类型
+            /// </summary>
+            [SettingKey(typeof(int))]
+            public const string USE_REAL_PLAYER_TYPE = "UseRealPlayerType";
+
+            [SettingDefaultValue]
+            public const RealPlayerType DEFAULT_USE_REAL_PLAYER_TYPE = RealPlayerType.Native;
+
             /// <summary>
             /// 使用外站视频替换无法播放的视频 bool
             /// </summary>

diff --git a/src/BiliLite.UWP/Modules/Player/Playurl/BiliPlayUrlRequest.cs b/src/BiliLite.UWP/Modules/Player/Playurl/BiliPlayUrlRequest.cs
@@ -49,7 +49,7 @@ class BiliPlayUrlRequest
         /// </summary>
         public string Message { get; set; } = "";
 
-        public const string WebUserAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36";
+        public const string WebUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
         public const string WebReferer = "https://www.bilibili.com";
         public const string AndroidUserAgent = "Bilibili Freedoooooom/MarkII";