From: Clément Bœsch Date: Sun, 17 Jun 2012 09:43:34 +0000 (+0200) Subject: RealText demuxer and decoder. X-Git-Tag: android-x86-4.4-r1~10946 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=439e32f9b86adbefafceec2034cc649c0b329805;p=android-x86%2Fexternal-ffmpeg.git RealText demuxer and decoder. --- diff --git a/Changelog b/Changelog index 5ea3ade383..a899023731 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ version next: - showwaves filter - LucasArts SMUSH playback support - SAMI demuxer and decoder +- RealText demuxer and decoder version 0.11: diff --git a/doc/general.texi b/doc/general.texi index a1b1b01b40..2ca10cd9f9 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -864,6 +864,7 @@ performance on systems without hardware floating point support). @item JACOsub @tab X @tab X @tab @tab X @item MicroDVD @tab X @tab X @tab @tab X @item PGS @tab @tab @tab @tab X +@item RealText @tab @tab X @tab @tab X @item SAMI @tab @tab X @tab @tab X @item SubRip (SRT) @tab X @tab X @tab X @tab X @item XSUB @tab @tab @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6c723db1d2..e8fac7efd9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -379,6 +379,7 @@ OBJS-$(CONFIG_RA_288_DECODER) += ra288.o celp_math.o celp_filters.o OBJS-$(CONFIG_RALF_DECODER) += ralf.o OBJS-$(CONFIG_RAWVIDEO_DECODER) += rawdec.o OBJS-$(CONFIG_RAWVIDEO_ENCODER) += rawenc.o +OBJS-$(CONFIG_REALTEXT_DECODER) += realtextdec.o ass.o OBJS-$(CONFIG_RL2_DECODER) += rl2.o OBJS-$(CONFIG_ROQ_DECODER) += roqvideodec.o roqvideo.o OBJS-$(CONFIG_ROQ_ENCODER) += roqvideoenc.o roqvideo.o elbg.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index be36b84640..51e603e10d 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -405,6 +405,7 @@ void avcodec_register_all(void) REGISTER_DECODER (JACOSUB, jacosub); REGISTER_DECODER (MICRODVD, microdvd); REGISTER_DECODER (PGSSUB, pgssub); + REGISTER_DECODER (REALTEXT, realtext); REGISTER_DECODER (SAMI, sami); REGISTER_ENCDEC (SRT, srt); REGISTER_ENCDEC (XSUB, xsub); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 58243fd4ce..8aa939bd5f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -431,6 +431,7 @@ enum CodecID { CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'), CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'), CODEC_ID_SAMI = MKBETAG('S','A','M','I'), + CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'), /* other specific kind of codecs (generally used for attachments) */ CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c new file mode 100644 index 0000000000..d2ac0cd7d8 --- /dev/null +++ b/libavcodec/realtextdec.c @@ -0,0 +1,83 @@ +/* + * 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 + * RealText subtitle decoder + * @see http://service.real.com/help/library/guides/ProductionGuide/prodguide/htmfiles/realtext.htm + */ + +#include "avcodec.h" +#include "ass.h" +#include "libavutil/avstring.h" +#include "libavutil/bprint.h" + +static int rt_event_to_ass(AVBPrint *buf, const char *p) +{ + int prev_chr_is_space = 1; + + while (*p) { + if (*p != '<') { + if (!isspace(*p)) + av_bprint_chars(buf, *p, 1); + else if (!prev_chr_is_space) + av_bprint_chars(buf, ' ', 1); + prev_chr_is_space = isspace(*p); + } else { + const char *end = strchr(p, '>'); + if (!end) + break; + if (!av_strncasecmp(p, "
", 5) || + !av_strncasecmp(p, "
", 4)) { + av_bprintf(buf, "\\N"); + } + p = end; + } + p++; + } + av_bprintf(buf, "\r\n"); + return 0; +} + +static int realtext_decode_frame(AVCodecContext *avctx, + void *data, int *got_sub_ptr, AVPacket *avpkt) +{ + AVSubtitle *sub = data; + const char *ptr = avpkt->data; + AVBPrint buf; + + av_bprint_init(&buf, 0, 4096); + // note: no need to rescale pts & duration since they are in the same + // timebase than ASS (1/100) + if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr)) + ff_ass_add_rect(sub, buf.str, avpkt->pts, avpkt->duration, 0); + *got_sub_ptr = sub->num_rects > 0; + av_bprint_finalize(&buf, NULL); + return avpkt->size; +} + +AVCodec ff_realtext_decoder = { + .name = "realtext", + .long_name = NULL_IF_CONFIG_SMALL("RealText subtitle"), + .type = AVMEDIA_TYPE_SUBTITLE, + .id = CODEC_ID_REALTEXT, + .decode = realtext_decode_frame, + .init = ff_ass_subtitle_header_default, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 2c50064f13..5bfb7f4176 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 30 +#define LIBAVCODEC_VERSION_MINOR 31 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/Makefile b/libavformat/Makefile index 96fb954cad..9eaf28acae 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -255,6 +255,7 @@ OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o rawdec.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += rawenc.o +OBJS-$(CONFIG_REALTEXT_DEMUXER) += realtextdec.o OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 4ae790f25a..231b0cbf95 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -199,6 +199,7 @@ void av_register_all(void) REGISTER_DEMUXER (QCP, qcp); REGISTER_DEMUXER (R3D, r3d); REGISTER_MUXDEMUX (RAWVIDEO, rawvideo); + REGISTER_DEMUXER (REALTEXT, realtext); REGISTER_DEMUXER (RL2, rl2); REGISTER_MUXDEMUX (RM, rm); REGISTER_MUXDEMUX (ROQ, roq); diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c new file mode 100644 index 0000000000..88a7fdd0db --- /dev/null +++ b/libavformat/realtextdec.c @@ -0,0 +1,145 @@ +/* + * 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 + * RealText subtitle demuxer + * @see http://service.real.com/help/library/guides/ProductionGuide/prodguide/htmfiles/realtext.htm + */ + +#include "avformat.h" +#include "internal.h" +#include "subtitles.h" +#include "libavutil/avstring.h" +#include "libavutil/bprint.h" +#include "libavutil/intreadwrite.h" + +typedef struct { + FFDemuxSubtitlesQueue q; +} RealTextContext; + +static int realtext_probe(AVProbeData *p) +{ + const unsigned char *ptr = p->buf; + + if (AV_RB24(ptr) == 0xEFBBBF) + ptr += 3; /* skip UTF-8 BOM */ + return !av_strncasecmp(ptr, "priv_data; + AVStream *st = avformat_new_stream(s, NULL); + AVBPrint buf; + char c = 0; + int res = 0, duration = read_ts("60"); // default duration is 60 seconds + + if (!st) + return AVERROR(ENOMEM); + avpriv_set_pts_info(st, 64, 1, 100); + st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codec->codec_id = CODEC_ID_REALTEXT; + + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); + + while (!url_feof(s->pb)) { + AVPacket *sub; + const int64_t pos = avio_tell(s->pb) - (c != 0); + int n = ff_smil_extract_next_chunk(s->pb, &buf, &c); + + if (n == 0) + break; + + if (!av_strncasecmp(buf.str, "codec->extradata = av_strdup(buf.str); + if (!st->codec->extradata) { + res = AVERROR(ENOMEM); + goto end; + } + st->codec->extradata_size = buf.len + 1; + } else { + /* if we just read a