Mercurial > libavformat.hg
changeset 5566:28094e9bd013 libavformat
Set start_time and duration in AVStream instead of AVFormatContext for
formats with only one stream; the AVFormatContext values will be derived from
the AVStream and this helps in calculating stream bitrate.
| author | conrad |
|---|---|
| date | Thu, 21 Jan 2010 09:47:02 +0000 |
| parents | befe2f0f9a00 |
| children | 9934ca658946 |
| files | ape.c mpc.c wv.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ape.c Wed Jan 20 17:26:14 2010 +0000 +++ b/ape.c Thu Jan 21 09:47:02 2010 +0000 @@ -310,8 +310,8 @@ st->codec->frame_size = MAC_SUBFRAME_SIZE; st->nb_frames = ape->totalframes; - s->start_time = 0; - s->duration = (int64_t) total_blocks * AV_TIME_BASE / ape->samplerate; + st->start_time = 0; + st->duration = total_blocks / MAC_SUBFRAME_SIZE; av_set_pts_info(st, 64, MAC_SUBFRAME_SIZE, ape->samplerate); st->codec->extradata = av_malloc(APE_EXTRADATA_SIZE);
--- a/mpc.c Wed Jan 20 17:26:14 2010 +0000 +++ b/mpc.c Thu Jan 21 09:47:02 2010 +0000 @@ -115,8 +115,8 @@ st->codec->sample_rate = mpc_rate[st->codec->extradata[2] & 3]; av_set_pts_info(st, 32, MPC_FRAMESIZE, st->codec->sample_rate); /* scan for seekpoints */ - s->start_time = 0; - s->duration = (int64_t)c->fcount * MPC_FRAMESIZE * AV_TIME_BASE / st->codec->sample_rate; + st->start_time = 0; + st->duration = c->fcount; /* try to read APE tags */ if (!url_is_streamed(s->pb)) {
--- a/wv.c Wed Jan 20 17:26:14 2010 +0000 +++ b/wv.c Thu Jan 21 09:47:02 2010 +0000 @@ -168,8 +168,8 @@ st->codec->sample_rate = wc->rate; st->codec->bits_per_coded_sample = wc->bpp; av_set_pts_info(st, 64, 1, wc->rate); - s->start_time = 0; - s->duration = (int64_t)wc->samples * AV_TIME_BASE / st->codec->sample_rate; + st->start_time = 0; + st->duration = wc->samples; if(!url_is_streamed(s->pb)) { int64_t cur = url_ftell(s->pb);