diff options
author | wm4 <wm4@nowhere> | 2014-11-10 22:01:23 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-11-10 22:02:05 +0100 |
commit | 5fd8a1e04c725329435e3bead5f11ee3ffb9f1c1 (patch) | |
tree | a3a3ae0ac6ee87449ed780604e55da6dca2f34f2 /audio/decode/dec_audio.h | |
parent | 46d6fb9dc1a820b58dd3ffcc155195aea6bb0bd1 (diff) | |
download | mpv-5fd8a1e04c725329435e3bead5f11ee3ffb9f1c1.tar.bz2 mpv-5fd8a1e04c725329435e3bead5f11ee3ffb9f1c1.tar.xz |
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.
Diffstat (limited to 'audio/decode/dec_audio.h')
-rw-r--r-- | audio/decode/dec_audio.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h index 08fa87e8a7..ab7ae3375a 100644 --- a/audio/decode/dec_audio.h +++ b/audio/decode/dec_audio.h @@ -33,12 +33,13 @@ struct dec_audio { struct mpv_global *global; const struct ad_functions *ad_driver; struct sh_stream *header; - struct mp_audio_buffer *decode_buffer; struct af_stream *afilter; char *decoder_desc; int init_retries; + struct mp_audio_pool *pool; + struct mp_audio decode_format; + struct mp_audio *waiting; // used on format-change // set by decoder - struct mp_audio decoded; // decoded audio set by last decode_packet() call int bitrate; // input bitrate, can change with VBR sources // last known pts value in output from decoder double pts; |