diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-11-05 19:29:18 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-11-06 23:12:13 +0000 |
| commit | 953176ee423445069bae49bf8e9bc36f4390de4c (patch) | |
| tree | d2fd2be16491e6b066a61f8aa6acf1e8444f90cd | |
| parent | 7d004bf15c613a5553f38966adeb4d3bb6e589f8 (diff) | |
| download | mpv-953176ee423445069bae49bf8e9bc36f4390de4c.tar.bz2 mpv-953176ee423445069bae49bf8e9bc36f4390de4c.tar.xz | |
sub: adjust offsets when sub seeking/stepping
In the sub seek code path, there was an arbitrary small offset added to
the pts before the seek. However when seeking backwards, the offset was
an additional subtraction. de6eace6e984be3cd2515e9be6362a0cf04b7457
added this logic 10 years ago and perhaps it made sense then, but the
additional subtraction when seeking backwards causes the subtitle seek
to go too far to the previous subtitle if the durations overlap. This
should always be an addition to work correctly. Additionally, the sub
stepping code path also could use this offset for the same reason
(duration overlaps). However, it is only applicable to sd_ass not
sd_lavc. sd_lavc has step_sub support but on a sample it didn't even
work anyway. Perhaps it only works for certain kinds of subtitles
(patches welcome).
Anyways instead of keeping this offset as a magic number, we can define
it in sd.h which is handy for this. For sd_ass, we add the offset when
sub stepping, and the offset is always added for sub seeking like it was
before. Update the comment to be a little more relevant to what actually
happens today. Fixes #11445.
| -rw-r--r-- | player/command.c | 12 | ||||
| -rw-r--r-- | sub/sd.h | 2 | ||||
| -rw-r--r-- | sub/sd_ass.c | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/player/command.c b/player/command.c index 8dbea662f8..a397f2d9d0 100644 --- a/player/command.c +++ b/player/command.c @@ -49,8 +49,9 @@ #include "demux/demux.h" #include "demux/stheader.h" #include "common/playlist.h" -#include "sub/osd.h" #include "sub/dec_sub.h" +#include "sub/osd.h" +#include "sub/sd.h" #include "options/m_option.h" #include "options/m_property.h" #include "options/m_config_frontend.h" @@ -5410,11 +5411,10 @@ static void cmd_sub_step_seek(void *p) &mpctx->opts->subs_rend->sub_delay); show_property_osd(mpctx, "sub-delay", cmd->on_osd); } else { - // We can easily get stuck by failing to seek to the video - // frame which actually shows the sub first (because video - // frame PTS and sub PTS rarely match exactly). Add some - // rounding for the mess of it. - a[0] += 0.01 * (a[1] >= 0 ? 1 : -1); + // We can easily seek/step to the wrong subtitle line (because + // video frame PTS and sub PTS rarely match exactly). Add an + // arbitrary forward offset as a workaround. + a[0] += SUB_SEEK_OFFSET; mark_seek(mpctx); queue_seek(mpctx, MPSEEK_ABSOLUTE, a[0], MPSEEK_EXACT, MPSEEK_FLAG_DELAY); @@ -9,6 +9,8 @@ #define SUB_GAP_THRESHOLD 0.210 // don't change timings if durations are smaller #define SUB_GAP_KEEP 0.4 +// slight offset when sub seeking or sub stepping +#define SUB_SEEK_OFFSET 0.01 struct sd { struct mpv_global *global; diff --git a/sub/sd_ass.c b/sub/sd_ass.c index d3c220b5fe..bbf3218f49 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -844,7 +844,8 @@ static int control(struct sd *sd, enum sd_ctrl cmd, void *arg) long long res = ass_step_sub(ctx->ass_track, ts, a[1]); if (!res) return false; - a[0] += res / 1000.0; + // Try to account for overlapping durations + a[0] += res / 1000.0 + SUB_SEEK_OFFSET; return true; } case SD_CTRL_SET_VIDEO_PARAMS: |