diff options
Diffstat (limited to 'libavcodec/srtdec.c')
| -rw-r--r-- | libavcodec/srtdec.c | 161 |
1 files changed, 90 insertions, 71 deletions
diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index 3bee3c726f..ed3af95063 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -2,25 +2,26 @@ * SubRip subtitle decoder * Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/avstring.h" #include "libavutil/common.h" +#include "libavutil/intreadwrite.h" #include "libavutil/parseutils.h" #include "avcodec.h" #include "ass.h" @@ -46,10 +47,16 @@ typedef struct SrtStack { char param[PARAM_NUMBER][128]; } SrtStack; -static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, - const char *in, int x1, int y1, int x2, int y2) +static void rstrip_spaces_buf(AVBPrint *buf) { - char c, *param, buffer[128], tmp[128]; + while (buf->len > 0 && buf->str[buf->len - 1] == ' ') + buf->str[--buf->len] = 0; +} + +static void srt_to_ass(AVCodecContext *avctx, AVBPrint *dst, + const char *in, int x1, int y1, int x2, int y2) +{ + char *param, buffer[128], tmp[128]; int len, tag_close, sptr = 1, line_start = 1, an = 0, end = 0; SrtStack stack[16]; @@ -59,14 +66,25 @@ static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, strcpy(stack[0].param[PARAM_FACE], "{\\fn}"); if (x1 >= 0 && y1 >= 0) { - if (x2 >= 0 && y2 >= 0 && (x2 != x1 || y2 != y1)) - out += snprintf(out, out_end-out, - "{\\an1}{\\move(%d,%d,%d,%d)}", x1, y1, x2, y2); - else - out += snprintf(out, out_end-out, "{\\an1}{\\pos(%d,%d)}", x1, y1); + /* XXX: here we rescale coordinate assuming they are in DVD resolution + * (720x480) since we don't have anything better */ + + if (x2 >= 0 && y2 >= 0 && (x2 != x1 || y2 != y1) && x2 >= x1 && y2 >= y1) { + /* text rectangle defined, write the text at the center of the rectangle */ + const int cx = x1 + (x2 - x1)/2; + const int cy = y1 + (y2 - y1)/2; + const int scaled_x = cx * ASS_DEFAULT_PLAYRESX / 720; + const int scaled_y = cy * ASS_DEFAULT_PLAYRESY / 480; + av_bprintf(dst, "{\\an5}{\\pos(%d,%d)}", scaled_x, scaled_y); + } else { + /* only the top left corner, assume the text starts in that corner */ + const int scaled_x = x1 * ASS_DEFAULT_PLAYRESX / 720; + const int scaled_y = y1 * ASS_DEFAULT_PLAYRESY / 480; + av_bprintf(dst, "{\\an1}{\\pos(%d,%d)}", scaled_x, scaled_y); + } } - for (; out < out_end && !end && *in; in++) { + for (; !end && *in; in++) { switch (*in) { case '\r': break; @@ -75,27 +93,28 @@ static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, end = 1; break; } - while (out[-1] == ' ') - out--; - out += snprintf(out, out_end-out, "\\N"); + rstrip_spaces_buf(dst); + av_bprintf(dst, "\\N"); line_start = 1; break; case ' ': if (!line_start) - *out++ = *in; + av_bprint_chars(dst, *in, 1); break; case '{': /* skip all {\xxx} substrings except for {\an%d} and all microdvd like styles such as {Y:xxx} */ - an += sscanf(in, "{\\an%*1u}%c", &c) == 1; - if ((an != 1 && sscanf(in, "{\\%*[^}]}%n%c", &len, &c) > 0) || - sscanf(in, "{%*1[CcFfoPSsYy]:%*[^}]}%n%c", &len, &c) > 0) { + len = 0; + an += sscanf(in, "{\\an%*1u}%n", &len) >= 0 && len > 0; + if ((an != 1 && (len = 0, sscanf(in, "{\\%*[^}]}%n", &len) >= 0 && len > 0)) || + (len = 0, sscanf(in, "{%*1[CcFfoPSsYy]:%*[^}]}%n", &len) >= 0 && len > 0)) { in += len - 1; } else - *out++ = *in; + av_bprint_chars(dst, *in, 1); break; case '<': tag_close = in[1] == '/'; - if (sscanf(in+tag_close+1, "%127[^>]>%n%c", buffer, &len,&c) >= 2) { + len = 0; + if (sscanf(in+tag_close+1, "%127[^>]>%n", buffer, &len) >= 1 && len > 0) { if ((param = strchr(buffer, ' '))) *param++ = 0; if ((!tag_close && sptr < FF_ARRAY_ELEMS(stack)) || @@ -110,8 +129,7 @@ static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, if (stack[sptr-1].param[i][0]) for (j=sptr-2; j>=0; j--) if (stack[j].param[i][0]) { - out += snprintf(out, out_end-out, - "%s", stack[j].param[i]); + av_bprintf(dst, "%s", stack[j].param[i]); break; } } else { @@ -146,12 +164,10 @@ static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, } for (i=0; i<PARAM_NUMBER; i++) if (stack[sptr].param[i][0]) - out += snprintf(out, out_end-out, - "%s", stack[sptr].param[i]); + av_bprintf(dst, "%s", stack[sptr].param[i]); } } else if (!buffer[1] && strspn(buffer, "bisu") == 1) { - out += snprintf(out, out_end-out, - "{\\%c%d}", buffer[0], !tag_close); + av_bprintf(dst, "{\\%c%d}", buffer[0], !tag_close); } else { unknown = 1; snprintf(tmp, sizeof(tmp), "</%s>", buffer); @@ -160,7 +176,7 @@ static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, sptr--; } else if (unknown && !strstr(in, tmp)) { in -= len + tag_close; - *out++ = *in; + av_bprint_chars(dst, *in, 1); } else av_strlcpy(stack[sptr++].tag, buffer, sizeof(stack[0].tag)); @@ -168,75 +184,78 @@ static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, } } default: - *out++ = *in; + av_bprint_chars(dst, *in, 1); break; } if (*in != ' ' && *in != '\r' && *in != '\n') line_start = 0; } - out = FFMIN(out, out_end-3); - while (!strncmp(out-2, "\\N", 2)) - out -= 2; - while (out[-1] == ' ') - out--; - out += snprintf(out, out_end-out, "\r\n"); - return in; -} - -static const char *read_ts(const char *buf, int *ts_start, int *ts_end, - int *x1, int *y1, int *x2, int *y2) -{ - int i, hs, ms, ss, he, me, se; - - for (i=0; i<2; i++) { - /* try to read timestamps in either the first or second line */ - int c = sscanf(buf, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d" - "%*[ ]X1:%u X2:%u Y1:%u Y2:%u", - &hs, &ms, &ss, ts_start, &he, &me, &se, ts_end, - x1, x2, y1, y2); - buf += strcspn(buf, "\n") + 1; - if (c >= 8) { - *ts_start = 100*(ss + 60*(ms + 60*hs)) + *ts_start/10; - *ts_end = 100*(se + 60*(me + 60*he)) + *ts_end /10; - return buf; - } - } - return NULL; + while (dst->len >= 2 && !strncmp(&dst->str[dst->len - 2], "\\N", 2)) + dst->len -= 2; + dst->str[dst->len] = 0; + rstrip_spaces_buf(dst); } static int srt_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, AVPacket *avpkt) { AVSubtitle *sub = data; + AVBPrint buffer; int ts_start, ts_end, x1 = -1, y1 = -1, x2 = -1, y2 = -1; - char buffer[2048]; - const char *ptr = avpkt->data; - const char *end = avpkt->data + avpkt->size; + int size, ret; + const uint8_t *p = av_packet_get_side_data(avpkt, AV_PKT_DATA_SUBTITLE_POSITION, &size); + + if (p && size == 16) { + x1 = AV_RL32(p ); + y1 = AV_RL32(p + 4); + x2 = AV_RL32(p + 8); + y2 = AV_RL32(p + 12); + } if (avpkt->size <= 0) return avpkt->size; - ff_ass_init(sub); + av_bprint_init(&buffer, 0, AV_BPRINT_SIZE_UNLIMITED); - while (ptr < end && *ptr) { - ptr = read_ts(ptr, &ts_start, &ts_end, &x1, &y1, &x2, &y2); - if (!ptr) - break; - ptr = srt_to_ass(avctx, buffer, buffer+sizeof(buffer), ptr, - x1, y1, x2, y2); - ff_ass_add_rect(sub, buffer, ts_start, ts_end, 0); - } + // TODO: reindent + // Do final divide-by-10 outside rescale to force rounding down. + ts_start = av_rescale_q(avpkt->pts, + avctx->time_base, + (AVRational){1,100}); + ts_end = av_rescale_q(avpkt->pts + avpkt->duration, + avctx->time_base, + (AVRational){1,100}); + + srt_to_ass(avctx, &buffer, avpkt->data, x1, y1, x2, y2); + ret = ff_ass_add_rect_bprint(sub, &buffer, ts_start, ts_end-ts_start); + av_bprint_finalize(&buffer, NULL); + if (ret < 0) + return ret; *got_sub_ptr = sub->num_rects > 0; return avpkt->size; } +#if CONFIG_SRT_DECODER +/* deprecated decoder */ AVCodec ff_srt_decoder = { .name = "srt", .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), .type = AVMEDIA_TYPE_SUBTITLE, - .id = AV_CODEC_ID_SRT, + .id = AV_CODEC_ID_SUBRIP, + .init = ff_ass_subtitle_header_default, + .decode = srt_decode_frame, +}; +#endif + +#if CONFIG_SUBRIP_DECODER +AVCodec ff_subrip_decoder = { + .name = "subrip", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + .type = AVMEDIA_TYPE_SUBTITLE, + .id = AV_CODEC_ID_SUBRIP, .init = ff_ass_subtitle_header_default, .decode = srt_decode_frame, }; +#endif |