]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b71184f)
avformat/ttmlenc: enable writing out additional header values
authorJan Ekström <jan.ekstrom@24i.com>
Mon, 15 Mar 2021 14:01:52 +0000 (16:01 +0200)
committerJan Ekström <jeebjp@gmail.com>
Mon, 26 Apr 2021 13:40:31 +0000 (16:40 +0300)
This way the encoder may pass on the following values to the muxer:
1) Additional root "tt" element attributes, such as the subtitle
   canvas reference size.
2) Anything before the body element of the document, such as regions
   in the head element, which can configure styles.

Signed-off-by: Jan Ekström <jan.ekstrom@24i.com>
libavcodec/ttmlenc.h patch | blob | history
libavformat/ttmlenc.c patch | blob | history

diff --git a/libavcodec/ttmlenc.h b/libavcodec/ttmlenc.h
index c1dd5ec990079e7914f6ea7bc25a37ad420bc4be..c3bb11478d989c9ac0f0549d4bbe2ca3dc233877 100644 (file)
--- a/libavcodec/ttmlenc.h
+++ b/libavcodec/ttmlenc.h
@@ -25,4 +25,9 @@
 #define TTMLENC_EXTRADATA_SIGNATURE "lavc-ttmlenc"
 #define TTMLENC_EXTRADATA_SIGNATURE_SIZE (sizeof(TTMLENC_EXTRADATA_SIGNATURE) - 1)
 
+static const char ttml_default_namespacing[] =
+"  xmlns=\"http://www.w3.org/ns/ttml\"\n"
+"  xmlns:ttm=\"http://www.w3.org/ns/ttml#metadata\"\n"
+"  xmlns:tts=\"http://www.w3.org/ns/ttml#styling\"\n";
+
 #endif /* AVCODEC_TTMLENC_H */
diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c
index 940f8bbd4e5e7accb9d06af46df8b071535ec31b..34a0107a1472a222df2a41582149c52e1342fbb9 100644 (file)
--- a/libavformat/ttmlenc.c
+++ b/libavformat/ttmlenc.c
@@ -37,6 +37,11 @@ enum TTMLPacketType {
     PACKET_TYPE_DOCUMENT,
 };
 
+struct TTMLHeaderParameters {
+    const char *tt_element_params;
+    const char *pre_body_elements;
+};
+
 typedef struct TTMLMuxContext {
     enum TTMLPacketType input_type;
     unsigned int document_written;
@@ -45,10 +50,9 @@ typedef struct TTMLMuxContext {
 static const char ttml_header_text[] =
 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
 "<tt\n"
-"  xmlns=\"http://www.w3.org/ns/ttml\"\n"
-"  xmlns:ttm=\"http://www.w3.org/ns/ttml#metadata\"\n"
-"  xmlns:tts=\"http://www.w3.org/ns/ttml#styling\"\n"
+"%s"
 "  xml:lang=\"%s\">\n"
+"%s"
 "  <body>\n"
 "    <div>\n";
 
@@ -72,6 +76,48 @@ static void ttml_write_time(AVIOContext *pb, const char tag[],
                 tag, hour, min, sec, millisec);
 }
 
+static int ttml_set_header_values_from_extradata(
+    AVCodecParameters *par, struct TTMLHeaderParameters *header_params)
+{
+    size_t additional_data_size =
+        par->extradata_size - TTMLENC_EXTRADATA_SIGNATURE_SIZE;
+    char *value =
+        (char *)par->extradata + TTMLENC_EXTRADATA_SIGNATURE_SIZE;
+    size_t value_size = av_strnlen(value, additional_data_size);
+    struct TTMLHeaderParameters local_params = { 0 };
+
+    if (!additional_data_size) {
+        // simple case, we don't have to go through local_params and just
+        // set default fall-back values (for old extradata format).
+        header_params->tt_element_params = ttml_default_namespacing;
+        header_params->pre_body_elements = "";
+
+        return 0;
+    }
+
+    if (value_size == additional_data_size ||
+        value[value_size] != '\0')
+        return AVERROR_INVALIDDATA;
+
+    local_params.tt_element_params = value;
+
+    additional_data_size -= value_size + 1;
+    value += value_size + 1;
+    if (!additional_data_size)
+        return AVERROR_INVALIDDATA;
+
+    value_size = av_strnlen(value, additional_data_size);
+    if (value_size == additional_data_size ||
+        value[value_size] != '\0')
+        return AVERROR_INVALIDDATA;
+
+    local_params.pre_body_elements = value;
+
+    *header_params = local_params;
+
+    return 0;
+}
+
 static int ttml_write_header(AVFormatContext *ctx)
 {
     TTMLMuxContext *ttml_ctx = ctx->priv_data;
@@ -103,8 +149,22 @@ static int ttml_write_header(AVFormatContext *ctx)
 
         avpriv_set_pts_info(st, 64, 1, 1000);
 
-        if (ttml_ctx->input_type == PACKET_TYPE_PARAGRAPH)
-            avio_printf(pb, ttml_header_text, printed_lang);
+        if (ttml_ctx->input_type == PACKET_TYPE_PARAGRAPH) {
+            struct TTMLHeaderParameters header_params;
+            int ret = ttml_set_header_values_from_extradata(
+                st->codecpar, &header_params);
+            if (ret < 0) {
+                av_log(ctx, AV_LOG_ERROR,
+                       "Failed to parse TTML header values from extradata: "
+                       "%s!\n", av_err2str(ret));
+                return ret;
+            }
+
+            avio_printf(pb, ttml_header_text,
+                        header_params.tt_element_params,
+                        printed_lang,
+                        header_params.pre_body_elements);
+        }
     }
 
     return 0;
Unnamed repository; edit this file 'description' to name the repository.