[SCM] libav/experimental: Add forgotten xsub timecode parsing

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 59f6f64e30f2120122b0e082daccacd5d2e62942
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Aug 5 12:11:11 2007 +0000

    Add forgotten xsub timecode parsing
    
    Originally committed as revision 9934 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index d85e322..01eb9a6 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -7,6 +7,23 @@ static int decode_init(AVCodecContext *avctx) {
     return 0;
 }
 
+static const uint8_t tc_offsets[9] = { 0, 1, 3, 4, 6, 7, 9, 10, 11 };
+static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 6, 10, 10, 1 };
+
+static uint64_t parse_timecode(AVCodecContext *avctx, uint8_t *buf) {
+    int i;
+    int64_t ms = 0;
+    if (buf[2] != ':' || buf[5] != ':' || buf[8] != '.')
+        return AV_NOPTS_VALUE;
+    for (i = 0; i < sizeof(tc_offsets); i++) {
+        uint8_t c = buf[tc_offsets[i]] - '0';
+        if (c > 9) return AV_NOPTS_VALUE;
+        ms = (ms + c) * tc_muls[i];
+    }
+    ms = av_rescale_q(ms, (AVRational){1, 1000}, avctx->time_base);
+    return ms;
+}
+
 static const uint8_t runbits[8] = { 2, 2, 6, 6, 10, 10, 14, 14 };
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
@@ -23,6 +40,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         return -1;
     }
 
+    // read start and end time
+    if (buf[0] != '[' || buf[13] != '-' || buf[26] != ']') {
+        av_log(avctx, AV_LOG_ERROR, "invalid time code\n");
+        return -1;
+    }
+    sub->start_display_time = parse_timecode(avctx, buf +  1);
+    sub->end_display_time   = parse_timecode(avctx, buf + 14);
+    buf += 27;
+
     // read header
     w = bytestream_get_le16(&buf);
     h = bytestream_get_le16(&buf);

-- 
Libav/FFmpeg packaging