From 3bf7df4a5e1f46248c78e9e596cd8dab6ff57356 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 29 Dec 2017 15:39:38 +0100
Subject: sub: move all subtitle timestamp messing code to a central place

It was split at least across osd.c and sd_ass.c/sd_lavc.c. sd_lavc.c
actually ignored most of the more obscure subtitle timing things.
There's no reason for this - just move it all to dec_sub.c (mostly from
sd_ass.c, because it has some of the most complex stuff).

Now timestamps are transformed as they enter or leave dec_sub.c.

There appear to have been some subtle mismatches about how subtitle
timestamps were transformed, e.g. sd_functions.accepts_packet didn't
apply the subtitle speed to the timestamp. This patch should fix them,
although it's not clear if they caused actual misbehavior.

The semantics of SD_CTRL_SUB_STEP are slightly changed, which is the
reason for the changes in command.c and sd_lavc.c.
---
 sub/sd_ass.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

(limited to 'sub/sd_ass.c')

diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 4bc9e15f8a..74d500be8d 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -49,7 +49,6 @@ struct sd_ass_priv {
     char last_text[500];
     struct mp_image_params video_params;
     struct mp_image_params last_params;
-    double sub_speed, video_fps, frame_fps;
     int64_t *seen_packets;
     int num_seen_packets;
     bool duration_unknown;
@@ -147,24 +146,6 @@ static void enable_output(struct sd *sd, bool enable)
     }
 }
 
-static void update_subtitle_speed(struct sd *sd)
-{
-    struct MPOpts *opts = sd->opts;
-    struct sd_ass_priv *ctx = sd->priv;
-    ctx->sub_speed = 1.0;
-
-    if (ctx->video_fps > 0 && ctx->frame_fps > 0) {
-        MP_VERBOSE(sd, "Frame based format, dummy FPS: %f, video FPS: %f\n",
-                   ctx->frame_fps, ctx->video_fps);
-        ctx->sub_speed *= ctx->frame_fps / ctx->video_fps;
-    }
-
-    if (opts->sub_fps && ctx->video_fps)
-        ctx->sub_speed *= opts->sub_fps / ctx->video_fps;
-
-    ctx->sub_speed *= opts->sub_speed;
-}
-
 static int init(struct sd *sd)
 {
     struct MPOpts *opts = sd->opts;
@@ -212,9 +193,6 @@ static int init(struct sd *sd)
     ass_set_check_readorder(ctx->ass_track, sd->opts->sub_clear_on_seek ? 0 : 1);
 #endif
 
-    ctx->frame_fps = sd->codec->frame_based;
-    update_subtitle_speed(sd);
-
     enable_output(sd, true);
 
     ctx->packer = mp_ass_packer_alloc(ctx);
@@ -387,8 +365,6 @@ static long long find_timestamp(struct sd *sd, double pts)
     if (pts == MP_NOPTS_VALUE)
         return 0;
 
-    pts /= priv->sub_speed;
-
     long long ts = llrint(pts * 1000);
 
     if (!sd->opts->sub_fix_timing || sd->opts->ass_style_override == 0)
@@ -679,11 +655,11 @@ static int control(struct sd *sd, enum sd_ctrl cmd, void *arg)
     switch (cmd) {
     case SD_CTRL_SUB_STEP: {
         double *a = arg;
-        long long ts = llrint(a[0] * (1000.0 / ctx->sub_speed));
+        long long ts = llrint(a[0] * 1000.0);
         long long res = ass_step_sub(ctx->ass_track, ts, a[1]);
         if (!res)
             return false;
-        a[0] = res / (1000.0 / ctx->sub_speed);
+        a[0] += res / 1000.0;
         return true;
     }
     case SD_CTRL_SET_VIDEO_PARAMS:
@@ -692,13 +668,6 @@ static int control(struct sd *sd, enum sd_ctrl cmd, void *arg)
     case SD_CTRL_SET_TOP:
         ctx->on_top = *(bool *)arg;
         return CONTROL_OK;
-    case SD_CTRL_SET_VIDEO_DEF_FPS:
-        ctx->video_fps = *(double *)arg;
-        update_subtitle_speed(sd);
-        return CONTROL_OK;
-    case SD_CTRL_UPDATE_SPEED:
-        update_subtitle_speed(sd);
-        return CONTROL_OK;
     default:
         return CONTROL_UNKNOWN;
     }
-- 
cgit v1.2.3