fix hdr playback issue

yichengchen · Jul 8, 2023 · a7681b8 · a7681b8
1 parent b348c95
commit a7681b8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/BilibiliLive/Component/Player/BilibiliVideoResourceLoaderDelegate.swift b/BilibiliLive/Component/Player/BilibiliVideoResourceLoaderDelegate.swift
@@ -92,7 +92,7 @@ class BilibiliVideoResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelega
             supplementCodesc = codecs
             videoRange = "HLG"
             codecs = "hvc1.2.4.L153.b0"
-        } else if codecs == "dvh1.08.06" {
+        } else if codecs == "dvh1.08.06" || codecs == "dvh1.05.06" {
             supplementCodesc = codecs
             codecs = "hvc1.2.4.L150"
             videoRange = "PQ"
@@ -239,8 +239,11 @@ class BilibiliVideoResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelega
         hasSubtitle = subtitles.count > 0
         var videos = info.dash.video
         if Settings.preferAvc {
-            if videos.contains(where: { !$0.isHevc }) {
-                videos.removeAll(where: { $0.isHevc })
+            let videosMap = Dictionary(grouping: videos, by: { $0.id })
+            for (key, values) in videosMap {
+                if values.contains(where: { !$0.isHevc }) {
+                    videos.removeAll(where: { $0.id == key && $0.isHevc })
+                }
             }
         }