From 8f75ba9926c6b1377aa746ab4ee53831a395fe41 Mon Sep 17 00:00:00 2001
From: Matthew Heaney <matthewjheaney@google.com>
Date: Fri, 31 May 2013 16:27:32 -0700
Subject: lavf/webvttdec: save cue id and settings as side data

Currently the WebVTT demuxer parses the cues but throws away
the cue id (the optional first line of the cue) and cue
settings (the optional rendering instructions that follow
the timestamp).

However, in order to write inband text tracks (to WebM
files), the entire cue payload from the WebVTT source must
be preserved.

This commit makes no change to the data part of the output
buffer packet (where the actual cue text is stored), but
does add the cue id and settings as a side data items, if
they're present in the cue. Existing code that cares only
about the data part of the packet can continue to ignore the
side data.

There are two new packet data type flags,
AV_PKT_DATA_WEBVTT_IDENTIFIER and
AV_PKT_DATA_WEBVTT_SETTINGS.
---
 libavformat/webvttdec.c | 53 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 11 deletions(-)

(limited to 'libavformat/webvttdec.c')

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 694a020b19..894a762dd5 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -74,8 +74,8 @@ static int webvtt_read_header(AVFormatContext *s)
         int i;
         int64_t pos;
         AVPacket *sub;
-        const char *p, *identifier;
-        //const char *settings = NULL;
+        const char *p, *identifier, *settings;
+        int identifier_len, settings_len;
         int64_t ts_start, ts_end;
 
         ff_subtitles_read_chunk(s->pb, &cue);
@@ -92,15 +92,23 @@ static int webvtt_read_header(AVFormatContext *s)
             continue;
 
         /* optional cue identifier (can be a number like in SRT or some kind of
-         * chaptering id), silently skip it */
-        for (i = 0; p[i] && p[i] != '\n'; i++) {
+         * chaptering id) */
+        for (i = 0; p[i] && p[i] != '\n' && p[i] != '\r'; i++) {
             if (!strncmp(p + i, "-->", 3)) {
                 identifier = NULL;
                 break;
             }
         }
-        if (identifier)
-            p += strcspn(p, "\n");
+        if (!identifier)
+            identifier_len = 0;
+        else {
+            identifier_len = strcspn(p, "\r\n");
+            p += identifier_len;
+            if (*p == '\r')
+                p++;
+            if (*p == '\n')
+                p++;
+        }
 
         /* cue timestamps */
         if ((ts_start = read_ts(p)) == AV_NOPTS_VALUE)
@@ -112,14 +120,15 @@ static int webvtt_read_header(AVFormatContext *s)
         if ((ts_end = read_ts(p)) == AV_NOPTS_VALUE)
             break;
 
-        /* optional cue settings, TODO: store in side_data */
+        /* optional cue settings */
         p += strcspn(p, "\n\t ");
         while (*p == '\t' || *p == ' ')
             p++;
-        if (*p != '\n') {
-            //settings = p;
-            p += strcspn(p, "\n");
-        }
+        settings = p;
+        settings_len = strcspn(p, "\r\n");
+        p += settings_len;
+        if (*p == '\r')
+            p++;
         if (*p == '\n')
             p++;
 
@@ -132,6 +141,28 @@ static int webvtt_read_header(AVFormatContext *s)
         sub->pos = pos;
         sub->pts = ts_start;
         sub->duration = ts_end - ts_start;
+
+        if (identifier_len) {
+            uint8_t *buf = av_packet_new_side_data(sub,
+                                                   AV_PKT_DATA_WEBVTT_IDENTIFIER,
+                                                   identifier_len);
+            if (!buf) {
+                res = AVERROR(ENOMEM);
+                goto end;
+            }
+            memcpy(buf, identifier, identifier_len);
+        }
+
+        if (settings_len) {
+            uint8_t *buf = av_packet_new_side_data(sub,
+                                                   AV_PKT_DATA_WEBVTT_SETTINGS,
+                                                   settings_len);
+            if (!buf) {
+                res = AVERROR(ENOMEM);
+                goto end;
+            }
+            memcpy(buf, settings, settings_len);
+        }
     }
 
     ff_subtitles_queue_finalize(&webvtt->q);
-- 
cgit v1.2.1