[FFmpeg-devel] [PATCH] Add AQTitle subtitles demuxer.

Nicolas George nicolas.george at normalesup.org
Sun Dec 30 14:31:47 CET 2012


L'octidi 8 nivôse, an CCXXI, Clement Boesch a écrit :
> ---
>  Changelog                  |   2 +-
>  doc/general.texi           |   1 +
>  libavformat/Makefile       |   1 +
>  libavformat/allformats.c   |   1 +
>  libavformat/aqtitledec.c   | 146 +++++++++++++++++++++++++++++++++++++++++++++
>  libavformat/version.h      |   2 +-
>  tests/fate/subtitles.mak   |   3 +
>  tests/ref/fate/sub-aqtitle |   1 +
>  8 files changed, 155 insertions(+), 2 deletions(-)
>  create mode 100644 libavformat/aqtitledec.c
>  create mode 100644 tests/ref/fate/sub-aqtitle
> 
> diff --git a/Changelog b/Changelog
> index e16fdd9..a7d3a16 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -50,7 +50,7 @@ version <next>:
>  - documentation split into per-component manuals
>  - pp (postproc) filter ported from MPlayer
>  - NIST Sphere demuxer
> -- MPL2, VPlayer and MPlayer subtitles demuxers and decoders
> +- MPL2, VPlayer, MPlayer and AQTitle subtitles demuxers and decoders
>  
>  
>  version 1.0:
> diff --git a/doc/general.texi b/doc/general.texi
> index 5e108c6..4532a57 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -920,6 +920,7 @@ performance on systems without hardware floating point support).
>  @multitable @columnfractions .4 .1 .1 .1 .1
>  @item Name @tab Muxing @tab Demuxing @tab Encoding @tab Decoding
>  @item 3GPP Timed Text  @tab   @tab   @tab X @tab X
> + at item AQTitle          @tab   @tab X @tab   @tab X
>  @item DVB              @tab X @tab X @tab X @tab X
>  @item DVD              @tab X @tab X @tab X @tab X
>  @item JACOsub          @tab X @tab X @tab   @tab X
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 70327a3..8015274 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -65,6 +65,7 @@ OBJS-$(CONFIG_AMR_MUXER)                 += amr.o
>  OBJS-$(CONFIG_ANM_DEMUXER)               += anm.o
>  OBJS-$(CONFIG_APC_DEMUXER)               += apc.o
>  OBJS-$(CONFIG_APE_DEMUXER)               += ape.o apetag.o img2.o
> +OBJS-$(CONFIG_AQTITLE_DEMUXER)           += aqtitledec.o
>  OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec.o asf.o asfcrypt.o \
>                                              avlanguage.o
>  OBJS-$(CONFIG_ASF_MUXER)                 += asfenc.o asf.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 78d8534..940e6e8 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -63,6 +63,7 @@ void av_register_all(void)
>      REGISTER_DEMUXER  (ANM, anm);
>      REGISTER_DEMUXER  (APC, apc);
>      REGISTER_DEMUXER  (APE, ape);
> +    REGISTER_DEMUXER  (AQTITLE, aqtitle);
>      REGISTER_MUXDEMUX (ASF, asf);
>      REGISTER_MUXDEMUX (ASS, ass);
>      REGISTER_MUXDEMUX (AST, ast);
> diff --git a/libavformat/aqtitledec.c b/libavformat/aqtitledec.c
> new file mode 100644
> index 0000000..544195e
> --- /dev/null
> +++ b/libavformat/aqtitledec.c
> @@ -0,0 +1,146 @@
> +/*
> + * Copyright (c) 2012 Clément Bœsch
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +/**
> + * @file
> + * AQTitle subtitles format demuxer
> + *
> + * @see http://web.archive.org/web/20070210095721/http://www.volny.cz/aberka/czech/aqt.html
> + * @see https://trac.annodex.net/wiki/AQTitle
> + */
> +
> +#include "avformat.h"
> +#include "internal.h"
> +#include "subtitles.h"
> +#include "libavutil/opt.h"
> +
> +typedef struct {
> +    const AVClass *class;
> +    FFDemuxSubtitlesQueue q;
> +    AVRational frame_rate;
> +} AQTitleContext;
> +
> +static int aqt_probe(AVProbeData *p)
> +{
> +    int frame;
> +    const char *ptr = p->buf;
> +

> +    if (sscanf(ptr, "-->> %d", &frame) == 1)
> +        return AVPROBE_SCORE_MAX;

Seems a little bit lax, does it not?

> +    return 0;
> +}
> +
> +static int aqt_read_header(AVFormatContext *s)
> +{
> +    AQTitleContext *aqt = s->priv_data;
> +    AVStream *st = avformat_new_stream(s, NULL);
> +    int new_event = 1;
> +    int64_t pos = 0, frame = AV_NOPTS_VALUE;
> +    AVPacket *sub = NULL;
> +
> +    if (!st)
> +        return AVERROR(ENOMEM);
> +    avpriv_set_pts_info(st, 64, aqt->frame_rate.den, aqt->frame_rate.num);
> +    st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
> +    st->codec->codec_id   = AV_CODEC_ID_TEXT;
> +
> +    while (!url_feof(s->pb)) {
> +        char line[4096];
> +        int len = ff_get_line(s->pb, line, sizeof(line));
> +
> +        if (!len)
> +            break;
> +

> +        line[strcspn(line, "\r\n")] = 0;

Probably very inefficient, but it should not matter much.

> +
> +        if (sscanf(line, "-->> %"PRId64, &frame) == 1) {
> +            new_event = 1;
> +            pos = avio_tell(s->pb);

Is AVPacket.pos supposed to be the offset of the packet, or of the payload
in the packet?

> +        } else if (*line) {
> +            if (!new_event) {
> +                sub = ff_subtitles_queue_insert(&aqt->q, "\n", 1, 1);
> +                if (!sub)
> +                    return AVERROR(ENOMEM);
> +            }
> +            sub = ff_subtitles_queue_insert(&aqt->q, line, strlen(line), !new_event);
> +            if (!sub)
> +                return AVERROR(ENOMEM);
> +            if (new_event) {
> +                sub->pts = frame;
> +                sub->duration = -1;
> +                sub->pos = pos;
> +            }
> +            new_event = 0;
> +        } else if (sub) {
> +            sub->duration = frame - sub->pts;
> +        }

I am not sure about the logic of this, especially on slightly broken files
(empty lines in the middle of a subtitle or an empty line that is not really
empty). Maybe move the "if (sub) sub->duration = ..." part in the "-->> %d"
case (and set sub to NULL afterwards) ?

> +    }
> +
> +    ff_subtitles_queue_finalize(&aqt->q);
> +    return 0;
> +}
> +
> +static int aqt_read_packet(AVFormatContext *s, AVPacket *pkt)
> +{
> +    AQTitleContext *aqt = s->priv_data;
> +    return ff_subtitles_queue_read_packet(&aqt->q, pkt);
> +}
> +
> +static int aqt_read_seek(AVFormatContext *s, int stream_index,
> +                         int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
> +{
> +    AQTitleContext *aqt = s->priv_data;
> +    return ff_subtitles_queue_seek(&aqt->q, s, stream_index,
> +                                   min_ts, ts, max_ts, flags);
> +}
> +
> +static int aqt_read_close(AVFormatContext *s)
> +{
> +    AQTitleContext *aqt = s->priv_data;
> +    ff_subtitles_queue_clean(&aqt->q);
> +    return 0;
> +}
> +
> +#define OFFSET(x) offsetof(AQTitleContext, x)
> +#define SD AV_OPT_FLAG_SUBTITLE_PARAM|AV_OPT_FLAG_DECODING_PARAM
> +static const AVOption aqt_options[] = {
> +    { "subtitles_fps", "set the movie frame rate", OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, {.dbl=25}, 0, INT_MAX, SD },

Maybe a little too verbose? I believe "fps" should be enough; stream
specifiers are explicit enough: "fpt:s".

> +    { NULL }
> +};
> +
> +static const AVClass aqt_class = {
> +    .class_name = "aqtdec",
> +    .item_name  = av_default_item_name,
> +    .option     = aqt_options,
> +    .version    = LIBAVUTIL_VERSION_INT,
> +};
> +
> +AVInputFormat ff_aqtitle_demuxer = {
> +    .name           = "aqtitle",
> +    .long_name      = NULL_IF_CONFIG_SMALL("AQTitle subtitles"),
> +    .priv_data_size = sizeof(AQTitleContext),
> +    .read_probe     = aqt_probe,
> +    .read_header    = aqt_read_header,
> +    .read_packet    = aqt_read_packet,
> +    .read_seek2     = aqt_read_seek,
> +    .read_close     = aqt_read_close,
> +    .extensions     = "aqt",
> +    .priv_class     = &aqt_class,
> +};
> diff --git a/libavformat/version.h b/libavformat/version.h
> index 00a84be..d3c0d2a 100644
> --- a/libavformat/version.h
> +++ b/libavformat/version.h
> @@ -30,7 +30,7 @@
>  #include "libavutil/avutil.h"
>  
>  #define LIBAVFORMAT_VERSION_MAJOR 54
> -#define LIBAVFORMAT_VERSION_MINOR 53
> +#define LIBAVFORMAT_VERSION_MINOR 54
>  #define LIBAVFORMAT_VERSION_MICRO 100
>  
>  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
> diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
> index b664386..0887d1c 100644
> --- a/tests/fate/subtitles.mak
> +++ b/tests/fate/subtitles.mak
> @@ -1,3 +1,6 @@
> +FATE_SUBTITLES_ASS-$(call DEMDEC, AQTITLE, TEXT) += fate-sub-aqtitle
> +fate-sub-aqtitle: CMD = md5 -i $(SAMPLES)/sub/AQTitle_capability_tester.aqt -f ass
> +
>  FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub
>  fate-sub-jacosub: CMD = md5 -i $(SAMPLES)/sub/JACOsub_capability_tester.jss -f ass
>  
> diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle
> new file mode 100644
> index 0000000..5c57f80
> --- /dev/null
> +++ b/tests/ref/fate/sub-aqtitle
> @@ -0,0 +1 @@
> +0dbaa163f58fd156c48b19c7e45046c3

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/20121230/d0afb035/attachment.asc>


More information about the ffmpeg-devel mailing list