Handle non-compliant files

Blackmagic Design DaVinci Resolve Studio can write mp4 file with `ctts version 1`
but mark it as `ctts version 0`.

Always interpreting the `sample_offset` as signed is safe even if
we have `ctts version 0`.
We need offset >= 6.6 hours (a frame, after being decoded, should wait 6.6
hours before being displayed) for getting overflow.

Author: Asd-g

core/box.h

@@ -2724,12 +2724,11 @@ void isom_update_cache_timestamp
 static inline uint64_t isom_make_cts
 (
     uint64_t dts,
-    uint32_t sample_offset,
-    int32_t  ctd_shift
+    uint32_t sample_offset
 )
 {
     if( sample_offset != ISOM_NON_OUTPUT_SAMPLE_OFFSET )
-        return ctd_shift ? (dts + (int32_t)sample_offset) : (dts + sample_offset);
+        return dts + (int32_t)sample_offset;
     else
         return LSMASH_TIMESTAMP_UNDEFINED;
 }
@@ -2744,7 +2743,7 @@ static inline uint64_t isom_make_cts_adjust
 )
 {
     if( sample_offset != ISOM_NON_OUTPUT_SAMPLE_OFFSET )
-        return ctd_shift ? (dts + (int32_t)sample_offset + ctd_shift) : (dts + sample_offset);
+        return dts + (int32_t)sample_offset + ctd_shift;
     else
         return LSMASH_TIMESTAMP_UNDEFINED;
 }

core/timeline.c

@@ -461,7 +461,7 @@ static int isom_get_cts_from_info_list( isom_timeline_t *timeline, uint32_t samp
     isom_sample_info_t *info = (isom_sample_info_t *)lsmash_list_get_entry_data( timeline->info_list, sample_number );
     if( !info )
         return LSMASH_ERR_NAMELESS;
-    *cts = isom_make_cts( *cts, info->offset, timeline->ctd_shift );
+    *cts = isom_make_cts( *cts, info->offset );
     return 0;
 }
 
@@ -555,7 +555,7 @@ static lsmash_sample_t *isom_get_lpcm_sample_from_media_timeline( isom_timeline_
         return NULL;
     /* Get sample info. */
     sample->dts    = timeline->last_accessed_lpcm_bunch_dts + sample_number_offset * bunch->duration;
-    sample->cts    = isom_make_cts( sample->dts, bunch->offset, timeline->ctd_shift );
+    sample->cts    = isom_make_cts( sample->dts, bunch->offset );
     sample->pos    = sample_pos;
     sample->length = bunch->length;
     sample->index  = bunch->index;
@@ -578,7 +578,7 @@ static lsmash_sample_t *isom_get_sample_from_media_timeline( isom_timeline_t *ti
         return NULL;
     /* Get sample info. */
     sample->dts    = dts;
-    sample->cts    = isom_make_cts( dts, info->offset, timeline->ctd_shift );
+    sample->cts    = isom_make_cts( dts, info->offset );
     sample->pos    = info->pos;
     sample->length = info->length;
     sample->index  = info->index;
@@ -593,7 +593,7 @@ static int isom_get_lpcm_sample_info_from_media_timeline( isom_timeline_t *timel
         return LSMASH_ERR_NAMELESS;
     uint64_t sample_number_offset = sample_number - timeline->last_accessed_lpcm_bunch_first_sample_number;
     sample->dts    = timeline->last_accessed_lpcm_bunch_dts + sample_number_offset * bunch->duration;
-    sample->cts    = isom_make_cts( sample->dts, bunch->offset, timeline->ctd_shift );
+    sample->cts    = isom_make_cts( sample->dts, bunch->offset );
     sample->pos    = bunch->pos + sample_number_offset * bunch->length;
     sample->length = bunch->length;
     sample->index  = bunch->index;
@@ -611,7 +611,7 @@ static int isom_get_sample_info_from_media_timeline( isom_timeline_t *timeline,
     if( !info )
         return LSMASH_ERR_NAMELESS;
     sample->dts    = dts;
-    sample->cts    = isom_make_cts( dts, info->offset, timeline->ctd_shift );
+    sample->cts    = isom_make_cts( dts, info->offset );
     sample->pos    = info->pos;
     sample->length = info->length;
     sample->index  = info->index;
@@ -2018,7 +2018,7 @@ int lsmash_get_media_timestamps( lsmash_root_t *root, uint32_t track_ID, lsmash_
                 return LSMASH_ERR_NAMELESS;
             }
             ts[i].dts = dts;
-            ts[i].cts = isom_make_cts( dts, info->offset, timeline->ctd_shift );
+            ts[i].cts = isom_make_cts( dts, info->offset );
             dts += info->duration;
             ++i;
         }
@@ -2034,7 +2034,7 @@ int lsmash_get_media_timestamps( lsmash_root_t *root, uint32_t track_ID, lsmash_
             for( uint32_t j = 0; j < bunch->sample_count; j++ )
             {
                 ts[i].dts = dts;
-                ts[i].cts = isom_make_cts( dts, bunch->offset, timeline->ctd_shift );
+                ts[i].cts = isom_make_cts( dts, bunch->offset );
                 dts += bunch->duration;
                 ++i;
             }