From 34ebbfe8bd2a984623b8706c4fecdf1db76dd6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cartegnie?= <fcvlcdev@free.fr>
Date: Wed, 11 Dec 2024 17:44:54 +0700
Subject: [PATCH] demux: mock: fix TS_0 offset

---
 modules/demux/mock.c     | 28 ++++++++++++++--------------
 test/src/player/player.c |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/demux/mock.c b/modules/demux/mock.c
index 467b135579..38ee5abadd 100644
--- a/modules/demux/mock.c
+++ b/modules/demux/mock.c
@@ -546,7 +546,7 @@ Control(demux_t *demux, int query, va_list args)
             }
             return VLC_EGENERIC;
         case DEMUX_GET_POSITION:
-            *va_arg(args, double *) = sys->pts / (double) sys->length;
+            *va_arg(args, double *) = (sys->pts - VLC_TICK_0)/ (double) sys->length;
             return VLC_SUCCESS;
         case DEMUX_SET_POSITION:
             if (!sys->can_seek)
@@ -558,12 +558,12 @@ Control(demux_t *demux, int query, va_list args)
             *va_arg(args, vlc_tick_t *) = sys->length;
             return VLC_SUCCESS;
         case DEMUX_GET_TIME:
-            *va_arg(args, vlc_tick_t *) = sys->pts;
+            *va_arg(args, vlc_tick_t *) = sys->pts - VLC_TICK_0;
             return VLC_SUCCESS;
         case DEMUX_SET_TIME:
             if (!sys->can_seek)
                 return VLC_EGENERIC;
-            sys->pts = sys->video_pts = sys->audio_pts = va_arg(args, vlc_tick_t);
+            sys->pts = sys->video_pts = sys->audio_pts = VLC_TICK_0 + va_arg(args, vlc_tick_t);
             return VLC_SUCCESS;
         case DEMUX_GET_TITLE_INFO:
             if (sys->title_count > 0)
@@ -809,7 +809,7 @@ CheckAndCreateTracksEs(demux_t *demux, vlc_tick_t pts, bool *created)
     {
         if (track->id ||
            (track->video.add_track_at != VLC_TICK_INVALID &&
-            pts < track->video.add_track_at))
+            (pts - VLC_TICK_0) < track->video.add_track_at))
             continue;
         track->id = es_out_Add(demux->out, & track->fmt);
         if (!track->id)
@@ -1231,12 +1231,12 @@ Demux(demux_t *demux)
     else if (sys->video_track_count > 0 || sys->sub_track_count > 0)
         sys->pts = sys->video_pts;
 
-    if (sys->pts > sys->length)
-        sys->pts = sys->length;
+    if (sys->pts > VLC_TICK_0 + sys->length)
+        sys->pts = VLC_TICK_0 + sys->length;
 
     if (sys->chapter_gap > 0)
     {
-        int chapter_index = sys->pts / sys->chapter_gap;
+        int chapter_index = (sys->pts - VLC_TICK_0) / sys->chapter_gap;
         if (chapter_index != sys->current_chapter)
         {
             sys->updates |= INPUT_UPDATE_SEEKPOINT;
@@ -1268,8 +1268,8 @@ Demux(demux_t *demux)
     if (sys->audio_track_count > 0)
     {
         ret = DemuxAudio(demux, audio_step_length,
-                         __MIN(step_length + sys->audio_pts, sys->length));
-        if (sys->audio_pts + audio_step_length < sys->length)
+                         __MIN(step_length + sys->audio_pts - VLC_TICK_0, sys->length));
+        if (sys->audio_pts - VLC_TICK_0 + audio_step_length <= sys->length)
             eof = false;
     }
 
@@ -1277,8 +1277,8 @@ Demux(demux_t *demux)
      && (sys->video_track_count > 0 || sys->sub_track_count > 0))
     {
         ret = DemuxVideo(demux, video_step_length,
-                         __MIN(step_length + sys->video_pts, sys->length));
-        if (sys->video_pts + video_step_length < sys->length)
+                         __MIN(step_length + sys->video_pts - VLC_TICK_0, sys->length));
+        if (sys->video_pts - VLC_TICK_0 + video_step_length < sys->length)
             eof = false;
     }
 
@@ -1286,7 +1286,7 @@ Demux(demux_t *demux)
     if (step_length == 0)
     {
         sys->pts += sys->input_sample_length;
-        if (sys->pts + sys->input_sample_length < sys->length)
+        if (sys->pts - VLC_TICK_0 + sys->input_sample_length < sys->length)
             eof = false;
     }
 
@@ -1535,8 +1535,8 @@ ParseDiscontinuities(demux_t *demux)
 
         assert(index < pcr_count);
         struct pcr_point *point = &sys->pcr_points.data[index++];
-        point->oldpcr = oldpcrval;
-        point->newpcr = newpcrval;
+        point->oldpcr = VLC_TICK_0 + oldpcrval;
+        point->newpcr = VLC_TICK_0 + newpcrval;
     }
 
     return VLC_SUCCESS;
diff --git a/test/src/player/player.c b/test/src/player/player.c
index 4b7646e1fb..6714c68ea0 100644
--- a/test/src/player/player.c
+++ b/test/src/player/player.c
@@ -3006,9 +3006,9 @@ test_clock_discontinuities(struct ctx *ctx)
         vlc_player_CondWait(player, &ctx->wait);
 
     assert(vec->data[0] == VLC_TICK_0); /* Initial PTS */
-    assert(vec->data[1] == 2); /* 1st discontinuity */
-    assert(vec->data[2] == 2500000); /* 2nd discontinuity */
-    assert(vec->data[3] == 10000000); /* 3rd discontinuity */
+    assert(vec->data[1] == VLC_TICK_0 + 2); /* 1st discontinuity */
+    assert(vec->data[2] == VLC_TICK_0 + 2500000); /* 2nd discontinuity */
+    assert(vec->data[3] == VLC_TICK_0 + 10000000); /* 3rd discontinuity */
 
     test_end(ctx);
 }