修复PGC内容无法播放以及自动生成字幕未显示的问题 (#1705)

* 修复自动生成的字幕没有显示的问题 * 修复PGC内容播放问题
Richasy · Jun 2, 2023 · deee4e6 · deee4e6
1 parent e5f05ae
commit deee4e6
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 22 deletions.
diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -1330,7 +1330,7 @@
       <Version>2.8.2-prerelease.220830001</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.2</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="Richasy.FluentIcon.Regular.UWP">
       <Version>1.1.150</Version>

diff --git a/src/App/Assets/DashVideoTemplate.xml b/src/App/Assets/DashVideoTemplate.xml
@@ -1,13 +1,12 @@
-<MPD xmlns="urn:mpeg:DASH:schema:MPD:2011" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" type="static"
-     minBufferTime="{bufferTime}">
+<MPD xmlns="urn:mpeg:DASH:schema:MPD:2011" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" type="static">
     <Period start="PT0S">
-        <AdaptationSet group="1">
-            <ContentComponent contentType="audio" id="1" />
-            {audio}
-        </AdaptationSet>
-        <AdaptationSet group="2">
-            <ContentComponent contentType="video" id="2" />
+        <AdaptationSet>
+            <ContentComponent contentType="video" id="1" />
             {video}
         </AdaptationSet>
+        <AdaptationSet>
+            <ContentComponent contentType="audio" id="2" />
+            {audio}
+        </AdaptationSet>
     </Period>
 </MPD>
diff --git a/src/App/Assets/DashVideoWithoutAudioTemplate.xml b/src/App/Assets/DashVideoWithoutAudioTemplate.xml
@@ -1,7 +1,6 @@
-<MPD xmlns="urn:mpeg:DASH:schema:MPD:2011" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" type="static"
-     minBufferTime="{bufferTime}">
+<MPD xmlns="urn:mpeg:DASH:schema:MPD:2011" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" type="static">
     <Period start="PT0S">
-        <AdaptationSet group="1">
+        <AdaptationSet>
             <ContentComponent contentType="video" id="1" />
             {video}
         </AdaptationSet>

diff --git a/src/Lib/DI.App/DI.App.csproj b/src/Lib/DI.App/DI.App.csproj
@@ -129,7 +129,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.1.1</Version>
+      <Version>5.2.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Lib/DI.Container/DI.Container.csproj b/src/Lib/DI.Container/DI.Container.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
-    <PackageReference Include="NLog" Version="5.1.3" />
+    <PackageReference Include="NLog" Version="5.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Lib/FrostMaster.Uwp/FrostMaster.Uwp.csproj b/src/Lib/FrostMaster.Uwp/FrostMaster.Uwp.csproj
@@ -135,7 +135,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.2</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
       <Version>1.26.0</Version>

diff --git a/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.Extension.cs b/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.Extension.cs
@@ -80,6 +80,7 @@ private async Task<MediaInformation> InternalGetDashAsync(string cid, string aid
             var isPgc = string.IsNullOrEmpty(aid) && !string.IsNullOrEmpty(seasonType);
 
             var url = isPgc ? ApiConstants.Pgc.PlayInformation(proxy) : ApiConstants.Video.PlayInformation;
+            var requestType = isPgc ? RequestClientType.Web : RequestClientType.IOS;
 
             var queryParameters = new Dictionary<string, string>
             {
@@ -113,7 +114,7 @@ private async Task<MediaInformation> InternalGetDashAsync(string cid, string aid
                 otherQuery = $"area={area}";
             }
 
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, url, queryParameters, RequestClientType.IOS, additionalQuery: otherQuery);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, url, queryParameters, requestType, additionalQuery: otherQuery);
             var response = await _httpProvider.SendAsync(request);
             var data = await _httpProvider.ParseAsync<ServerResponse<PlayerInformation>, ServerResponse2<PlayerInformation>>(response, (str) =>
             {

diff --git a/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.cs b/src/Lib/Lib.Implementation/PlayerProvider/PlayerProvider.cs
@@ -333,7 +333,7 @@ public async Task<IEnumerable<SubtitleInformation>> GetSubtitleDetailAsync(strin
                 url = "https:" + url;
             }
 
-            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, url);
+            var request = await _httpProvider.GetRequestMessageAsync(HttpMethod.Get, url, type: RequestClientType.IOS, needCookie: true);
             var response = await _httpProvider.SendAsync(request);
             var result = await _httpProvider.ParseAsync<SubtitleDetailResponse>(response);
             return result.Body.Select(p => _playerAdapter.ConvertToSubtitleInformation(p)).ToList();

diff --git a/src/Models/Models.Data/Player/SegmentInformation.cs b/src/Models/Models.Data/Player/SegmentInformation.cs
@@ -32,7 +32,8 @@ public SegmentInformation(
             int width,
             int height,
             string initialization,
-            string indexRange)
+            string indexRange,
+            int startWithSap = 1)
         {
             Id = id;
             BaseUrl = baseUrl;
@@ -44,6 +45,7 @@ public SegmentInformation(
             Height = height;
             Initialization = initialization;
             IndexRange = indexRange;
+            StartWithSap = startWithSap;
         }
 
         /// <summary>
@@ -96,6 +98,11 @@ public SegmentInformation(
         /// </summary>
         public string IndexRange { get; }
 
+        /// <summary>
+        /// None.
+        /// </summary>
+        public int StartWithSap { get; }
+
         /// <inheritdoc/>
         public override bool Equals(object obj) => obj is SegmentInformation information && Id == information.Id;
 

diff --git a/src/Utilities/Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj b/src/Utilities/Toolkit/Toolkit.Uwp/Toolkit.Uwp.csproj
@@ -29,7 +29,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.2</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="ToolGood.Words">
       <Version>3.0.3.1</Version>

diff --git a/src/ViewModels/ViewModels.Uwp/Core/NativePlayerViewModel/NativePlayerViewModel.Methods.cs b/src/ViewModels/ViewModels.Uwp/Core/NativePlayerViewModel/NativePlayerViewModel.Methods.cs
@@ -23,7 +23,7 @@ public sealed partial class NativePlayerViewModel
         private HttpClient GetVideoClient()
         {
             var httpClient = new HttpClient();
-            httpClient.DefaultRequestHeaders.Referer = new Uri("https://www.bilibili.com");
+            httpClient.DefaultRequestHeaders.Add("Referer", "https://www.bilibili.com");
             httpClient.DefaultRequestHeaders.Add("User-Agent", ServiceConstants.DefaultUserAgentString);
             return httpClient;
         }
@@ -37,7 +37,7 @@ private async Task LoadDashVideoSourceAsync()
             var mpdStr = await _fileToolkit.ReadPackageFile(mpdFilePath);
 
             var videoStr =
-                    $@"<Representation bandwidth=""{_video.Bandwidth}"" codecs=""{_video.Codecs}"" height=""{_video.Height}"" mimeType=""{_video.MimeType}"" id=""{_video.Id}"" width=""{_video.Width}"">
+                    $@"<Representation bandwidth=""{_video.Bandwidth}"" codecs=""{_video.Codecs}"" height=""{_video.Height}"" mimeType=""{_video.MimeType}"" id=""{_video.Id}"" width=""{_video.Width}"" startWithSap=""{_video.StartWithSap}"">
                                <BaseURL></BaseURL>
                                <SegmentBase indexRange=""{_video.IndexRange}"">
                                    <Initialization range=""{_video.Initialization}"" />
@@ -65,6 +65,7 @@ private async Task LoadDashVideoSourceAsync()
 
             var stream = new MemoryStream(Encoding.UTF8.GetBytes(mpdStr)).AsInputStream();
             var source = await AdaptiveMediaSource.CreateFromStreamAsync(stream, new Uri(_video.BaseUrl), "application/dash+xml", httpClient);
+            source.MediaSource.AdvancedSettings.AllSegmentsIndependent = true;
             Debug.Assert(source.Status == AdaptiveMediaSourceCreationStatus.Success, "解析MPD失败");
             source.MediaSource.DownloadRequested += (sender, args) =>
             {

diff --git a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
@@ -222,7 +222,7 @@
       <Version>7.1.3</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.1.1</Version>
+      <Version>5.2.0</Version>
     </PackageReference>
     <PackageReference Include="QueryString.NET">
       <Version>1.0.0</Version>