path: root/audio/out/ao.h
diff options
authorwm4 <wm4@nowhere>2013-11-08 20:00:58 +0100
committerwm4 <wm4@nowhere>2013-11-08 20:00:58 +0100
commit8125252399d9b02a6f143d109a92341ff7eff5a9 (patch)
tree3b9fed7c1acadca63714c29d39fda681f0dda33a /audio/out/ao.h
parent052a7d54ab4efbf9743767ea7aae95c98f5b5379 (diff)
audio: don't let ao_lavc access frontend internals, change gapless audio
ao_lavc.c accesses ao->buffer, which I consider internal. The access was done in ao_lavc.c/uninit(), which tried to get the left-over audio in order to write the last (possibly partial) audio frame. The play() function didn't accept partial frames, because the AOPLAY_FINAL_CHUNK flag was not correctly set, and handling it otherwise would require an internal FIFO. Fix this by making sure that with gapless audio (used with encoding), the AOPLAY_FINAL_CHUNK is set only once, instead when each file ends. Basically, move the hack in ao_lavc's uninit to uninit_player. One thing can not be entirely correctly handled: if gapless audio is active, we don't know really whether the AO is closed because the file ended playing (i.e. we want to send the buffered remainder of the audio to the AO), or whether the user is quitting the player. (The stop_play flag is overwritten, fixing that is perhaps not worth it.) Handle this by adding additional code to drain the AO and the buffers when playback is quit (see play_current_file() change). Test case: mpv avdevice://lavfi:sine=441 avdevice://lavfi:sine=441 -length 0.2267 -gapless-audio
Diffstat (limited to 'audio/out/ao.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 3d64102ada..7e7b6968bb 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -73,7 +73,8 @@ struct ao {
int bps; // bytes per second
double pts; // some mplayer.c state (why is this here?)
struct bstr buffer;
- int buffer_playable_size;
+ int buffer_playable_size; // part of the part of the buffer the AO hasn't
+ // accepted yet with play()
bool probing; // if true, don't fail loudly on init
bool untimed;
bool no_persistent_volume; // the AO does the equivalent of af_volume