RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

sub/sd_ass: utilize UINT32_MAX subtitle duration for unknown 

US closed captions, teletext and ARIB caption decoders utilize this
value.
This commit is contained in:
Jan Ekström 2019-09-18 21:29:25 +03:00
parent 1b9370ff92
commit 2d74b2d832
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sub/lavc_conv.c
View File

@ -260,9 +260,11 @@ char **lavc_conv_decode(struct lavc_conv *priv, struct demux_packet *packet,
} else if (got_sub) {
*sub_pts = packet->pts + mp_pts_from_av(priv->cur.start_display_time,
&avctx->time_base);
*sub_duration = mp_pts_from_av(priv->cur.end_display_time -
priv->cur.start_display_time,
&avctx->time_base);
*sub_duration = priv->cur.end_display_time == UINT32_MAX ?
UINT32_MAX :
mp_pts_from_av(priv->cur.end_display_time -
priv->cur.start_display_time,
&avctx->time_base);
for (int i = 0; i < priv->cur.num_rects; i++) {
if (priv->cur.rects[i]->w > 0 && priv->cur.rects[i]->h > 0)

15
sub/sd_ass.c
View File

@ -234,17 +234,18 @@ static void decode(struct sd *sd, struct demux_packet *packet)
if (!sd->opts->sub_clear_on_seek && packet->pos >= 0 &&
check_packet_seen(sd, packet->pos))
return;
if (packet->duration < 0) {
if (!ctx->duration_unknown) {
MP_WARN(sd, "Subtitle with unknown duration.\n");
ctx->duration_unknown = true;
}
packet->duration = UNKNOWN_DURATION;
}
double sub_pts = 0;
double sub_duration = 0;
char **r = lavc_conv_decode(ctx->converter, packet, &sub_pts,
&sub_duration);
if (packet->duration < 0 || sub_duration == UINT32_MAX) {
if (!ctx->duration_unknown) {
MP_WARN(sd, "Subtitle with unknown duration.\n");
ctx->duration_unknown = true;
}
sub_duration = UNKNOWN_DURATION;
}
for (int n = 0; r && r[n]; n++) {
char *ass_line = r[n];