Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

sub: redecode cached packets on UPDATE_SUB_HARD or UPDATE_SUB_FILT

Browse Source 
UPDATE_SUB_HARD causes all of the ass objects to reset in order to apply
the new style. UPDATE_SUB_FILT doesn't actually reset the sd, but it
should in order to update the actual filters so that was added here.
Doing this causes the current subtitle to be dropped. In the paused
cause, this concidentally works because command.c forces a video refresh
which then reloads the subtitle essentially. But while playing, the
subtitle will be dropped and you won't get anything until the next one
appears.

Instead of using video refreshes, what we can do is just always save the
last two subtitle packets in a cache and redecode them if needed. This
is much easier and also allows us to get rid of all the video refresh
logic in command.c. Fixes #12386.
This commit is contained in:
Dudemanguy
2023-10-20 12:07:31 -05:00
parent 90170c1100
commit 062104d16e
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sub/dec_sub.c
View File

@@ -69,6 +69,7 @@ struct dec_sub {
struct sd *sd;
struct demux_packet *new_segment;
struct demux_packet *cached_pkts[2];
};
static void update_subtitle_speed(struct dec_sub *sub)
@@ -309,6 +310,15 @@ bool sub_read_packets(struct dec_sub *sub, double video_pts, bool force)
if (sub->recorder_sink)
mp_recorder_feed_packet(sub->recorder_sink, pkt);
// Update cached packets
if (sub->cached_pkts[0]) {
if (sub->cached_pkts[1])
talloc_free(sub->cached_pkts[1]);
sub->cached_pkts[1] = sub->cached_pkts[0];
}
sub->cached_pkts[0] = pkt;
sub->last_pkt_pts = pkt->pts;
if (is_new_segment(sub, pkt)) {
@@ -320,13 +330,23 @@ bool sub_read_packets(struct dec_sub *sub, double video_pts, bool force)
if (!(sub->preload_attempted && sub->sd->preload_ok))
sub->sd->driver->decode(sub->sd, pkt);
talloc_free(pkt);
}
pthread_mutex_unlock(&sub->lock);
return r;
}
// Redecode both cached packets if needed.
// Used with UPDATE_SUB_HARD and UPDATE_SUB_FILT.
void sub_redecode_cached_packets(struct dec_sub *sub)
{
pthread_mutex_lock(&sub->lock);
if (sub->cached_pkts[0])
sub->sd->driver->decode(sub->sd, sub->cached_pkts[0]);
if (sub->cached_pkts[1])
sub->sd->driver->decode(sub->sd, sub->cached_pkts[1]);
pthread_mutex_unlock(&sub->lock);
}
// Unref sub_bitmaps.rc to free the result. May return NULL.
struct sub_bitmaps *sub_get_bitmaps(struct dec_sub *sub, struct mp_osd_res dim,
int format, double pts)
@@ -398,8 +418,9 @@ void sub_reset(struct dec_sub *sub)
sub->sd->driver->reset(sub->sd);
sub->last_pkt_pts = MP_NOPTS_VALUE;
sub->last_vo_pts = MP_NOPTS_VALUE;
talloc_free(sub->new_segment);
sub->new_segment = NULL;
TA_FREEP(&sub->cached_pkts[0]);
TA_FREEP(&sub->cached_pkts[1]);
TA_FREEP(&sub->new_segment);
pthread_mutex_unlock(&sub->lock);
}