#include "avcodec.h"
#include "ass.h"
-#include "ass_split.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
memcpy(avctx->subtitle_header, avctx->extradata, avctx->extradata_size);
avctx->subtitle_header[avctx->extradata_size] = 0;
avctx->subtitle_header_size = avctx->extradata_size;
- avctx->priv_data = ff_ass_split(avctx->extradata);
- if(!avctx->priv_data)
- return -1;
return 0;
}
-static int ass_decode_close(AVCodecContext *avctx)
-{
- ff_ass_split_free(avctx->priv_data);
- avctx->priv_data = NULL;
- return 0;
-}
-
-#if CONFIG_SSA_DECODER
-static int ssa_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
+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;
- while (size > 0) {
- int duration;
- ASSDialog *dialog = ff_ass_split_dialog(avctx->priv_data, ptr, 0, NULL);
- if (!dialog)
- return AVERROR_INVALIDDATA;
- duration = dialog->end - dialog->start;
- len = ff_ass_add_rect(data, ptr, 0, duration, 1);
- if (len < 0)
- return len;
- ptr += len;
- size -= len;
- }
+ if (avpkt->size <= 0)
+ return avpkt->size;
- *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("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 = ssa_decode_frame,
- .close = ass_decode_close,
+ .decode = ass_decode_frame,
};
#endif
#if CONFIG_ASS_DECODER
-static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
- AVPacket *avpkt)
-{
- int ret;
- AVSubtitle *sub = data;
- const char *ptr = avpkt->data;
- static const AVRational ass_tb = {1, 100};
- const int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, ass_tb);
- const int ts_duration = av_rescale_q(avpkt->duration, avctx->time_base, ass_tb);
-
- if (avpkt->size <= 0)
- return avpkt->size;
-
- ret = ff_ass_add_rect(sub, ptr, ts_start, ts_duration, 2);
- if (ret < 0) {
- if (ret == AVERROR_INVALIDDATA)
- av_log(avctx, AV_LOG_ERROR, "Invalid ASS packet\n");
- return ret;
- }
-
- *got_sub_ptr = avpkt->size > 0;
- return avpkt->size;
-}
-
AVCodec ff_ass_decoder = {
.name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"),
.id = AV_CODEC_ID_ASS,
.init = ass_decode_init,
.decode = ass_decode_frame,
- .close = ass_decode_close,
};
#endif