X-Git-Url: https://git.piment-noir.org/?p=deb_ffmpeg.git;a=blobdiff_plain;f=ffmpeg%2Flibavformat%2Fassdec.c;h=c62e76f0ddba50cb18ed94fe21e2434ab9a32914;hp=a5f792aee47b12380bdc0aa6a56b3ed934919dce;hb=f6fa7814ccfe3e76514b36cf04f5cd3cb657c8cf;hpb=2ba45a602cbfa7b771effba9b11bb4245c21bc00

diff --git a/ffmpeg/libavformat/assdec.c b/ffmpeg/libavformat/assdec.c
index a5f792a..c62e76f 100644
--- a/ffmpeg/libavformat/assdec.c
+++ b/ffmpeg/libavformat/assdec.c
@@ -1,6 +1,7 @@
 /*
  * SSA/ASS demuxer
  * Copyright (c) 2008 Michael Niedermayer
+ * Copyright (c) 2014 Clément Bœsch
  *
  * This file is part of FFmpeg.
  *
@@ -29,6 +30,7 @@
 
 typedef struct ASSContext {
     FFDemuxSubtitlesQueue q;
+    unsigned readorder;
 } ASSContext;
 
 static int ass_probe(AVProbeData *p)
@@ -52,18 +54,36 @@ static int ass_read_close(AVFormatContext *s)
     return 0;
 }
 
-static int read_ts(const uint8_t *p, int64_t *start, int *duration)
+static int read_dialogue(ASSContext *ass, AVBPrint *dst, const uint8_t *p,
+                         int64_t *start, int *duration)
 {
+    int pos = 0;
     int64_t end;
     int hh1, mm1, ss1, ms1;
     int hh2, mm2, ss2, ms2;
 
-    if (sscanf(p, "%*[^,],%d:%d:%d%*c%d,%d:%d:%d%*c%d",
+    if (sscanf(p, "Dialogue: %*[^,],%d:%d:%d%*c%d,%d:%d:%d%*c%d,%n",
                &hh1, &mm1, &ss1, &ms1,
-               &hh2, &mm2, &ss2, &ms2) == 8) {
+               &hh2, &mm2, &ss2, &ms2, &pos) >= 8 && pos > 0) {
+
+        /* This is not part of the sscanf itself in order to handle an actual
+         * number (which would be the Layer) or the form "Marked=N" (which is
+         * the old SSA field, now replaced by Layer, and will lead to Layer
+         * being 0 here). */
+        const int layer = atoi(p + 10);
+
         end    = (hh2*3600LL + mm2*60LL + ss2) * 100LL + ms2;
         *start = (hh1*3600LL + mm1*60LL + ss1) * 100LL + ms1;
         *duration = end - *start;
+
+        av_bprint_clear(dst);
+        av_bprintf(dst, "%u,%d,%s", ass->readorder++, layer, p + pos);
+
+        /* right strip the buffer */
+        while (dst->len > 0 &&
+               dst->str[dst->len - 1] == '\r' ||
+               dst->str[dst->len - 1] == '\n')
+            dst->str[--dst->len] = 0;
         return 0;
     }
     return -1;
@@ -88,58 +108,46 @@ static int64_t get_line(AVBPrint *buf, FFTextReader *tr)
 static int ass_read_header(AVFormatContext *s)
 {
     ASSContext *ass = s->priv_data;
-    AVBPrint header, line;
-    int header_remaining, res = 0;
+    AVBPrint header, line, rline;
+    int res = 0;
     AVStream *st;
     FFTextReader tr;
-    ff_text_init_avio(&tr, s->pb);
+    ff_text_init_avio(s, &tr, s->pb);
 
     st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
     avpriv_set_pts_info(st, 64, 1, 100);
     st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
-    st->codec->codec_id   = AV_CODEC_ID_SSA;
-
-    header_remaining = INT_MAX;
+    st->codec->codec_id   = AV_CODEC_ID_ASS;
 
     av_bprint_init(&header, 0, AV_BPRINT_SIZE_UNLIMITED);
     av_bprint_init(&line,   0, AV_BPRINT_SIZE_UNLIMITED);
+    av_bprint_init(&rline,  0, AV_BPRINT_SIZE_UNLIMITED);
 
     for (;;) {
         int64_t pos = get_line(&line, &tr);
+        int64_t ts_start = AV_NOPTS_VALUE;
+        int duration = -1;
+        AVPacket *sub;
 
         if (!line.str[0]) // EOF
             break;
 
-        if (!memcmp(line.str, "[Events]", 8))
-            header_remaining = 2;
-        else if (line.str[0] == '[')
-            header_remaining = INT_MAX;
-
-        if (header_remaining) {
+        if (read_dialogue(ass, &rline, line.str, &ts_start, &duration) < 0) {
             av_bprintf(&header, "%s", line.str);
-            header_remaining--;
-        } else {
-            int64_t ts_start = AV_NOPTS_VALUE;
-            int duration = -1;
-            AVPacket *sub;
-
-            if (read_ts(line.str, &ts_start, &duration) < 0)
-                continue;
-            sub = ff_subtitles_queue_insert(&ass->q, line.str, line.len, 0);
-            if (!sub) {
-                res = AVERROR(ENOMEM);
-                goto end;
-            }
-            sub->pos = pos;
-            sub->pts = ts_start;
-            sub->duration = duration;
+            continue;
         }
+        sub = ff_subtitles_queue_insert(&ass->q, rline.str, rline.len, 0);
+        if (!sub) {
+            res = AVERROR(ENOMEM);
+            goto end;
+        }
+        sub->pos = pos;
+        sub->pts = ts_start;
+        sub->duration = duration;
     }
 
-    av_bprint_finalize(&line, NULL);
-
     res = avpriv_bprint_to_extradata(st->codec, &header);
     if (res < 0)
         goto end;
@@ -147,6 +155,9 @@ static int ass_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(&ass->q);
 
 end:
+    av_bprint_finalize(&header, NULL);
+    av_bprint_finalize(&line,   NULL);
+    av_bprint_finalize(&rline,  NULL);
     return res;
 }