Mercurial > libavformat.hg

changeset 5562:5d938dd16b34 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set average frame rate in mov demuxer
author bcoudurier
date Mon, 18 Jan 2010 23:56:04 +0000
parents 067c0af56a4c
children 9baa7b82a840
files mov.c utils.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Mon Jan 18 21:38:39 2010 +0000
+++ b/mov.c	Mon Jan 18 23:56:04 2010 +0000
@@ -1652,14 +1652,18 @@
     } else
         sc->pb = c->fc->pb;
 
-    if (st->codec->codec_type == CODEC_TYPE_VIDEO &&
-        (st->codec->width != sc->width || st->codec->height != sc->height)) {
+    if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+        if (st->codec->width != sc->width || st->codec->height != sc->height) {
         AVRational r = av_d2q(((double)st->codec->height * sc->width) /
                               ((double)st->codec->width * sc->height), INT_MAX);
         if (st->sample_aspect_ratio.num)
             st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r);
         else
             st->sample_aspect_ratio = r;
+        }
+
+        av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
+                  sc->time_scale*st->nb_frames, st->duration, INT_MAX);
     }
 
     switch (st->codec->codec_id) {
--- a/utils.c	Mon Jan 18 21:38:39 2010 +0000
+++ b/utils.c	Mon Jan 18 23:56:04 2010 +0000
@@ -2218,7 +2218,7 @@
     }
     for(i=0;i<ic->nb_streams;i++) {
         st = ic->streams[i];
-        if(codec_info_nb_frames[i]>2)
+        if(codec_info_nb_frames[i]>2 && !st->avg_frame_rate.num)
             av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                      (codec_info_nb_frames[i]-2)*(int64_t)st->time_base.den,
                       codec_info_duration[i]    *(int64_t)st->time_base.num, 60000);