[FFmpeg-devel] [PATCH 2/2] Add MPlayer subtitles demuxer and decoder.
Nicolas George
nicolas.george at normalesup.org
Sun Dec 30 15:32:20 CET 2012
L'octidi 8 nivôse, an CCXXI, Clement Boesch a écrit :
> ---
> Changelog | 2 +-
> libavformat/Makefile | 1 +
> libavformat/allformats.c | 1 +
> libavformat/mpsubdec.c | 140 ++++++++++++++++++++++++++++++++++++++++
> libavformat/version.h | 2 +-
> tests/fate/subtitles.mak | 6 ++
> tests/ref/fate/sub-mpsub | 1 +
> tests/ref/fate/sub-mpsub-frames | 1 +
> 8 files changed, 152 insertions(+), 2 deletions(-)
> create mode 100644 libavformat/mpsubdec.c
> create mode 100644 tests/ref/fate/sub-mpsub
> create mode 100644 tests/ref/fate/sub-mpsub-frames
>
> diff --git a/Changelog b/Changelog
> index 6fa41b5..e16fdd9 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 and VPlayer subtitles demuxers and decoders
> +- MPL2, VPlayer and MPlayer subtitles demuxers and decoders
>
>
> version 1.0:
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 357b7cf..70327a3 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -220,6 +220,7 @@ OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
> OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o rawdec.o
> OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
> OBJS-$(CONFIG_MPL2_DEMUXER) += mpl2dec.o
> +OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o
> OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o
> OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
> OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 071663c..78d8534 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -171,6 +171,7 @@ void av_register_all(void)
> REGISTER_DEMUXER (MPEGVIDEO, mpegvideo);
> REGISTER_MUXER (MPJPEG, mpjpeg);
> REGISTER_DEMUXER (MPL2, mpl2);
> + REGISTER_DEMUXER (MPSUB, mpsub);
> REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp);
> REGISTER_DEMUXER (MTV, mtv);
> REGISTER_DEMUXER (MV, mv);
> diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c
> new file mode 100644
> index 0000000..efc96a9
> --- /dev/null
> +++ b/libavformat/mpsubdec.c
> @@ -0,0 +1,140 @@
> +/*
> + * 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
> + * MPlayer subtitles format demuxer
> + */
Reference to syntax or excerpt, maybe?
> +
> +#include "avformat.h"
> +#include "internal.h"
> +#include "subtitles.h"
> +
> +typedef struct {
> + FFDemuxSubtitlesQueue q;
> +} MPSubContext;
> +
> +static int mpsub_probe(AVProbeData *p)
> +{
> + const char *ptr = p->buf;
> + const char *ptr_end = p->buf + p->buf_size;
> +
> + while (ptr < ptr_end) {
> + int n;
> +
> + if (!memcmp(ptr, "FORMAT=TIME", 11) ||
> + sscanf(ptr, "FORMAT=%d", &n) == 1)
> + return AVPROBE_SCORE_MAX;
> + ptr += strcspn(ptr, "\n") + 1;
A bit lax, maybe?
> + }
> + return 0;
> +}
> +
> +static int mpsub_read_header(AVFormatContext *s)
> +{
> + MPSubContext *mpsub = s->priv_data;
> + AVStream *st;
> + AVBPrint buf;
> + AVRational pts_info = (AVRational){ 100, 1 }; // ts based by default
> + int res = 0;
> + float multiplier = 100.0;
> + float current_pts = 0;
> +
> + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
> +
> + while (!url_feof(s->pb)) {
> + char line[1024];
> + float start, duration;
> + int fps, len = ff_get_line(s->pb, line, sizeof(line));
> +
> + if (!len)
> + break;
> +
> + line[strcspn(line, "\r\n")] = 0;
> +
> + if (sscanf(line, "FORMAT=%d", &fps) == 1 && fps > 3 && fps < 100) {
> + /* frame based timing */
What happens if there are several FORMAT lines?
> + pts_info = av_d2q(fps, 100000);
fps is an integer: why use av_d2q instead of just coding { fps, 1 }?
> + multiplier = 1.0;
> + } else if (sscanf(line, "%f %f", &start, &duration) == 2) {
> + AVPacket *sub;
> + const int64_t pos = avio_tell(s->pb);
> +
> + ff_subtitles_read_chunk(s->pb, &buf);
> + if (buf.len) {
> + sub = ff_subtitles_queue_insert(&mpsub->q, buf.str, buf.len, 0);
> + if (!sub) {
> + res = AVERROR(ENOMEM);
> + goto end;
> + }
> + sub->pts = (int64_t)(current_pts + start*multiplier);
> + sub->duration = (int)(duration * multiplier);
> + current_pts += (start + duration) * multiplier;
> + sub->pos = pos;
> + }
> + }
No error report if garbage is found?
> + }
> +
> + st = avformat_new_stream(s, NULL);
> + if (!st)
> + return AVERROR(ENOMEM);
> + avpriv_set_pts_info(st, 64, pts_info.den, pts_info.num);
> + st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
> + st->codec->codec_id = AV_CODEC_ID_TEXT;
> +
> + ff_subtitles_queue_finalize(&mpsub->q);
> +
> +end:
> + av_bprint_finalize(&buf, NULL);
> + return res;
> +}
> +
> +static int mpsub_read_packet(AVFormatContext *s, AVPacket *pkt)
> +{
> + MPSubContext *mpsub = s->priv_data;
> + return ff_subtitles_queue_read_packet(&mpsub->q, pkt);
> +}
> +
> +static int mpsub_read_seek(AVFormatContext *s, int stream_index,
> + int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
> +{
> + MPSubContext *mpsub = s->priv_data;
> + return ff_subtitles_queue_seek(&mpsub->q, s, stream_index,
> + min_ts, ts, max_ts, flags);
> +}
> +
> +static int mpsub_read_close(AVFormatContext *s)
> +{
> + MPSubContext *mpsub = s->priv_data;
> + ff_subtitles_queue_clean(&mpsub->q);
> + return 0;
> +}
> +
> +AVInputFormat ff_mpsub_demuxer = {
> + .name = "mpsub",
> + .long_name = NULL_IF_CONFIG_SMALL("MPlayer subtitles"),
> + .priv_data_size = sizeof(MPSubContext),
> + .read_probe = mpsub_probe,
> + .read_header = mpsub_read_header,
> + .read_packet = mpsub_read_packet,
> + .read_seek2 = mpsub_read_seek,
> + .read_close = mpsub_read_close,
> + .extensions = "sub",
> +};
> diff --git a/libavformat/version.h b/libavformat/version.h
> index 31a25061..00a84be 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 52
> +#define LIBAVFORMAT_VERSION_MINOR 53
> #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 3f7e02d..b664386 100644
> --- a/tests/fate/subtitles.mak
> +++ b/tests/fate/subtitles.mak
> @@ -13,6 +13,12 @@ fate-sub-movtextenc: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -
> FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
> fate-sub-mpl2: CMD = md5 -i $(SAMPLES)/sub/MPL2_capability_tester.txt -f ass
>
> +FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub
> +fate-sub-mpsub: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester.sub -f ass
> +
> +FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames
> +fate-sub-mpsub-frames: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester_frames.sub -f ass
> +
> FATE_SUBTITLES_ASS-$(call DEMDEC, REALTEXT, REALTEXT) += fate-sub-realtext
> fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f ass
>
> diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub
> new file mode 100644
> index 0000000..4e36648
> --- /dev/null
> +++ b/tests/ref/fate/sub-mpsub
> @@ -0,0 +1 @@
> +2c5fafec41479e1d09a32f85e8927d03
> diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames
> new file mode 100644
> index 0000000..d5bb44e
> --- /dev/null
> +++ b/tests/ref/fate/sub-mpsub-frames
> @@ -0,0 +1 @@
> +cbe6e45848ef77e3080487a88b122104
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/3fe258c0/attachment.asc>
More information about the ffmpeg-devel
mailing list