[FFmpeg-devel] [PATCH] lavf/ape: Fix stream duration calculation

Michael Niedermayer michaelni at gmx.at
Thu Aug 23 15:57:09 CEST 2012


On Thu, Aug 23, 2012 at 09:04:15AM +0000, Paul B Mahol wrote:
> On 8/23/12, jamal <jamrial at gmail.com> wrote:
> > Fixes ticket #1662
> > ---
> >  libavformat/ape.c |    8 +++-----
> >  1 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/libavformat/ape.c b/libavformat/ape.c
> > index 547a9c0..c4a390b 100644
> > --- a/libavformat/ape.c
> > +++ b/libavformat/ape.c
> > @@ -38,8 +38,6 @@
> >  #define MAC_FORMAT_FLAG_HAS_SEEK_ELEMENTS    16 // has the number of seek
> > elements after the peak level
> >  #define MAC_FORMAT_FLAG_CREATE_WAV_HEADER    32 // create the wave header
> > on decompression (not stored)
> >
> > -#define MAC_SUBFRAME_SIZE 4608
> > -
> >  #define APE_EXTRADATA_SIZE 6
> >
> >  typedef struct {
> > @@ -335,8 +333,8 @@ static int ape_read_header(AVFormatContext * s)
> >
> >      st->nb_frames = ape->totalframes;
> >      st->start_time = 0;
> > -    st->duration  = total_blocks / MAC_SUBFRAME_SIZE;
> > -    avpriv_set_pts_info(st, 64, MAC_SUBFRAME_SIZE, ape->samplerate);
> > +    st->duration  = total_blocks;
> > +    avpriv_set_pts_info(st, 64, 1, ape->samplerate);
> >
> >      st->codec->extradata = av_malloc(APE_EXTRADATA_SIZE);
> >      st->codec->extradata_size = APE_EXTRADATA_SIZE;
> > @@ -348,7 +346,7 @@ static int ape_read_header(AVFormatContext * s)
> >      for (i = 0; i < ape->totalframes; i++) {
> >          ape->frames[i].pts = pts;
> >          av_add_index_entry(st, ape->frames[i].pos, ape->frames[i].pts, 0,
> > 0, AVINDEX_KEYFRAME);
> > -        pts += ape->blocksperframe / MAC_SUBFRAME_SIZE;
> > +        pts += ape->blocksperframe;
> >      }
> >
> >      /* try to read APE tags */
> 
> Should be OK if it does not break fate.

passes fate

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Opposition brings concord. Out of discord comes the fairest harmony.
-- Heraclitus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120823/4e07debe/attachment.asc>


More information about the ffmpeg-devel mailing list