diff options
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/dec_sub.c | 2 | ||||
| -rw-r--r-- | sub/sd.h | 2 | ||||
| -rw-r--r-- | sub/sd_lavc.c | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 22dc3328b8..39eb032982 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -208,7 +208,7 @@ bool sub_read_packets(struct dec_sub *sub, double video_pts) while (1) { bool read_more = true; if (sub->sd->driver->accepts_packet) - read_more = sub->sd->driver->accepts_packet(sub->sd); + read_more = sub->sd->driver->accepts_packet(sub->sd, video_pts); if (!read_more) break; @@ -34,7 +34,7 @@ struct sd_functions { void (*select)(struct sd *sd, bool selected); void (*uninit)(struct sd *sd); - bool (*accepts_packet)(struct sd *sd); // implicit default if NULL: true + bool (*accepts_packet)(struct sd *sd, double pts); // implicit default if NULL: true int (*control)(struct sd *sd, enum sd_ctrl cmd, void *arg); void (*get_bitmaps)(struct sd *sd, struct mp_osd_res dim, int format, diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index fca437405c..9c217a6936 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -485,11 +485,21 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res d, int format, osd_rescale_bitmaps(res, insize[0], insize[1], d, video_par); } -static bool accepts_packet(struct sd *sd) +static bool accepts_packet(struct sd *sd, double min_pts) { struct sd_lavc_priv *priv = sd->priv; double pts = priv->current_pts; + if (min_pts != MP_NOPTS_VALUE) { + // guard against bogus rendering PTS in the future. + if (pts == MP_NOPTS_VALUE || min_pts < pts) + pts = min_pts; + // Heuristic: we assume rendering cannot lag behind more than 1 second + // behind decoding. + if (pts + 1 < min_pts) + pts = min_pts; + } + int last_needed = -1; for (int n = 0; n < MAX_QUEUE; n++) { struct sub *sub = &priv->subs[n]; |