[iOS] Improve CPU usage of new playlist when backgrounded (uplift to …

…1.74.x) (#26699) Uplift of #26671 (squashed) to beta
brave · Nov 22, 2024 · 09914f9 · 09914f9
1 parent 8d5c916
commit 09914f9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/ios/brave-ios/Sources/PlaylistUI/MediaContentView.swift b/ios/brave-ios/Sources/PlaylistUI/MediaContentView.swift
@@ -171,7 +171,8 @@ extension MediaContentView {
           }
         }
       }
-      .task(priority: .low) {
+      .task(id: model.isPlayerInForeground, priority: .low) {
+        if !model.isPlayerInForeground { return }
         self.currentTime = model.currentTime
         for await currentTime in model.currentTimeStream {
           self.currentTime = currentTime

diff --git a/ios/brave-ios/Sources/PlaylistUI/PlayerModel.swift b/ios/brave-ios/Sources/PlaylistUI/PlayerModel.swift
@@ -337,7 +337,7 @@ public final class PlayerModel: ObservableObject {
     return .init { [weak self] continuation in
       guard let self else { return }
       let timeObserver = player.addCancellablePeriodicTimeObserver(
-        forInterval: 100,
+        forInterval: 150,
         queue: .global()
       ) { [weak self] time in
         guard let self,
@@ -369,6 +369,8 @@ public final class PlayerModel: ObservableObject {
     }
   }
 
+  @MainActor @Published public var isPlayerInForeground: Bool = true
+
   // MARK: - Picture in Picture
 
   private var pipController: AVPictureInPictureController?
@@ -780,6 +782,9 @@ public final class PlayerModel: ObservableObject {
       queue: .main
     ) { [weak self] _ in
       guard let self else { return }
+      MainActor.assumeIsolated {
+        self.isPlayerInForeground = false
+      }
       if isPictureInPictureActive || !isPlaying {
         return
       }
@@ -793,6 +798,9 @@ public final class PlayerModel: ObservableObject {
       queue: .main
     ) { [weak self] _ in
       guard let self else { return }
+      MainActor.assumeIsolated {
+        self.isPlayerInForeground = true
+      }
       if isPictureInPictureActive || playerLayer.player != nil {
         return
       }

diff --git a/ios/brave-ios/Sources/PlaylistUI/PlayerView.swift b/ios/brave-ios/Sources/PlaylistUI/PlayerView.swift
@@ -38,12 +38,17 @@ struct PlayerView: View {
     }
   }
 
+  private var isVideoAmbianceBackgroundEnabled: Bool {
+    !isFullScreen && playerModel.isPlayerInForeground
+      && !ProcessInfo.processInfo.isLowPowerModeEnabled
+  }
+
   var body: some View {
     VideoPlayerLayout(aspectRatio: isFullScreen ? nil : 16 / 9) {
       VideoPlayer(playerLayer: playerModel.playerLayer)
     }
     .background {
-      if !isFullScreen {
+      if isVideoAmbianceBackgroundEnabled {
         VideoAmbianceBackground(playerModel: playerModel)
           .transition(.opacity.animation(.snappy))
           .opacity(playerModel.isPlaying ? 1 : 0.5)
@@ -296,7 +301,8 @@ extension PlayerView {
       .buttonStyle(.playbackControl)
       .tint(Color(braveSystemName: .textPrimary))
       .backgroundStyle(Color.white.opacity(0.2))
-      .task(priority: .low) {
+      .task(id: model.isPlayerInForeground, priority: .low) {
+        if !model.isPlayerInForeground { return }
         self.currentTime = model.currentTime
         for await currentTime in model.currentTimeStream {
           self.currentTime = currentTime

diff --git a/ios/brave-ios/Sources/PlaylistUI/PlaylistItemView.swift b/ios/brave-ios/Sources/PlaylistUI/PlaylistItemView.swift
@@ -120,7 +120,7 @@ struct LeoPlayingSoundView: View {
       .onReceive(
         Timer.publish(every: 0.3, on: .main, in: .default).autoconnect(),
         perform: { _ in
-          if !isAnimating { return }
+          if !isAnimating || UIApplication.shared.applicationState == .background { return }
           randomizeBarHeights()
         }
       )