path: root/audio/out/ao_openal.c
diff options
authorwm4 <wm4@nowhere>2013-11-10 23:24:21 +0100
committerwm4 <wm4@nowhere>2013-11-12 23:27:51 +0100
commit380fc765e4ad4e3ff828c9b0bd4a565ea2ba79ed (patch)
tree6cc32f550b219c903a932692f477c8b8b4f8cfc2 /audio/out/ao_openal.c
parentd115fb3b0eed9145817a20bc0070590f7428bddd (diff)
audio/out: prepare for non-interleaved audio
This comes with two internal AO API changes: 1. now can take non-interleaved audio. For this purpose, the data pointer is changed to void **data, where data[0] corresponds to the pointer in the old API. Also, the len argument as well as the return value are now in samples, not bytes. "Sample" in this context means the unit of the smallest possible audio frame, i.e. sample_size * channels. 2. ao_driver.get_space now returns samples instead of bytes. (Similar to the play function.) Change all AOs to use the new API. The AO API as exposed to the rest of the player still uses the old API. It's emulated in ao.c. This is purely to split the commits changing all AOs and the commits adding actual support for outputting N-I audio.
Diffstat (limited to 'audio/out/ao_openal.c')
1 files changed, 5 insertions, 4 deletions
diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index 6fdc388711..256e50f281 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -251,18 +251,19 @@ static int get_space(struct ao *ao)
queued = NUM_BUF - queued - 3;
if (queued < 0)
return 0;
- return queued * CHUNK_SIZE * ao->channels.num;
+ return (queued * CHUNK_SIZE * ao->channels.num) / ao->sstride;
* \brief write data into buffer and reset underrun flag
-static int play(struct ao *ao, void *data, int len, int flags)
+static int play(struct ao *ao, void **data, int samples, int flags)
ALint state;
int i, j, k;
int ch;
- int16_t *d = data;
+ int16_t *d = data[0];
+ int len = samples * ao->sstride;
len /= ao->channels.num * CHUNK_SIZE;
for (i = 0; i < len; i++) {
for (ch = 0; ch < ao->channels.num; ch++) {
@@ -278,7 +279,7 @@ static int play(struct ao *ao, void *data, int len, int flags)
alGetSourcei(sources[0], AL_SOURCE_STATE, &state);
if (state != AL_PLAYING) // checked here in case of an underrun
alSourcePlayv(ao->channels.num, sources);
- return len * ao->channels.num * CHUNK_SIZE;
+ return len * ao->channels.num * CHUNK_SIZE / ao->sstride;
static float get_delay(struct ao *ao)