ismindex: Calculate the file duration among the included tracks
authorMartin Storsjö <martin@martin.st>
Fri, 4 Oct 2013 07:12:07 +0000 (10:12 +0300)
committerMartin Storsjö <martin@martin.st>
Fri, 4 Oct 2013 21:01:18 +0000 (00:01 +0300)
If the input file contains other tracks (non video/audio) that
aren't included in ismindex, the global file duration as returned
by libavformat might not be equal to the maximum of the duration
of the actual included tracks.

Signed-off-by: Martin Storsjö <martin@martin.st>
tools/ismindex.c

index 64fa7e8..d5cf138 100644 (file)
@@ -292,8 +292,6 @@ static int handle_file(struct Tracks *tracks, const char *file, int split)
         fprintf(stderr, "No streams found in %s\n", file);
         goto fail;
     }
-    if (!tracks->duration)
-        tracks->duration = ctx->duration;
 
     for (i = 0; i < ctx->nb_streams; i++) {
         struct Track **temp;
@@ -332,6 +330,10 @@ static int handle_file(struct Tracks *tracks, const char *file, int split)
             continue;
         }
 
+        tracks->duration = FFMAX(tracks->duration,
+                                 av_rescale_rnd(track->duration, AV_TIME_BASE,
+                                                track->timescale, AV_ROUND_UP));
+
         if (track->is_audio) {
             if (tracks->audio_track < 0)
                 tracks->audio_track = tracks->nb_tracks;