summaryrefslogtreecommitdiffstats
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-01-13 14:40:24 +0200
committerMartin Storsjö <martin@martin.st>2012-01-25 12:15:41 +0200
commitbc7d05177fc93c62de4e03dddccba55c42124e5a (patch)
tree2daf5aeaaef3c14f33596718fb1e4bb1beddfd95 /libavformat/mov.c
parent3b5d4428acf6eab60410358a5dbf931a17300ecf (diff)
downloadffmpeg-streaming-bc7d05177fc93c62de4e03dddccba55c42124e5a.zip
ffmpeg-streaming-bc7d05177fc93c62de4e03dddccba55c42124e5a.tar.gz
movdec: Calculate an average bit rate for fragmented streams, too
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index c6022d5..9fb4a21 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1580,8 +1580,10 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
init_get_bits(&gb, buf, 8*num_bytes);
- for (i=0; i<entries; i++)
+ for (i = 0; i < entries; i++) {
sc->sample_sizes[i] = get_bits_long(&gb, field_size);
+ sc->data_size += sc->sample_sizes[i];
+ }
av_free(buf);
return 0;
@@ -2258,6 +2260,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
distance++;
dts += sample_duration;
offset += sample_size;
+ sc->data_size += sample_size;
}
frag->moof_offset = offset;
st->duration = dts + sc->time_offset;
@@ -2576,6 +2579,16 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (pb->seekable && mov->chapter_track > 0)
mov_read_chapters(s);
+ if (mov->trex_data) {
+ int i;
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ MOVStreamContext *sc = st->priv_data;
+ if (st->duration)
+ st->codec->bit_rate = sc->data_size * 8 * sc->time_scale / st->duration;
+ }
+ }
+
return 0;
}
OpenPOWER on IntegriCloud