From ba2c508d0c7192e623fe835b3dea9328fdc0f03b Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sat, 24 Jul 2010 22:50:12 +0000 Subject: add SubRip muxer and demuxer Originally committed as revision 24488 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Changelog | 1 + doc/general.texi | 1 + libavcodec/avcodec.h | 1 + libavformat/Makefile | 2 + libavformat/allformats.c | 1 + libavformat/avformat.h | 2 +- libavformat/raw.c | 12 ++++++ libavformat/srtdec.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 libavformat/srtdec.c diff --git a/Changelog b/Changelog index 5c89474..5b07e8e 100644 --- a/Changelog +++ b/Changelog @@ -24,6 +24,7 @@ version : - ANSI/ASCII art playback system - Lego Mindstorms RSO de/muxer - libavcore added +- SubRip subtitle file muxer and demuxer diff --git a/doc/general.texi b/doc/general.texi index 76c676f..a8a5444 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -684,6 +684,7 @@ performance on systems without hardware floating point support). @item DVB @tab X @tab X @tab X @tab X @item DVD @tab X @tab X @tab X @tab X @item PGS @tab @tab @tab @tab X +@item SubRip (SRT) @tab X @tab X @item XSUB @tab @tab @tab X @tab X @end multitable diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 560d575..14e049d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -348,6 +348,7 @@ enum CodecID { CODEC_ID_MOV_TEXT, CODEC_ID_HDMV_PGS_SUBTITLE, CODEC_ID_DVB_TELETEXT, + CODEC_ID_SRT, /* other specific kind of codecs (generally used for attachments) */ CODEC_ID_TTF= 0x18000, diff --git a/libavformat/Makefile b/libavformat/Makefile index 50a7b3a..c32a254 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -242,6 +242,8 @@ OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o raw.o OBJS-$(CONFIG_SOX_MUXER) += soxenc.o OBJS-$(CONFIG_SPDIF_MUXER) += spdif.o +OBJS-$(CONFIG_SRT_DEMUXER) += srtdec.o +OBJS-$(CONFIG_SRT_MUXER) += raw.o OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o OBJS-$(CONFIG_SWF_MUXER) += swfenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index ce0e90d..0b39e84 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -189,6 +189,7 @@ void av_register_all(void) REGISTER_DEMUXER (SOL, sol); REGISTER_MUXDEMUX (SOX, sox); REGISTER_MUXER (SPDIF, spdif); + REGISTER_MUXDEMUX (SRT, srt); REGISTER_DEMUXER (STR, str); REGISTER_MUXDEMUX (SWF, swf); REGISTER_MUXER (TG2, tg2); diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 076b8c8..8ba2d81 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 76 +#define LIBAVFORMAT_VERSION_MINOR 77 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/libavformat/raw.c b/libavformat/raw.c index 0c83c42..dc48c91 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -1082,6 +1082,18 @@ AVOutputFormat mlp_muxer = { }; #endif +#if CONFIG_SRT_MUXER +AVOutputFormat srt_muxer = { + .name = "srt", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), + .mime_type = "application/x-subrip", + .extensions = "srt", + .write_packet = raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, + .subtitle_codec = CODEC_ID_SRT, +}; +#endif + #if CONFIG_TRUEHD_DEMUXER AVInputFormat truehd_demuxer = { "truehd", diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c new file mode 100644 index 0000000..104031a --- /dev/null +++ b/libavformat/srtdec.c @@ -0,0 +1,102 @@ +/* + * SubRip subtitle demuxer + * Copyright (c) 2010 Aurelien Jacobs + * + * 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 + */ + +#include "avformat.h" +#include "internal.h" +#include "libavutil/intreadwrite.h" + +static int srt_probe(AVProbeData *p) +{ + unsigned char *ptr = p->buf; + int i, v, num = 0; + + if (AV_RB24(ptr) == 0xEFBBBF) + ptr += 3; /* skip UTF-8 BOM */ + + for (i=0; i<2; i++) { + if (num == i && sscanf(ptr, "%*d:%*2d:%*2d%*1[,.]%*3d --> %*d:%*2d:%*2d%*1[,.]%3d", &v) == 1) + return AVPROBE_SCORE_MAX; + num = atoi(ptr); + ptr += strcspn(ptr, "\n") + 1; + } + return 0; +} + +static int srt_read_header(AVFormatContext *s, AVFormatParameters *ap) +{ + AVStream *st = av_new_stream(s, 0); + if (!st) + return -1; + av_set_pts_info(st, 64, 1, 1000); + st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codec->codec_id = CODEC_ID_SRT; + return 0; +} + +static int64_t get_pts(const char *buf) +{ + int i, v, hour, min, sec, hsec; + + for (i=0; i<2; i++) { + if (sscanf(buf, "%d:%2d:%2d%*1[,.]%3d --> %*d:%*2d:%*2d%*1[,.]%3d", + &hour, &min, &sec, &hsec, &v) == 5) { + min += 60*hour; + sec += 60*min; + return sec*1000+hsec; + } + buf += strcspn(buf, "\n") + 1; + } + return AV_NOPTS_VALUE; +} + +static inline int is_eol(char c) +{ + return c == '\r' || c == '\n'; +} + +static int srt_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + char buffer[2048], *ptr = buffer, *ptr2; + int64_t pos = url_ftell(s->pb); + int res = AVERROR_EOF; + + do { + ptr2 = ptr; + ptr += ff_get_line(s->pb, ptr, sizeof(buffer)+buffer-ptr); + } while (!is_eol(*ptr2) && !url_feof(s->pb) && ptr-bufferdata, buffer, pkt->size); + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->pos = pos; + pkt->pts = pkt->dts = get_pts(pkt->data); + } + return res; +} + +AVInputFormat srt_demuxer = { + .name = "srt", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), + .read_probe = srt_probe, + .read_header = srt_read_header, + .read_packet = srt_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; -- cgit v1.1