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 /video/out/vo.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 'video/out/vo.c')
| -rw-r--r-- | video/out/vo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index 624136bd47..acae4f2acb 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -750,7 +750,9 @@ bool vo_is_ready_for_frame(struct vo *vo, int64_t next_pts) { struct vo_internal *in = vo->in; pthread_mutex_lock(&in->lock); - bool r = vo->config_ok && !in->frame_queued && + bool blocked = vo->driver->initially_blocked && + !(in->internal_events & VO_EVENT_INITIAL_UNBLOCK); + bool r = vo->config_ok && !in->frame_queued && !blocked && (!in->current_frame || in->current_frame->num_vsyncs < 1); if (r && next_pts >= 0) { // Don't show the frame too early - it would basically freeze the |