[audio] Time measurements should all be in seconds (expo#33320)

apps/native-component-list/src/screens/Audio/expo-audio/Player.tsx

@@ -76,9 +76,9 @@ export default function Player(props: Props) {
   const _toggleShouldCorrectPitch = () =>
     props.setRate(props.playbackRate, !props.shouldCorrectPitch);
 
-  const _seekForward = () => props.setPosition(props.currentTime + 5000);
+  const _seekForward = () => props.setPosition(props.currentTime + 5);
 
-  const _seekBackward = () => props.setPosition(Math.max(0, props.currentTime - 5000));
+  const _seekBackward = () => props.setPosition(Math.max(0, props.currentTime - 5));
 
   const _renderReplayButton = () => {
     return (
@@ -172,7 +172,7 @@ export default function Player(props: Props) {
           }}
         />
         <Text style={{ width: 100, textAlign: 'right' }} adjustsFontSizeToFit numberOfLines={1}>
-          {_formatTime(props.currentTime / 1000)} / {_formatTime(props.duration / 1000)}
+          {_formatTime(props.currentTime)} / {_formatTime(props.duration)}
         </Text>
         {_renderReplayButton()}
       </View>

packages/expo-audio/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### 🐛 Bug fixes
 
+- Update docs and API so all units of time are returned as seconds, not milliseconds. ([#33320](https://github.com/expo/expo/pull/33320) by [@alanjhughes](https://github.com/alanjhughes))
+
 ### 💡 Others
 
 ## 0.2.4 — 2024-11-19

packages/expo-audio/android/src/main/java/expo/modules/audio/AudioModule.kt

@@ -218,13 +218,13 @@ class AudioModule : Module() {
 
       Property("currentTime") { ref ->
         runOnMain {
-          ref.player.currentPosition
+          ref.currentTime
         }
       }
 
       Property("duration") { ref ->
         runOnMain {
-          ref.player.duration
+          ref.duration
         }
       }
 
@@ -274,7 +274,7 @@ class AudioModule : Module() {
       }
 
       AsyncFunction("seekTo") { ref: AudioPlayer, seekTime: Double ->
-        ref.player.seekTo(seekTime.toLong())
+        ref.player.seekTo((seekTime * 1000L).toLong())
       }.runOnQueue(Queues.MAIN)
 
       Function("setPlaybackRate") { ref: AudioPlayer, rate: Float ->

packages/expo-audio/android/src/main/java/expo/modules/audio/AudioPlayer.kt

@@ -51,6 +51,9 @@ class AudioPlayer(
   private var samplingEnabled = false
   private var visualizer: Visualizer? = null
 
+  val currentTime get() = player.currentPosition / 1000
+  val duration get() = player.duration / 1000
+
   init {
     addPlayerListeners()
     player.setAudioAttributes(AudioAttributes.DEFAULT, true)
@@ -107,12 +110,12 @@ class AudioPlayer(
 
     return mapOf(
       "id" to id,
-      "currentTime" to player.currentPosition,
+      "currentTime" to currentTime,
       "playbackState" to playbackStateToString(player.playbackState),
       "timeControlStatus" to if (player.isPlaying) "playing" else "paused",
       "reasonForWaitingToPlay" to null,
       "mute" to isMuted,
-      "duration" to player.duration,
+      "duration" to duration,
       "playing" to player.isPlaying,
       "loop" to isLooping,
       "isLoaded" to if (player.playbackState == Player.STATE_ENDED) true else isLoaded,

packages/expo-audio/ios/AudioModule.swift

@@ -91,12 +91,12 @@ public class AudioModule: Module {
       }
 
       Property("currentTime") { player in
-        player.ref.currentItem?.currentTime().seconds
+        player.currentTime
       }
 
       Property("duration") { player in
         if player.ref.status == .readyToPlay {
-          (player.ref.currentItem?.duration.seconds ?? 0.0) * 1000
+          player.duration
         } else {
           0.0
         }
@@ -159,7 +159,7 @@ public class AudioModule: Module {
       AsyncFunction("seekTo") { (player: AudioPlayer, seconds: Double) in
         await player.ref.currentItem?.seek(
           to: CMTime(
-            seconds: seconds / 1000,
+            seconds: seconds,
             preferredTimescale: CMTimeScale(NSEC_PER_SEC)
           )
         )

packages/expo-audio/ios/AudioPlayer.swift

@@ -26,8 +26,12 @@ public class AudioPlayer: SharedRef<AVPlayer> {
   private var samplingEnabled = false
   private var tapInstalled = false
 
-  private var duration: Double {
-    (ref.currentItem?.duration.seconds ?? 0.0) * 1000
+  var duration: Double {
+    ref.currentItem?.duration.seconds ?? 0.0
+  }
+
+  var currentTime: Double {
+    ref.currentItem?.currentTime().seconds ?? 0.0
   }
 
   init(_ ref: AVPlayer, interval: Double) {
@@ -65,15 +69,15 @@ public class AudioPlayer: SharedRef<AVPlayer> {
   }
 
   func currentStatus() -> [String: Any] {
-    let duration = ref.status == .readyToPlay ? duration : 0.0
+    let currentDuration = ref.status == .readyToPlay ? duration : 0.0
     return [
       "id": id,
-      "currentTime": (ref.currentItem?.currentTime().seconds ?? 0) * 1000,
+      "currentTime": currentTime,
       "playbackState": statusToString(status: ref.status),
       "timeControlStatus": timeControlStatusString(status: ref.timeControlStatus),
       "reasonForWaitingToPlay": reasonForWaitingToPlayString(status: ref.reasonForWaitingToPlay),
       "mute": ref.isMuted,
-      "duration": duration,
+      "duration": currentDuration,
       "playing": ref.timeControlStatus == .playing,
       "loop": isLooping,
       "isLoaded": ref.currentItem?.status == .readyToPlay,
@@ -183,7 +187,7 @@ public class AudioPlayer: SharedRef<AVPlayer> {
     let interval = CMTime(seconds: updateInterval, preferredTimescale: CMTimeScale(NSEC_PER_SEC))
     timeToken = ref.addPeriodicTimeObserver(forInterval: interval, queue: nil) { time in
       self.updateStatus(with: [
-        "currentTime": time.seconds * 1000
+        "currentTime": time.seconds
       ])
     }
   }

packages/expo-audio/src/AudioModule.types.ts

@@ -72,7 +72,7 @@ export declare class AudioPlayer extends SharedObject<AudioEvents> {
   isBuffering: boolean;
 
   /**
-   * The current position through the audio item, in seconds.
+   * The current position through the audio item in seconds.
    */
   currentTime: number;