Ensure getPlaybackHeadPosition isn't called if not needed

Once the value returned from AudioTimestampPoller advances, we only need getPlaybackHeadPosition to sample sync params and verify the returned timestamp. Both of these happen less often and we can avoid calling getPlaybackHeadPosition if we don't actually need it. PiperOrigin-RevId: 512882170
DiceTechnology · Mar 1, 2023 · 4cf7d3c · 4cf7d3c
1 parent 05d3652
commit 4cf7d3c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...ary/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/...ary/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
@@ -451,13 +451,13 @@ public void reset() {
   }
 
   private void maybeSampleSyncParams() {
-    long playbackPositionUs = getPlaybackHeadPositionUs();
-    if (playbackPositionUs == 0) {
-      // The AudioTrack hasn't output anything yet.
-      return;
-    }
     long systemTimeUs = System.nanoTime() / 1000;
     if (systemTimeUs - lastPlayheadSampleTimeUs >= MIN_PLAYHEAD_OFFSET_SAMPLE_INTERVAL_US) {
+      long playbackPositionUs = getPlaybackHeadPositionUs();
+      if (playbackPositionUs == 0) {
+        // The AudioTrack hasn't output anything yet.
+        return;
+      }
       // Take a new sample and update the smoothed offset between the system clock and the playhead.
       playheadOffsets[nextPlayheadOffsetIndex] =
           Util.getPlayoutDurationForMediaDuration(playbackPositionUs, audioTrackPlaybackSpeed)
@@ -479,11 +479,11 @@ private void maybeSampleSyncParams() {
       return;
     }
 
-    maybePollAndCheckTimestamp(systemTimeUs, playbackPositionUs);
+    maybePollAndCheckTimestamp(systemTimeUs);
     maybeUpdateLatency(systemTimeUs);
   }
 
-  private void maybePollAndCheckTimestamp(long systemTimeUs, long playbackPositionUs) {
+  private void maybePollAndCheckTimestamp(long systemTimeUs) {
     AudioTimestampPoller audioTimestampPoller = checkNotNull(this.audioTimestampPoller);
     if (!audioTimestampPoller.maybePollTimestamp(systemTimeUs)) {
       return;
@@ -492,6 +492,7 @@ private void maybePollAndCheckTimestamp(long systemTimeUs, long playbackPosition
     // Check the timestamp and accept/reject it.
     long audioTimestampSystemTimeUs = audioTimestampPoller.getTimestampSystemTimeUs();
     long audioTimestampPositionFrames = audioTimestampPoller.getTimestampPositionFrames();
+    long playbackPositionUs = getPlaybackHeadPositionUs();
     if (Math.abs(audioTimestampSystemTimeUs - systemTimeUs) > MAX_AUDIO_TIMESTAMP_OFFSET_US) {
       listener.onSystemTimeUsMismatch(
           audioTimestampPositionFrames,