Skip to content

get iOS audio output working again #45

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

Merged
badaix merged 1 commit into from
Oct 6, 2023
Merged

get iOS audio output working again #45

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
29 changes: 26 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "^5.0.1",
"standardized-audio-context": "^25.3.46",
"typescript": "^4.7.4",
"web-vitals": "^2.1.4"
},
Expand Down
67 changes: 35 additions & 32 deletions src/snapstream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import Flac from './3rd-party/libflac'

import { AudioContext, IAudioBuffer, IAudioContext, IAudioBufferSourceNode, IGainNode } from 'standardized-audio-context'

const appVersion = require('../package.json').version;

declare global {
// declare window.webkitAudioContext for the ts compiler
interface Window {
webkitAudioContext: typeof AudioContext
}

// declare AudioContext.outputLatency for the ts compiler
interface AudioContext extends BaseAudioContext {
readonly outputLatency: number;
}
}

// declare AudioContext.outputLatency for the ts compiler
interface IAudioContextPatched extends IAudioContext {
readonly getOutputTimestamp?: () => AudioTimestamp;
readonly outputLatency: number;
}

function setCookie(key: string, value: string, exdays: number = -1) {
let d = new Date();
Expand Down Expand Up @@ -417,7 +419,7 @@ class AudioStream {
console.log("Chunk too young, returning silence");
} else {
if (Math.abs(age) > 5) {
// We are 5ms apart, do a hard sync, i.e. don't play faster/slower,
// We are 5ms apart, do a hard sync, i.e. don't play faster/slower,
// but seek to the desired position instead
while (this.chunk && age > this.chunk.duration()) {
console.log("Chunk too old, dropping (age: " + age.toFixed(2) + " > " + this.chunk.duration().toFixed(2) + ")");
Expand Down Expand Up @@ -448,15 +450,15 @@ class AudioStream {
// console.debug("Age > 0, rate: " + rate);
// // we are late (age > 0), this means we are not playing fast enough
// // => the real sample rate seems to be lower, we have to drop some frames
// this.setRealSampleRate(this.sampleFormat.rate * rate); // 0.9999);
// this.setRealSampleRate(this.sampleFormat.rate * rate); // 0.9999);
// }
// else if (age < -0.1) {
// let rate = -age * 0.0005;
// rate = 1.0 + Math.min(rate, 0.0005);
// console.debug("Age < 0, rate: " + rate);
// // we are early (age > 0), this means we are playing too fast
// // => the real sample rate seems to be higher, we have to insert some frames
// this.setRealSampleRate(this.sampleFormat.rate * rate); // 0.9999);
// this.setRealSampleRate(this.sampleFormat.rate * rate); // 0.9999);
// }
// else {
// this.setRealSampleRate(this.sampleFormat.rate);
Expand Down Expand Up @@ -542,13 +544,13 @@ class AudioStream {


class TimeProvider {
constructor(ctx: AudioContext | undefined = undefined) {
constructor(ctx?: IAudioContextPatched) {
if (ctx) {
this.setAudioContext(ctx);
}
}

setAudioContext(ctx: AudioContext) {
setAudioContext(ctx: IAudioContextPatched) {
this.ctx = ctx;
this.reset();
}
Expand Down Expand Up @@ -576,9 +578,10 @@ class TimeProvider {
if (!this.ctx) {
return window.performance.now();
} else {
const ctx = this.ctx as IAudioContextPatched;
// Use the more accurate getOutputTimestamp if available, fallback to ctx.currentTime otherwise.
const contextTime = !!this.ctx.getOutputTimestamp ? this.ctx.getOutputTimestamp().contextTime : undefined;
return (contextTime !== undefined ? contextTime : this.ctx.currentTime) * 1000;
const contextTime = !!ctx.getOutputTimestamp ? ctx.getOutputTimestamp().contextTime : undefined;
return (contextTime !== undefined ? contextTime : ctx.currentTime) * 1000;
}
}

Expand All @@ -596,7 +599,7 @@ class TimeProvider {

diffBuffer: Array<number> = new Array<number>();
diff: number = 0;
ctx: AudioContext | undefined;
ctx?: AudioContext;
}


Expand Down Expand Up @@ -773,9 +776,8 @@ class FlacDecoder extends Decoder {
cacheInfo: { isCachedChunk: boolean, cachedBlocks: number } = { isCachedChunk: false, cachedBlocks: 0 };
}


class PlayBuffer {
constructor(buffer: AudioBuffer, playTime: number, source: AudioBufferSourceNode, destination: AudioNode) {
constructor(buffer: IAudioBuffer, playTime: number, source: IAudioBufferSourceNode<IAudioContext>, destination: IGainNode<IAudioContext>) {
this.buffer = buffer;
this.playTime = playTime;
this.source = source;
Expand All @@ -793,9 +795,9 @@ class PlayBuffer {
this.source.start(this.playTime);
}

buffer: AudioBuffer;
buffer: IAudioBuffer;
playTime: number;
source: AudioBufferSourceNode;
source: IAudioBufferSourceNode<IAudioContext>;
num: number = 0;
}

Expand Down Expand Up @@ -828,11 +830,11 @@ class SnapStream {
}
}

private setupAudioContext(): boolean {
let AudioContext = window.AudioContext // Default
|| window.webkitAudioContext // Safari and old versions of Chrome
|| false;
public resume() {
this.ctx.resume();
}

private setupAudioContext(): boolean {
if (AudioContext) {
let options: AudioContextOptions | undefined;
options = { latencyHint: "playback", sampleRate: this.sampleFormat ? this.sampleFormat.rate : undefined };
Expand All @@ -843,7 +845,7 @@ class SnapStream {
options = undefined;
}

this.ctx = new AudioContext(options);
this.ctx = new AudioContext(options) as IAudioContextPatched;
this.gainNode = this.ctx.createGain();
this.gainNode.connect(this.ctx.destination);
} else {
Expand Down Expand Up @@ -911,20 +913,21 @@ class SnapStream {
this.bufferFrameCount = Math.floor(this.bufferDurationMs * this.sampleFormat.msRate());
}

if (window.AudioContext) {
// we are not using webkitAudioContext, so it's safe to setup a new AudioContext with the new samplerate
// since this code is not triggered by direct user input, we cannt create a webkitAudioContext here
this.stopAudio();
this.setupAudioContext();
}
// NOTE: this breaks iOS audio output on v15.7.5 at least
// if (window.AudioContext) {
// // we are not using webkitAudioContext, so it's safe to setup a new AudioContext with the new samplerate
// // since this code is not triggered by direct user input, we cannt create a webkitAudioContext here
// this.stopAudio();
// this.setupAudioContext();
// }

this.ctx.resume();
this.timeProvider.setAudioContext(this.ctx);
this.gainNode.gain.value = this.serverSettings!.muted ? 0 : this.serverSettings!.volumePercent / 100;
// this.timeProvider = new TimeProvider(this.ctx);
this.stream = new AudioStream(this.timeProvider, this.sampleFormat, this.bufferMs);
this.latency = (this.ctx.baseLatency !== undefined ? this.ctx.baseLatency : 0) + (this.ctx.outputLatency !== undefined ? this.ctx.outputLatency : 0)
console.log("Base latency: " + this.ctx.baseLatency + ", output latency: " + this.ctx.outputLatency + ", latency: " + this.latency);
this.latency = (this.ctx.baseLatency !== undefined ? this.ctx.baseLatency : 0) + (this.ctx.outputLatency !== undefined ? this.ctx!.outputLatency : 0)
console.log("Base latency: " + this.ctx.baseLatency + ", output latency: " + this.ctx!.outputLatency + ", latency: " + this.latency);
this.play();
}
}
Expand Down Expand Up @@ -1031,8 +1034,8 @@ class SnapStream {

timeProvider: TimeProvider;
stream: AudioStream | undefined;
ctx!: AudioContext; // | undefined;
gainNode!: GainNode;
ctx!: IAudioContextPatched; // | undefined;
gainNode!: IGainNode<IAudioContext>;
serverSettings: ServerSettingsMessage | undefined;
decoder: Decoder | undefined;
sampleFormat: SampleFormat | undefined;
Expand Down