This commit is contained in:
2026-02-22 16:08:02 +01:00
parent 4a0a0b9f96
commit 869fa8739f
9 changed files with 315 additions and 15 deletions

11
libao/c/Makefile Normal file
View File

@@ -0,0 +1,11 @@
all:
mkdir -p build
cmake -S ao-play-async -B build
(cd build; make)
install:
(cd build; cp *.so /usr/local/lib)
clean:
rm -rf build

74
libao/c/ao-play-async/.gitignore vendored Normal file
View File

@@ -0,0 +1,74 @@
# This file is used to ignore files which are generated
# ----------------------------------------------------------------------------
*~
*.autosave
*.a
*.core
*.moc
*.o
*.obj
*.orig
*.rej
*.so
*.so.*
*_pch.h.cpp
*_resource.rc
*.qm
.#*
*.*#
core
!core/
tags
.DS_Store
.directory
*.debug
Makefile*
*.prl
*.app
moc_*.cpp
ui_*.h
qrc_*.cpp
Thumbs.db
*.res
*.rc
/.qmake.cache
/.qmake.stash
# qtcreator generated files
*.pro.user*
CMakeLists.txt.user*
# xemacs temporary files
*.flc
# Vim temporary files
.*.swp
# Visual Studio generated files
*.ib_pdb_index
*.idb
*.ilk
*.pdb
*.sln
*.suo
*.vcproj
*vcproj.*.*.user
*.ncb
*.sdf
*.opensdf
*.vcxproj
*vcxproj.*
# MinGW generated files
*.Debug
*.Release
# Python byte code
*.pyc
# Binaries
# --------
*.dll
*.exe

View File

@@ -0,0 +1,13 @@
cmake_minimum_required(VERSION 3.14)
project(ao-play-async LANGUAGES C)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_library(ao-play-async SHARED
ao_playasync.c
ao_playasync.h
)
target_compile_definitions(ao-play-async PRIVATE AOPLAYASYNC_LIBRARY)

View File

@@ -0,0 +1,146 @@
#include "ao_playasync.h"
#include <ao/ao.h>
#include <pthread.h>
#include <unistd.h>
#include <assert.h>
#include <malloc.h>
#include <string.h>
typedef enum {
PLAY = 1,
STOP = 2
} Command_t;
typedef struct _queue_ {
Command_t command;
void *buf;
int buflen;
struct _queue_ *next;
struct _queue_ *prev;
} Queue_t;
typedef struct {
Queue_t *play_queue;
Queue_t *last_frame;
ao_device *ao_device;
pthread_mutex_t mutex;
pthread_t thread;
} AO_Handle;
static Queue_t *front(AO_Handle *h)
{
assert(h->play_queue != NULL);
return h->play_queue;
}
static Queue_t *get(AO_Handle *h)
{
assert(h->play_queue != NULL);
Queue_t *q = h->play_queue;
h->play_queue = h->play_queue->next;
h->play_queue->prev = NULL;
if (h->play_queue == NULL) {
h->last_frame = NULL;
}
return q;
}
static void add(AO_Handle *h, Queue_t *elem)
{
if (h->last_frame == NULL) {
h->play_queue = elem;
elem->next = NULL;
elem->prev = NULL;
h->last_frame = h->play_queue;
} else {
h->last_frame->next = elem;
elem->prev = h->last_frame;
elem->next = NULL;
h->last_frame = elem;
}
}
static Queue_t *new_elem(int command, int buf_len, void *buf)
{
Queue_t *q = (Queue_t *) malloc(sizeof(Queue_t));
void *new_buf;
if (buf_len != 0) {
new_buf = (void *) malloc(buf_len);
memcpy(new_buf, buf, buf_len);
} else {
new_buf = NULL;
}
q->buf = new_buf;
q->buflen = buf_len;
q->command = command;
q->next = NULL;
q->prev = NULL;
return q;
}
static void clear(AO_Handle *h)
{
while (h->play_queue != NULL) {
Queue_t *q = get(h);
if (q->buflen != 0) {
free(q->buf);
}
free(q);
}
}
static void *run(void *arg)
{
AO_Handle *handle = (AO_Handle *) arg;
int go_on = (1 == 1);
while(go_on) {
pthread_mutex_lock(&handle->mutex);
int has_frames = (handle->play_queue != NULL);
if (has_frames) {
pthread_mutex_unlock(&handle->mutex);
} else {
pthread_mutex_unlock(&handle->mutex);
usleep(5000); // sleep for 5ms
}
}
return NULL;
}
void *ao_create_async(void *ao_device_yeah)
{
AO_Handle *handle = (AO_Handle *) malloc(sizeof(AO_Handle));
handle->ao_device = (ao_device *) ao_device_yeah;
handle->play_queue = NULL;
handle->last_frame = NULL;
pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
handle->mutex = m;
pthread_create(&handle->thread, NULL, run, handle);
return (void *) handle;
}
void ao_stop_async(void *ao_handle)
{
AO_Handle *h = (AO_Handle *) ao_handle;
clear(h);
Queue_t *q = new_elem(STOP, 0, NULL);
add(h, q);
}
void ao_play_async(void *ao_handle, int buf_size, void *mem)
{
AO_Handle *h = (AO_Handle *) ao_handle;
Queue_t *q = new_elem(PLAY, buf_size, mem);
add(h, q);
}

