[FFmpeg-devel] [PATCH 1/3] lavf/srtdec: switch to FFDemuxSubtitlesQueue API.

[Clément Bœsch]

On Sat, Dec 01, 2012 at 12:43:26AM +0100, Clément Bœsch wrote:
> ---
>  libavformat/srtdec.c | 76 ++++++++++++++++++++++++++++++++++++----------------
>  1 file changed, 53 insertions(+), 23 deletions(-)
> 

New version with seeking. I'll apply the patchset in 3 days if I see no
comment.

-- 
Clément B.
-------------- next part --------------
From 47b15bdd3caba63f5371bc57cddabb6dab3318e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Fri, 30 Nov 2012 19:39:11 +0100
Subject: [PATCH 1/3] lavf/srtdec: switch to FFDemuxSubtitlesQueue API.

---
 libavformat/srtdec.c | 85 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 23 deletions(-)

diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index f55fb11..92ac8db 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -21,9 +21,14 @@
 
 #include "avformat.h"
 #include "internal.h"
+#include "subtitles.h"
 #include "libavutil/bprint.h"
 #include "libavutil/intreadwrite.h"
 
+typedef struct {
+    FFDemuxSubtitlesQueue q;
+} SRTContext;
+
 static int srt_probe(AVProbeData *p)
 {
     unsigned char *ptr = p->buf;
@@ -42,17 +47,6 @@ static int srt_probe(AVProbeData *p)
     return 0;
 }
 
-static int srt_read_header(AVFormatContext *s)
-{
-    AVStream *st = avformat_new_stream(s, NULL);
-    if (!st)
-        return AVERROR(ENOMEM);
-    avpriv_set_pts_info(st, 64, 1, 1000);
-    st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
-    st->codec->codec_id   = AV_CODEC_ID_SUBRIP;
-    return 0;
-}
-
 static int64_t get_pts(const char **buf, int *duration,
                        int32_t *x1, int32_t *y1, int32_t *x2, int32_t *y2)
 {
@@ -87,6 +81,8 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf)
     char eol_buf[5];
     int n = 0, i = 0, nb_eol = 0;
 
+    av_bprint_clear(buf);
+
     for (;;) {
         char c = avio_r8(pb);
 
@@ -127,31 +123,45 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf)
         av_bprintf(buf, "\n");
 }
 
-static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
+static int srt_read_header(AVFormatContext *s)
 {
+    SRTContext *srt = s->priv_data;
     AVBPrint buf;
-    int64_t pos = avio_tell(s->pb);
-    int res = AVERROR_EOF;
+    AVStream *st = avformat_new_stream(s, NULL);
+    int res = 0;
+
+    if (!st)
+        return AVERROR(ENOMEM);
+    avpriv_set_pts_info(st, 64, 1, 1000);
+    st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+    st->codec->codec_id   = AV_CODEC_ID_SUBRIP;
 
     av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
+
+    while (!url_feof(s->pb)) {
     read_chunk(s->pb, &buf);
 
     if (buf.len) {
+        int64_t pos = avio_tell(s->pb);
         int64_t pts;
-        int duration, pkt_size;
+        int duration;
         const char *ptr = buf.str;
         int32_t x1 = -1, y1 = -1, x2 = -1, y2 = -1;
+        AVPacket *sub;
 
         pts = get_pts(&ptr, &duration, &x1, &y1, &x2, &y2);
-        pkt_size = buf.len - (ptr - buf.str);
-        if (pts != AV_NOPTS_VALUE && !(res = av_new_packet(pkt, pkt_size))) {
-            memcpy(pkt->data, ptr, pkt->size);
-            pkt->flags |= AV_PKT_FLAG_KEY;
-            pkt->pos = pos;
-            pkt->pts = pkt->dts = pts;
-            pkt->duration = duration;
+        if (pts != AV_NOPTS_VALUE) {
+            int len = buf.len - (ptr - buf.str);
+            sub = ff_subtitles_queue_insert(&srt->q, ptr, len, 0);
+            if (!sub) {
+                res = AVERROR(ENOMEM);
+                goto end;
+            }
+            sub->pos = pos;
+            sub->pts = pts;
+            sub->duration = duration;
             if (x1 != -1) {
-                uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SUBTITLE_POSITION, 16);
+                uint8_t *p = av_packet_new_side_data(sub, AV_PKT_DATA_SUBTITLE_POSITION, 16);
                 if (p) {
                     AV_WL32(p,      x1);
                     AV_WL32(p +  4, y1);
@@ -161,15 +171,44 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
             }
         }
     }
+    }
+
+    ff_subtitles_queue_finalize(&srt->q);
+
+end:
     av_bprint_finalize(&buf, NULL);
     return res;
 }
 
+static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    SRTContext *srt = s->priv_data;
+    return ff_subtitles_queue_read_packet(&srt->q, pkt);
+}
+
+static int srt_read_seek(AVFormatContext *s, int stream_index,
+                         int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
+{
+    SRTContext *srt = s->priv_data;
+    return ff_subtitles_queue_seek(&srt->q, s, stream_index,
+                                   min_ts, ts, max_ts, flags);
+}
+
+static int srt_read_close(AVFormatContext *s)
+{
+    SRTContext *srt = s->priv_data;
+    ff_subtitles_queue_clean(&srt->q);
+    return 0;
+}
+
 AVInputFormat ff_srt_demuxer = {
     .name        = "srt",
     .long_name   = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
+    .priv_data_size = sizeof(SRTContext),
     .read_probe  = srt_probe,
     .read_header = srt_read_header,
     .read_packet = srt_read_packet,
+    .read_seek2  = srt_read_seek,
+    .read_close  = srt_read_close,
     .flags       = AVFMT_GENERIC_INDEX,
 };
-- 
1.8.0.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121202/dfa6e0d5/attachment.asc>