summaryrefslogtreecommitdiff
path: root/libavformat/assenc.c
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2014-10-30 20:16:08 -0500
committerClément Bœsch <u@pkh.me>2014-11-01 19:38:48 +0100
commitae437c7ce7049a81db9378645ca4146d35ecb25f (patch)
treea96e2bf3d9079fae6d54514ac2f0324c47a8bcf4 /libavformat/assenc.c
parentae6118de19a5fc02631842baf20675fa370f7a94 (diff)
avformat/assenc: Add ignore_gaps option
Signed-off-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/assenc.c')
-rw-r--r--libavformat/assenc.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index 822596778a..bde1096269 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -23,6 +23,8 @@
#include "avformat.h"
#include "internal.h"
+#include "libavutil/opt.h"
+
typedef struct DialogueLine {
int readorder;
char *line;
@@ -30,12 +32,14 @@ typedef struct DialogueLine {
} 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;
int cache_size;
int ssa_mode;
+ int ignore_readorder;
}ASSContext;
static int write_header(AVFormatContext *s)
@@ -178,7 +182,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(ENOMEM);
}
insert_dialogue(ass, dialogue);
- purge_dialogues(s, 0);
+ purge_dialogues(s, ass->ignore_readorder);
} else {
avio_write(s->pb, pkt->data, pkt->size);
}
@@ -192,6 +196,20 @@ static int write_trailer(AVFormatContext *s)
return 0;
}
+#define OFFSET(x) offsetof(ASSContext, x)
+#define E AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "ignore_readorder", "write events immediately, even if they're out-of-order", OFFSET(ignore_readorder), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E },
+ { NULL },
+};
+
+static const AVClass ass_class = {
+ .class_name = "ass muxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVOutputFormat ff_ass_muxer = {
.name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
@@ -203,4 +221,5 @@ AVOutputFormat ff_ass_muxer = {
.write_packet = write_packet,
.write_trailer = write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_NOTIMESTAMPS | AVFMT_TS_NONSTRICT,
+ .priv_class = &ass_class,
};