diff options
Diffstat (limited to 'libavcodec/assdec.c')
| -rw-r--r-- | libavcodec/assdec.c | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c index 48fe32ee99..3178f2953c 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -2,20 +2,20 @@ * SSA/ASS 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 */ @@ -28,10 +28,11 @@ static av_cold int ass_decode_init(AVCodecContext *avctx) { - avctx->subtitle_header = av_malloc(avctx->extradata_size); + avctx->subtitle_header = av_malloc(avctx->extradata_size + 1); if (!avctx->subtitle_header) return AVERROR(ENOMEM); memcpy(avctx->subtitle_header, avctx->extradata, avctx->extradata_size); + avctx->subtitle_header[avctx->extradata_size] = 0; avctx->subtitle_header_size = avctx->extradata_size; return 0; } @@ -39,28 +40,44 @@ static av_cold int ass_decode_init(AVCodecContext *avctx) static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, AVPacket *avpkt) { - const char *ptr = avpkt->data; - int len, size = avpkt->size; + AVSubtitle *sub = data; - ff_ass_init(data); + if (avpkt->size <= 0) + return avpkt->size; - while (size > 0) { - len = ff_ass_add_rect(data, ptr, 0, 0/* FIXME: duration */, 1); - if (len < 0) - return len; - ptr += len; - size -= len; - } - - *got_sub_ptr = avpkt->size > 0; + sub->rects = av_malloc(sizeof(*sub->rects)); + if (!sub->rects) + return AVERROR(ENOMEM); + sub->rects[0] = av_mallocz(sizeof(*sub->rects[0])); + if (!sub->rects[0]) + return AVERROR(ENOMEM); + sub->num_rects = 1; + sub->rects[0]->type = SUBTITLE_ASS; + sub->rects[0]->ass = av_strdup(avpkt->data); + if (!sub->rects[0]->ass) + return AVERROR(ENOMEM); + *got_sub_ptr = 1; return avpkt->size; } +#if CONFIG_SSA_DECODER +AVCodec ff_ssa_decoder = { + .name = "ssa", + .long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), + .type = AVMEDIA_TYPE_SUBTITLE, + .id = AV_CODEC_ID_ASS, + .init = ass_decode_init, + .decode = ass_decode_frame, +}; +#endif + +#if CONFIG_ASS_DECODER AVCodec ff_ass_decoder = { .name = "ass", - .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), + .long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), .type = AVMEDIA_TYPE_SUBTITLE, - .id = AV_CODEC_ID_SSA, + .id = AV_CODEC_ID_ASS, .init = ass_decode_init, .decode = ass_decode_frame, }; +#endif |