[FFmpeg-devel] [PATCH 1/2] Kill timed SSA
Clément Bœsch
u at pkh.me
Sat Jan 9 14:46:51 CET 2016
---
libavcodec/Makefile | 4 ++--
libavcodec/assdec.c | 60 +++++++++++-----------------------------------------
libavcodec/assenc.c | 14 ++++++------
libavformat/assenc.c | 14 ++++--------
libavformat/nut.c | 1 -
5 files changed, 24 insertions(+), 69 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b9ffdb9..2b56980 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -171,9 +171,9 @@ OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
OBJS-$(CONFIG_APE_DECODER) += apedec.o
OBJS-$(CONFIG_APNG_DECODER) += png.o pngdec.o pngdsp.o
OBJS-$(CONFIG_APNG_ENCODER) += png.o pngenc.o
-OBJS-$(CONFIG_SSA_DECODER) += assdec.o ass.o ass_split.o
+OBJS-$(CONFIG_SSA_DECODER) += assdec.o ass.o
OBJS-$(CONFIG_SSA_ENCODER) += assenc.o ass.o
-OBJS-$(CONFIG_ASS_DECODER) += assdec.o ass.o ass_split.o
+OBJS-$(CONFIG_ASS_DECODER) += assdec.o ass.o
OBJS-$(CONFIG_ASS_ENCODER) += assenc.o ass.o
OBJS-$(CONFIG_ASV1_DECODER) += asvdec.o asv.o mpeg12data.o
OBJS-$(CONFIG_ASV1_ENCODER) += asvenc.o asv.o mpeg12data.o
diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c
index 11dbde0..624052e 100644
--- a/libavcodec/assdec.c
+++ b/libavcodec/assdec.c
@@ -23,7 +23,6 @@
#include "avcodec.h"
#include "ass.h"
-#include "ass_split.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
@@ -35,55 +34,9 @@ static av_cold int ass_decode_init(AVCodecContext *avctx)
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,
- AVPacket *avpkt)
-{
- const char *ptr = avpkt->data;
- int len, size = avpkt->size;
-
- 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;
- }
-
- *got_sub_ptr = avpkt->size > 0;
- return avpkt->size;
-}
-
-AVCodec ff_ssa_decoder = {
- .name = "ssa",
- .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
- .type = AVMEDIA_TYPE_SUBTITLE,
- .id = AV_CODEC_ID_SSA,
- .init = ass_decode_init,
- .decode = ssa_decode_frame,
- .close = ass_decode_close,
-};
-#endif
-
-#if CONFIG_ASS_DECODER
static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
AVPacket *avpkt)
{
@@ -108,6 +61,18 @@ static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
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("ASS (Advanced SubStation Alpha) subtitle"),
@@ -115,6 +80,5 @@ AVCodec ff_ass_decoder = {
.id = AV_CODEC_ID_ASS,
.init = ass_decode_init,
.decode = ass_decode_frame,
- .close = ass_decode_close,
};
#endif
diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c
index 5dc3b09..06aa916 100644
--- a/libavcodec/assenc.c
+++ b/libavcodec/assenc.c
@@ -22,7 +22,6 @@
#include <string.h>
#include "avcodec.h"
-#include "ass_split.h"
#include "ass.h"
#include "libavutil/avstring.h"
#include "libavutil/internal.h"
@@ -53,6 +52,8 @@ static int ass_encode_frame(AVCodecContext *avctx,
for (i=0; i<sub->num_rects; i++) {
char ass_line[2048];
const char *ass = sub->rects[i]->ass;
+ long int layer;
+ char *p;
if (sub->rects[i]->type != SUBTITLE_ASS) {
av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
@@ -65,10 +66,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA;
}
- if (avctx->codec->id == AV_CODEC_ID_ASS) {
- long int layer;
- char *p;
-
+ // TODO: reindent
if (i > 0) {
av_log(avctx, AV_LOG_ERROR, "ASS encoder supports only one "
"ASS rectangle field.\n");
@@ -93,7 +91,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
snprintf(ass_line, sizeof(ass_line), "%d,%ld,%s", ++s->id, layer, p);
ass_line[strcspn(ass_line, "\r\n")] = 0;
ass = ass_line;
- }
+
len = av_strlcpy(buf+total_len, ass, bufsize-total_len);
if (len > bufsize-total_len-1) {
@@ -110,9 +108,9 @@ static int ass_encode_frame(AVCodecContext *avctx,
#if CONFIG_SSA_ENCODER
AVCodec ff_ssa_encoder = {
.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_encode_init,
.encode_sub = ass_encode_frame,
.priv_data_size = sizeof(ASSEncodeContext),
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index e59c266..54f4e97 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -33,7 +33,6 @@ typedef struct DialogueLine {
typedef struct ASSContext {
const AVClass *class;
- int write_ts; // 0: ssa (timing in payload), 1: ass (matroska like)
int expected_readorder;
DialogueLine *dialogue_cache;
DialogueLine *last_added_dialogue;
@@ -49,12 +48,10 @@ static int write_header(AVFormatContext *s)
ASSContext *ass = s->priv_data;
AVCodecContext *avctx = s->streams[0]->codec;
- if (s->nb_streams != 1 || (avctx->codec_id != AV_CODEC_ID_SSA &&
- avctx->codec_id != AV_CODEC_ID_ASS)) {
+ if (s->nb_streams != 1 || avctx->codec_id != AV_CODEC_ID_ASS) {
av_log(s, AV_LOG_ERROR, "Exactly one ASS/SSA stream is needed.\n");
return AVERROR(EINVAL);
}
- ass->write_ts = avctx->codec_id == AV_CODEC_ID_ASS;
avpriv_set_pts_info(s->streams[0], 64, 1, 100);
if (avctx->extradata_size > 0) {
size_t header_size = avctx->extradata_size;
@@ -159,7 +156,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
{
ASSContext *ass = s->priv_data;
- if (ass->write_ts) {
+ // TODO: reindent
long int layer;
char *p = pkt->data;
int64_t start = pkt->pts;
@@ -200,9 +197,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
}
insert_dialogue(ass, dialogue);
purge_dialogues(s, ass->ignore_readorder);
- } else {
- avio_write(s->pb, pkt->data, pkt->size);
- }
return 0;
}
@@ -237,10 +231,10 @@ static const AVClass ass_class = {
AVOutputFormat ff_ass_muxer = {
.name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
- .mime_type = "text/x-ssa",
+ .mime_type = "text/x-ass",
.extensions = "ass,ssa",
.priv_data_size = sizeof(ASSContext),
- .subtitle_codec = AV_CODEC_ID_SSA,
+ .subtitle_codec = AV_CODEC_ID_ASS,
.write_header = write_header,
.write_packet = write_packet,
.write_trailer = write_trailer,
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 41e51df..053fc4f 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -27,7 +27,6 @@
const AVCodecTag ff_nut_subtitle_tags[] = {
{ AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') },
- { AV_CODEC_ID_SSA, MKTAG('S', 'S', 'A', 0 ) },
{ AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
{ AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
{ AV_CODEC_ID_DVB_TELETEXT, MKTAG('D', 'V', 'B', 'T') },
--
2.7.0
More information about the ffmpeg-devel
mailing list