[FFmpeg-devel] [PATCH] libmodplug: lower probe score

[Nicolas George]

L'octidi 28 floréal, an CCXXI, Paul B Mahol a écrit :
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavformat/libmodplug.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/libmodplug.c b/libavformat/libmodplug.c
> index 193c3b2..2acd344 100644
> --- a/libavformat/libmodplug.c
> +++ b/libavformat/libmodplug.c
> @@ -347,6 +347,15 @@ static int modplug_read_seek(AVFormatContext *s, int stream_idx, int64_t ts, int
>      return 0;
>  }
>  
> +static const char modplug_extensions[] = "669,abc,amf,ams,dbm,dmf,dsm,far,it,mdl,med,mid,mod,mt2,mtm,okt,psm,ptm,s3m,stm,ult,umx,xm,itgz,itr,itz,mdgz,mdr,mdz,s3gz,s3r,s3z,xmgz,xmr,xmz";
> +
> +static int modplug_probe(AVProbeData *p)
> +{
> +    if (av_match_ext(p->filename, modplug_extensions))
> +        return AVPROBE_SCORE_MAX / 20;
> +    return 0;
> +}
> +
>  static const AVClass modplug_class = {
>      .class_name = "ModPlug demuxer",
>      .item_name  = av_default_item_name,
> @@ -358,11 +367,11 @@ AVInputFormat ff_libmodplug_demuxer = {
>      .name           = "libmodplug",
>      .long_name      = NULL_IF_CONFIG_SMALL("ModPlug demuxer"),
>      .priv_data_size = sizeof(ModPlugContext),
> +    .read_probe     = modplug_probe,
>      .read_header    = modplug_read_header,
>      .read_packet    = modplug_read_packet,
>      .read_close     = modplug_read_close,
>      .read_seek      = modplug_read_seek,
> -    .extensions     = "669,abc,amf,ams,dbm,dmf,dsm,far,it,mdl,med,mid,mod,mt2,mtm,okt,psm,ptm,s3m,stm,ult,umx,xm"
> -                      ",itgz,itr,itz,mdgz,mdr,mdz,s3gz,s3r,s3z,xmgz,xmr,xmz", // compressed mods
> +    .extensions     = modplug_extensions,
>      .priv_class     = &modplug_class,
>  };

The probe function seems redundant with the work that lavf already does with
the extensions field. Or did I miss something?

Furthermore, AVPROBE_SCORE_EXTENSION was introduced recently, it would
probably a better choice than AVPROBE_SCORE_MAX / 20.

Regards,

-- 
  Nicolas George
-------------- 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/20130517/75a08a09/attachment.asc>