MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

movdec: Calculate an average bit rate for fragmented streams, too

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-01-13 14:40:24 +02:00
parent 3b5d4428ac
commit bc7d05177f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@ -125,6 +125,7 @@ typedef struct MOVStreamContext {
int dts_shift; ///< dts shift when ctts is negative
uint32_t palette[256];
int has_palette;
int64_t data_size;
} MOVStreamContext;
typedef struct MOVContext {

15
libavformat/mov.c
View File

@ -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;
}