diff options
author | wm4 <wm4@nowhere> | 2018-04-29 19:42:18 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-05-03 01:08:44 +0300 |
commit | 0ab3184526e7b9b95c06a3ec7a6674283a5922d0 (patch) | |
tree | 4c05b192e65b51c68f3024b4b7946dcb79caf404 /audio/out/ao_lavc.c | |
parent | 958053ff56109a38e9f8e0a0aa8786a5f47adb7c (diff) | |
download | mpv-0ab3184526e7b9b95c06a3ec7a6674283a5922d0.tar.bz2 mpv-0ab3184526e7b9b95c06a3ec7a6674283a5922d0.tar.xz |
encode: get rid of the output packet queue
Until recently, ao_lavc and vo_lavc started encoding whenever the core
happened to send them data. Since audio and video are not initialized at
the same time, and the muxer was not necessarily opened when the first
encoder started to produce data, the resulting packets were put into a
queue. As soon as the muxer was opened, the queue was flushed.
Change this to make the core wait with sending data until all encoders
are initialized. This has the advantage that we don't need to queue up
the packets.
Diffstat (limited to 'audio/out/ao_lavc.c')
-rw-r--r-- | audio/out/ao_lavc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index bb86224229..974d9d0b63 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -84,6 +84,13 @@ static void select_format(struct ao *ao, const AVCodec *codec) } } +static void on_ready(void *ptr) +{ + struct ao *ao = ptr; + + ao_add_events(ao, AO_EVENT_INITIAL_UNBLOCK); +} + // open & setup audio device static int init(struct ao *ao) { @@ -123,7 +130,7 @@ static int init(struct ao *ao) encoder->sample_fmt = af_to_avformat(ao->format); encoder->bits_per_raw_sample = ac->sample_size * 8; - if (!encoder_init_codec_and_muxer(ac->enc)) + if (!encoder_init_codec_and_muxer(ac->enc, on_ready, ao)) goto fail; ac->pcmhack = 0; @@ -342,6 +349,7 @@ const struct ao_driver audio_out_lavc = { .encode = true, .description = "audio encoding using libavcodec", .name = "lavc", + .initially_blocked = true, .priv_size = sizeof(struct priv), .init = init, .uninit = uninit, |