View File

@@ -0,0 +1,8 @@
#ifndef AO_PLAYASYNC_H
#define AO_PLAYASYNC_H
extern void *ao_create_async(void *ao_handle);
extern void ao_stop_async(void *handle);
extern void ao_play_async(void *handle, int buf_size, void *mem);
#endif // AO_PLAYASYNC_H

View File

@@ -2,7 +2,9 @@
(require "libao-ffi.rkt" (require "libao-ffi.rkt"
(prefix-in fin: finalizer) (prefix-in fin: finalizer)
ffi/unsafe) ffi/unsafe
data/queue
)
(provide ao-open-live (provide ao-open-live
ao-play ao-play
@@ -21,6 +23,8 @@
[byte-format #:auto #:mutable] [byte-format #:auto #:mutable]
[channels #:auto #:mutable] [channels #:auto #:mutable]
[rate #:auto #:mutable] [rate #:auto #:mutable]
[buffer #:auto #:mutable]
[player #:auto #:mutable]
) )
#:auto-value #f #:auto-value #f
) )
@@ -80,6 +84,36 @@
(set-ao-handle-byte-format! handle endianness) (set-ao-handle-byte-format! handle endianness)
(set-ao-handle-rate! handle rate) (set-ao-handle-rate! handle rate)
(set-ao-handle-channels! handle channels) (set-ao-handle-channels! handle channels)
(let ((buf (make-queue)))
(set-ao-handle-buffer! handle buf)
(set-ao-handle-player! handle
(thread (λ ()
(let ((samples-per-time 10)
(sample 0)
)
(define (play)
(displayln (format "Queue-length: ~a" (queue-length buf)))
(if (queue-empty? buf)
(begin
(sleep 0.1)
(play))
(let ((front (dequeue! buf)))
(if (eq? (car front) 'close)
'closed
(let ((audio (cadr front))
(audio-buf-len (caddr front)))
(ao_play ao-device audio audio-buf-len)
(play))
)
)
)
)
(play))
)
#:pool 'own
)
)
)
(hash-set! devices handle-num ao-device) (hash-set! devices handle-num ao-device)
(fin:register-finalizer handle (fin:register-finalizer handle
(lambda (handle) (lambda (handle)
@@ -97,6 +131,15 @@
(printf "Unexpected: cannot close ao-device")))) (printf "Unexpected: cannot close ao-device"))))
'internally-closed) 'internally-closed)
(let ((handle-num (ao-handle-handle-num handle))) (let ((handle-num (ao-handle-handle-num handle)))
(let ((q (ao-handle-buffer handle)))
(letrec ((emptier (λ () (if (queue-empty? q)
'done
(begin
(dequeue! q)
(emptier))))))
(emptier)
(enqueue! q (list 'close #f #f))
))
(let ((ao-device (hash-ref devices handle-num #f))) (let ((ao-device (hash-ref devices handle-num #f)))
(if (eq? ao-device #f) (if (eq? ao-device #f)
'error-ao-device-non-existent 'error-ao-device-non-existent
@@ -152,11 +195,16 @@
'filled)) 'filled))
)) ))
(fill 0 0) (fill 0 0)
(let* ((handle-num (ao-handle-handle-num handle)) (enqueue! (ao-handle-buffer handle) (list 'play-buf audio audio-buf-len))
(ao-device (hash-ref devices handle-num #f))) )
(if (eq? ao-device #f) )
(error "No device for this handle") )
(ao_play ao-device audio audio-buf-len))))))
;(let* ((handle-num (ao-handle-handle-num handle))
; (ao-device (hash-ref devices handle-num #f)))
; (if (eq? ao-device #f)
; (error "No device for this handle")
; (ao_play ao-device audio audio-buf-len))))))

View File

@@ -10,7 +10,6 @@
flac-read-meta flac-read-meta
flac-stream-state flac-stream-state
(all-from-out "flac-definitions.rkt") (all-from-out "flac-definitions.rkt")
test-file test-file2 test-file3
kinds kinds
last-buffer last-buf-len last-buffer last-buf-len
) )
@@ -124,8 +123,4 @@
(flac-handle-stream-info handle)) (flac-handle-stream-info handle))
#f))) #f)))
(define test-file "C:/devel/racket/racket-sound/libflac/capr24.flac")
(define test-file2 "C:/Muziek/Klassiek-Kamermuziek/Beethoven/Rachel Podger/01 Violin Sonata No. 1 in D Major, Op. 12 No. 1- I. Allegro con brio.flac")
(define test-file3 "c:/Muziek/Pop/Radiohead/The Best of Radiohead (2008)/02. Paranoid Android.flac")
); end of module ); end of module

View File

@@ -23,14 +23,16 @@
flac-duration flac-duration
) )
(define-struct flac-stream-info (define-struct flac-stream-info
(min-blocksize max-blocksize (min-blocksize max-blocksize
min-framesize max-framesize min-framesize max-framesize
sample-rate sample-rate
channels channels
bits-per-sample bits-per-sample
total-samples total-samples
)) )
#:transparent
)
(define (flac-stream-info->string si) (define (flac-stream-info->string si)
(format "sample-rate: ~a, channels: ~a, bits-per-sample: ~a, total-samples: ~a" (format "sample-rate: ~a, channels: ~a, bits-per-sample: ~a, total-samples: ~a"

View File

@@ -1,11 +1,13 @@
#lang racket/base #lang racket/base
(require "libao/libao.rkt" (require "libao/libao.rkt"
"libflac/flac-decoder.rkt" "libflac/flac-decoder.rkt"
data/queue
) )
(define fmt (ao-mk-format 16 44100 2 'big-endian)) (define test-file3 "/muziek/Klassiek-Viool/Alina Ibragimova/Paganini_24 Caprices (2021)/24. 24 Caprices, Op 1 - No. 24 in A minor- Tema con variazioni. Quasi presto.flac")
(define fmt (ao-mk-format 24 48000 2 'big-endian))
(define ao-h (ao-open-live #f fmt)) (define ao-h (ao-open-live #f fmt))
(define (flac-play frame buffer) (define (flac-play frame buffer)
@@ -14,7 +16,8 @@
(define (flac-meta meta) (define (flac-meta meta)
(displayln meta)) (displayln meta))
(define flac-h (flac-open test-file3 flac-meta flac-play)) (define flac-h
(flac-open test-file3 flac-meta flac-play))
(flac-read flac-h) (flac-read flac-h)