From bc9d906ac1d037e322fadee293e445c322c75927 Mon Sep 17 00:00:00 2001
From: Xiaoming Shi <xiaomings@google.com>
Date: Tue, 28 Jul 2026 17:54:49 +0000
Subject: [PATCH] Cherry pick PR #11549: starboard: Fix integer overflow in
 AudioTrack sink

Refer to original PR: #11549

Update accumulated_written_frames, last_playback_head_position, and
playback_head_position to use 64-bit integers in AudioTrackAudioSink.
At a 48kHz sampling rate, 32-bit signed integers overflow after
approximately 12.4 hours of continuous playback, which can cause
incorrect playback head reporting and audio sync issues.

Also update GetFramesDurationUs to accept int64_t to maintain type
consistency and prevent narrowing.

Note that this doesn't resolve all integer size issues across the audio
pipeline as the Java AudioTrackBridge is still tracking the playback
position using 32 bits integer, which will be resolve in b/539224216.

Bug: 539224216

(cherry picked from commit 97d99449fb8ce259e371b4959135f6780934555d)
---
 .github/AUTOROLL                                        | 2 +-
 starboard/android/shared/audio_track_audio_sink_type.cc | 8 ++++----
 starboard/android/shared/audio_track_audio_sink_type.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/AUTOROLL b/.github/AUTOROLL
index 8e9439e0e5d2..632231bab5c9 100644
--- a/.github/AUTOROLL
+++ b/.github/AUTOROLL
@@ -1 +1 @@
-5f4930b006c0b13e4610d565da281c05a08a42cf
+97d99449fb8ce259e371b4959135f6780934555d
diff --git a/starboard/android/shared/audio_track_audio_sink_type.cc b/starboard/android/shared/audio_track_audio_sink_type.cc
index d9d180478b44..5f62b3b76d66 100644
--- a/starboard/android/shared/audio_track_audio_sink_type.cc
+++ b/starboard/android/shared/audio_track_audio_sink_type.cc
@@ -261,10 +261,10 @@ void AudioTrackAudioSink::AudioThreadFunc() {
 
   SB_LOG(INFO) << "AudioTrackAudioSink thread started.";
 
-  int accumulated_written_frames = 0;
+  int64_t accumulated_written_frames = 0;
   int64_t last_playback_head_event_at = -1;  // microseconds
 
-  int last_playback_head_position = 0;
+  int64_t last_playback_head_position = 0;
 
   bool release_frames_after_audio_starts = features::FeatureList::IsEnabled(
       features::kReleaseVideoFramesAfterAudioStarts);
@@ -284,7 +284,7 @@ void AudioTrackAudioSink::AudioThreadFunc() {
       continue;
     }
 
-    int playback_head_position = 0;
+    int64_t playback_head_position = 0;
     int64_t frames_consumed_at = 0;
     if (audio_track_->GetAndResetHasAudioDeviceChanged()) {
       SB_LOG(INFO) << "Audio device changed, raising a capability changed "
@@ -515,7 +515,7 @@ void AudioTrackAudioSink::ReportError(bool capability_changed,
   }
 }
 
-int64_t AudioTrackAudioSink::GetFramesDurationUs(int frames) const {
+int64_t AudioTrackAudioSink::GetFramesDurationUs(int64_t frames) const {
   return frames * 1'000'000LL / sampling_frequency_hz_;
 }
 
diff --git a/starboard/android/shared/audio_track_audio_sink_type.h b/starboard/android/shared/audio_track_audio_sink_type.h
index 5bfb2ccfe692..2344278fef83 100644
--- a/starboard/android/shared/audio_track_audio_sink_type.h
+++ b/starboard/android/shared/audio_track_audio_sink_type.h
@@ -169,7 +169,7 @@ class AudioTrackAudioSink : public SbAudioSinkImpl {
 
   void ReportError(bool capability_changed, const std::string& error_message);
 
-  int64_t GetFramesDurationUs(int frames) const;
+  int64_t GetFramesDurationUs(int64_t frames) const;
 
   const raw_ptr<Type> type_;
   const int channels_;