From f57ff798670af4cbb1d8fc357b40adeaf90f9696 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Fri, 13 Oct 2017 14:13:32 -0700 Subject: demux: ignore false underrun reporting from eia_608 captions decoder --- demux/demux.c | 3 +++ demux/stheader.h | 1 + 2 files changed, 4 insertions(+) diff --git a/demux/demux.c b/demux/demux.c index b80fbeaff7..2356d0ad3f 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -457,6 +457,7 @@ void demuxer_feed_caption(struct sh_stream *stream, demux_packet_t *dp) return; } sh->codec->codec = "eia_608"; + sh->ignore_eof = true; stream->ds->cc = sh; demux_add_sh_stream(demuxer, sh); } @@ -1659,6 +1660,8 @@ static int cached_demux_control(struct demux_internal *in, int cmd, void *arg) int num_packets = 0; for (int n = 0; n < in->num_streams; n++) { struct demux_stream *ds = in->streams[n]->ds; + if (in->streams[n]->ignore_eof) + continue; if (ds->active && !(!ds->head && ds->eof)) { r->underrun |= !ds->head && !ds->eof; r->ts_range[0] = MP_PTS_MAX(r->ts_range[0], ds->base_ts); diff --git a/demux/stheader.h b/demux/stheader.h index a0820f55b7..319f56109b 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -56,6 +56,7 @@ struct sh_stream { // Internal to demux.c struct demux_stream *ds; + bool ignore_eof; // ignore stream in underrun detection }; struct mp_codec_params { -- cgit v1.2.3