From 5fd8a1e04c725329435e3bead5f11ee3ffb9f1c1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 10 Nov 2014 22:01:23 +0100 Subject: audio: make decoders output refcounted frames This rewrites the audio decode loop to some degree. Audio filters don't do refcounted frames yet, so af.c contains a hacky "emulation". Remove some of the weird heuristic-heavy code in dec_audio.c. Instead of estimating how much audio we need to filter, we always filter full frames. Maybe this should be adjusted later: in case filtering increases the volume of the audio data, we should try not to buffer too much filter output by reducing the input that is fed at once. For ad_spdif.c and ad_mpg123.c, we don't avoid extra copying yet - it doesn't seem worth the trouble. --- audio/decode/ad.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'audio/decode/ad.h') diff --git a/audio/decode/ad.h b/audio/decode/ad.h index e09ded2efc..852df7ccc9 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -36,7 +36,7 @@ struct ad_functions { int (*init)(struct dec_audio *da, const char *decoder); void (*uninit)(struct dec_audio *da); int (*control)(struct dec_audio *da, int cmd, void *arg); - int (*decode_packet)(struct dec_audio *da); + int (*decode_packet)(struct dec_audio *da, struct mp_audio **out); }; enum ad_ctrl { -- cgit v1.2.3