[FFmpeg-devel] [PATCH 2/2] libmodplug: add an option to enlarge the max supported file size.
Clément Bœsch
ubitux at gmail.com
Thu Oct 6 00:30:53 CEST 2011
On Thu, Oct 06, 2011 at 12:22:34AM +0200, Michael Niedermayer wrote:
[...]
> > @@ -67,8 +74,23 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
> > AVIOContext *pb = s->pb;
> > ModPlug_Settings settings;
> > ModPlugContext *modplug = s->priv_data;
> > + int sz = avio_size(pb);
> >
> > - int sz = avio_read(pb, modplug->buf, sizeof(modplug->buf));
> > + if (sz < 0) {
> > + av_log(s, AV_LOG_WARNING, "Could not determine file size\n");
>
> > + if (modplug->max_size != FF_MODPLUG_DEF_FILE_SIZE)
> > + sz = modplug->max_size;
> > + else
> > + sz = FF_MODPLUG_DEF_FILE_SIZE;
>
> sz = modplug->max_size;
>
Indeed…
>
> > + } else if (modplug->max_size && sz > modplug->max_size) {
> > + sz = modplug->max_size;
> > + av_log(s, AV_LOG_WARNING, "Max file size reach%s, allocating %dB\n",
> > + sz == FF_MODPLUG_DEF_FILE_SIZE ? " (see -max_size)" : "", sz);
> > + }
>
> does this work for any file ?
No it's likely to fail every time unfortunately.
> i would have thought many mod file formats are sensitiv to being
> truncated
Yes, it was the case with all the samples I tested (it's the reason the
message mentions the -max_size option to workaround the issue), but I
believe at least one will be OK, so it doesn't fail immediately.
Maybe you would prefer an extra warning saying it will likely fail?
--
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20111006/33c00c80/attachment.asc>
More information about the ffmpeg-devel
mailing list