Skip to content

starboard: Fix integer overflow in AudioTrack sink #11549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiaomings wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

starboard: Fix integer overflow in AudioTrack sink #11549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions starboard/android/shared/audio_track_audio_sink_type.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 "
Expand Down Expand Up @@ -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_;
}

Expand Down
2 changes: 1 addition & 1 deletion starboard/android/shared/audio_track_audio_sink_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
Loading