[FFmpeg-cvslog] avformat/assenc: Add ignore_gaps option
Rodger Combs
git at videolan.org
Sat Nov 1 19:39:00 CET 2014
ffmpeg | branch: master | Rodger Combs <rodger.combs at gmail.com> | Thu Oct 30 20:16:08 2014 -0500| [ae437c7ce7049a81db9378645ca4146d35ecb25f] | committer: Clément Bœsch
avformat/assenc: Add ignore_gaps option
Signed-off-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae437c7ce7049a81db9378645ca4146d35ecb25f
---
libavformat/assenc.c | 21 ++++++++++++++++++++-
libavformat/version.h | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index 8225967..bde1096 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,
};
diff --git a/libavformat/version.h b/libavformat/version.h
index dd00844..ab6d134 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 11
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MICRO 102
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list