From caaa1189ba75a7df9a4d02f7747d6c0bf3b05012 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 21 Sep 2017 04:10:19 +0200 Subject: audio_buffer: remove dependency on mp_audio Just reimplement it in some way, as mp_audio is GPL-only. Actually I wanted to get rid of audio_buffer.c completely (and instead have a list of mp_aframes), but to do so would require rewriting some more player core audio code. So to get this LGPL relicensing over quickly, just do some extra work. --- audio/audio_buffer.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'audio/audio_buffer.h') diff --git a/audio/audio_buffer.h b/audio/audio_buffer.h index 212d187572..0d7b66a527 100644 --- a/audio/audio_buffer.h +++ b/audio/audio_buffer.h @@ -19,24 +19,18 @@ #define MP_AUDIO_BUFFER_H struct mp_audio_buffer; -struct mp_audio; struct mp_chmap; struct mp_audio_buffer *mp_audio_buffer_create(void *talloc_ctx); -void mp_audio_buffer_reinit(struct mp_audio_buffer *ab, struct mp_audio *fmt); void mp_audio_buffer_reinit_fmt(struct mp_audio_buffer *ab, int format, const struct mp_chmap *channels, int srate); -void mp_audio_buffer_get_format(struct mp_audio_buffer *ab, - struct mp_audio *out_fmt); void mp_audio_buffer_preallocate_min(struct mp_audio_buffer *ab, int samples); int mp_audio_buffer_get_write_available(struct mp_audio_buffer *ab); -void mp_audio_buffer_get_write_buffer(struct mp_audio_buffer *ab, int minsamples, - struct mp_audio *out_buffer); -void mp_audio_buffer_finish_write(struct mp_audio_buffer *ab, int samples); -void mp_audio_buffer_append(struct mp_audio_buffer *ab, struct mp_audio *mpa); +void mp_audio_buffer_append(struct mp_audio_buffer *ab, void **ptr, int samples); void mp_audio_buffer_prepend_silence(struct mp_audio_buffer *ab, int samples); void mp_audio_buffer_duplicate(struct mp_audio_buffer *ab, int samples); -void mp_audio_buffer_peek(struct mp_audio_buffer *ab, struct mp_audio *out_mpa); +void mp_audio_buffer_peek(struct mp_audio_buffer *ab, uint8_t ***ptr, + int *samples); void mp_audio_buffer_skip(struct mp_audio_buffer *ab, int samples); void mp_audio_buffer_clear(struct mp_audio_buffer *ab); int mp_audio_buffer_samples(struct mp_audio_buffer *ab); -- cgit v1.2.3