Fix performance issue (#1051)

SRGSSR · Oct 23, 2024 · 478fd41 · 478fd41
1 parent 1ae9247
commit 478fd41
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/Demo/Pillarbox-demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/Pillarbox-demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CommandersAct/iOSV5.git",
       "state" : {
-        "revision" : "ec5b7d6192ce5ecd1ab40a8f7a6aa75a19f7d1c7",
-        "version" : "5.4.11"
+        "revision" : "24ffbad1da8467b615958be9d0dd1e92c4396699",
+        "version" : "5.4.12"
       }
     },
     {

diff --git a/Sources/Analytics/ComScore/Capture/ComScoreHitInterceptor.swift b/Sources/Analytics/ComScore/Capture/ComScoreHitInterceptor.swift
@@ -56,7 +56,7 @@ enum ComScoreHitInterceptor {
 }
 
 private extension Notification.Name {
-    static let didReceiveComScoreRequest = Notification.Name("URLSessionDidReceiveComScoreRequestNotification")
+    static let didReceiveComScoreRequest = Notification.Name("PillarboxAnalytics_didReceiveComScoreRequest")
 }
 
 private extension URLSession {

diff --git a/Sources/Monitoring/Types/Notification.Name.swift b/Sources/Monitoring/Types/Notification.Name.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 enum MetricRequestInfoKey: String {
-    case identifier = "MetricRequestIdentifier"
-    case payload = "MetricRequestIdentifierPayload"
+    case identifier = "MetricRequestInfoKey_identifier"
+    case payload = "MetricRequestInfoKey_payload"
 }
 
 extension Notification.Name {
-    static let didSendMetricRequest = Notification.Name(rawValue: "MetricsTrackerDidSendMetricRequestNotification")
+    static let didSendMetricRequest = Notification.Name(rawValue: "PillarboxMonitoring_didSendMetricRequest")
 }
diff --git a/Sources/Player/Extensions/AVAudioSession.swift b/Sources/Player/Extensions/AVAudioSession.swift
@@ -70,5 +70,5 @@ extension AVAudioSession {
 }
 
 extension Notification.Name {
-    static let didUpdateAudioSessionOptions = Notification.Name("PillarboxPlayerDidUpdateAudioSessionOptionsNotification")
+    static let didUpdateAudioSessionOptions = Notification.Name("PillarboxPlayer_didUpdateAudioSessionOptions")
 }
diff --git a/Sources/Player/Extensions/Notification.Name.swift b/Sources/Player/Extensions/Notification.Name.swift
@@ -11,6 +11,6 @@ enum SeekKey: String {
 }
 
 extension Notification.Name {
-    static let willSeek = Notification.Name("QueuePlayerWillSeekNotification")
-    static let didSeek = Notification.Name("QueuePlayerDidSeekNotification")
+    static let willSeek = Notification.Name("PillarboxPlayer_willSeekNotification")
+    static let didSeek = Notification.Name("PillarboxPlayer_didSeekNotification")
 }
diff --git a/Sources/Player/Player+PlaybackSpeed.swift b/Sources/Player/Player+PlaybackSpeed.swift
@@ -44,7 +44,7 @@ extension Player {
         Publishers.Merge3(
             desiredPlaybackSpeedUpdatePublisher(),
             supportedPlaybackSpeedPublisher(),
-            avPlayerViewControllerPlaybackSpeedUpdatePublisher()
+            defaultRateSpeedUpdatePublisher()
         )
         .removeDuplicates()
         .eraseToAnyPublisher()
@@ -92,14 +92,8 @@ private extension Player {
         .eraseToAnyPublisher()
     }
 
-    func avPlayerViewControllerPlaybackSpeedUpdatePublisher() -> AnyPublisher<PlaybackSpeedUpdate, Never> {
-        propertiesPublisher
-            .slice(at: \.rate)
-            .filter { rate in
-                rate != 0 && Thread.callStackSymbols.contains { symbol in
-                    symbol.contains("AVPlayerController")
-                }
-            }
+    func defaultRateSpeedUpdatePublisher() -> AnyPublisher<PlaybackSpeedUpdate, Never> {
+        queuePlayer.publisher(for: \.defaultRate)
             .removeDuplicates()
             .map { .value($0) }
             .eraseToAnyPublisher()