mirror of https://git.ffmpeg.org/ffmpeg.git
movdec: Calculate an average bit rate for fragmented streams, too
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
3b5d4428ac
commit
bc7d05177f
|
@ -125,6 +125,7 @@ typedef struct MOVStreamContext {
|
||||||
int dts_shift; ///< dts shift when ctts is negative
|
int dts_shift; ///< dts shift when ctts is negative
|
||||||
uint32_t palette[256];
|
uint32_t palette[256];
|
||||||
int has_palette;
|
int has_palette;
|
||||||
|
int64_t data_size;
|
||||||
} MOVStreamContext;
|
} MOVStreamContext;
|
||||||
|
|
||||||
typedef struct MOVContext {
|
typedef struct MOVContext {
|
||||||
|
|
|
@ -1580,8 +1580,10 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
|
|
||||||
init_get_bits(&gb, buf, 8*num_bytes);
|
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->sample_sizes[i] = get_bits_long(&gb, field_size);
|
||||||
|
sc->data_size += sc->sample_sizes[i];
|
||||||
|
}
|
||||||
|
|
||||||
av_free(buf);
|
av_free(buf);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2258,6 +2260,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
distance++;
|
distance++;
|
||||||
dts += sample_duration;
|
dts += sample_duration;
|
||||||
offset += sample_size;
|
offset += sample_size;
|
||||||
|
sc->data_size += sample_size;
|
||||||
}
|
}
|
||||||
frag->moof_offset = offset;
|
frag->moof_offset = offset;
|
||||||
st->duration = dts + sc->time_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)
|
if (pb->seekable && mov->chapter_track > 0)
|
||||||
mov_read_chapters(s);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue