Changeset 277203 in webkit

Timestamp:

May 7, 2021, 3:00:57 PM (5 years ago)

Author:

Devin Rousso

Message:

[iOS] fix inconsistency around the meaning of rate and defaultPlaybackRate between WebKit and AVKit
​https://bugs.webkit.org/show_bug.cgi?id=225532
<rdar://problem/77629276>

Reviewed by Eric Carlson.

In AVKit, the defaultPlaybackRate is used when playback starts, such as resuming after
pausing. In WebKit, however, defaultPlaybackRate is only used when first loading and after
ending scanning, with the playbackRate being used in all other cases, including when
resuming after pausing. As such, WebKit should return the playbackRate instead of the
defaultPlaybackRate in these cases when communicating with AVKit.

• platform/ios/WebAVPlayerController.mm:

(-[WebAVPlayerController setRate:]):
Also setDefaultPlaybackRate: if not paused (i.e. rate != 0) since WebKit's definition of
playbackRate does not change when paused.

• platform/ios/PlaybackSessionInterfaceAVKit.mm:

(WebCore::PlaybackSessionInterfaceAVKit::rateChanged):
Make sure to setDefaultPlaybackRate: before setRate: as the latter can affect the former.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/PlaybackSessionInterfaceAVKit.mm (modified) (1 diff)
• platform/ios/WebAVPlayerController.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-07  Devin Rousso  <drousso@apple.com>
+
+        [iOS] fix inconsistency around the meaning of `rate` and `defaultPlaybackRate` between WebKit and AVKit
+        https://bugs.webkit.org/show_bug.cgi?id=225532
+        <rdar://problem/77629276>
+
+        Reviewed by Eric Carlson.
+
+        In AVKit, the `defaultPlaybackRate` is used when playback starts, such as resuming after
+        pausing. In WebKit, however, `defaultPlaybackRate` is only used when first loading and after
+        ending scanning, with the `playbackRate` being used in all other cases, including when
+        resuming after pausing. As such, WebKit should return the `playbackRate` instead of the
+        `defaultPlaybackRate` in these cases when communicating with AVKit.
+
+        * platform/ios/WebAVPlayerController.mm:
+        (-[WebAVPlayerController setRate:]):
+        Also `setDefaultPlaybackRate:` if not paused (i.e. `rate != 0`) since WebKit's definition of
+        `playbackRate` does not change when paused.
+
+        * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+        (WebCore::PlaybackSessionInterfaceAVKit::rateChanged):
+        Make sure to `setDefaultPlaybackRate:` before `setRate:` as the latter can affect the former.
+
 2021-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm

@@ -127 +127 @@
 void PlaybackSessionInterfaceAVKit::rateChanged(bool isPlaying, float playbackRate, float defaultPlaybackRate)
 {
+    [m_playerController setDefaultPlaybackRate:defaultPlaybackRate];
     [m_playerController setRate:isPlaying ? playbackRate : 0.];
-    [m_playerController setDefaultPlaybackRate:defaultPlaybackRate];
 }
 

trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm

@@ -197 +197 @@
         return;
 
+    // In AVKit, the `defaultPlaybackRate` is used when playback starts, such as resuming after
+    // pausing. In WebKit, however, `defaultPlaybackRate` is only used when first loading and after
+    // ending scanning, with the `playbackRate` being used in all other cases, including when
+    // resuming after pausing. As such, WebKit should return the `playbackRate` instead of the
+    // `defaultPlaybackRate` in these cases when communicating with AVKit.
+    [self setDefaultPlaybackRate:_rate];
+
     if (self.delegate && self.delegate->playbackRate() != _rate)
         self.delegate->setPlaybackRate(_rate);