From 27d383918a3d63559c85ca96b2162a13234f2abc Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 1 Jun 2013 19:43:11 +0200
Subject: core: add demux_sub pseudo demuxer

Subtitle files are opened in mplayer.c, not using the demuxer
infrastructure in general. Pretend that this is not the case (outside of
the loading code) by opening a pseudo demuxer that does nothing. One
advantage is that the initialization code is now the same, and there's
no confusion about what the difference between track->stream,
track->sh_sub and mpctx->sh_sub is supposed to be.

This is a bit stupid, and it would be much better if there were proper
subtitle demuxers (there are many in recent FFmpeg, but not Libav). So
for now this is just a transition to a more proper architecture. Look
at demux_sub like an artifical limb: it's ugly, but don't hate it - it
helps you to get on with your life.
---
 demux/demux.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 3e27b43f93..12e0d9083a 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -66,6 +66,7 @@ extern const demuxer_desc_t demuxer_desc_mpeg_es;
 extern const demuxer_desc_t demuxer_desc_mpeg4_es;
 extern const demuxer_desc_t demuxer_desc_h264_es;
 extern const demuxer_desc_t demuxer_desc_mpeg_ts;
+extern const demuxer_desc_t demuxer_desc_sub;
 
 /* Please do not add any new demuxers here. If you want to implement a new
  * demuxer, add it to libavformat, except for wrappers around external
@@ -95,6 +96,8 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_mpeg_ts,
     // auto-probe last, because it checks file-extensions only
     &demuxer_desc_mf,
+    // no auto-probe
+    &demuxer_desc_sub,
     /* Please do not add any new demuxers here. If you want to implement a new
      * demuxer, add it to libavformat, except for wrappers around external
      * libraries and demuxers requiring binary support. */
@@ -217,8 +220,8 @@ static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format)
 }
 
 
-demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type,
-                       int a_id, int v_id, int s_id, char *filename)
+static demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type,
+                              int a_id, int v_id, int s_id, char *filename)
 {
     struct demuxer *d = talloc_zero(NULL, struct demuxer);
     d->stream = stream;
@@ -248,6 +251,18 @@ demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type,
     return d;
 }
 
+// for demux_sub.c
+demuxer_t *new_sub_pseudo_demuxer(struct MPOpts *opts)
+{
+    struct stream *s = open_stream("null://", NULL, NULL);
+    assert(s);
+    struct demuxer *d = new_demuxer(opts, s, DEMUXER_TYPE_SUB,
+                                    -1, -1, -1, NULL);
+    new_sh_stream(d, STREAM_SUB);
+    talloc_steal(d, s);
+    return d;
+}
+
 static struct sh_stream *new_sh_stream_id(demuxer_t *demuxer,
                                           enum stream_type type,
                                           int stream_index,
-- 
cgit v1.2.3


From 13a1ce16f9581871cf7ac0d06ece407534a98f89 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 3 Jun 2013 01:28:14 +0200
Subject: sub: pass subtitle packets directly

Before this, subtitle packets were returned as data ptr/len pairs, and
mplayer.c got the rest (pts and duration) directly from the demuxer
data structures. Then mplayer.c reassembled the packet data structure
again.

Pass packets directly instead. The mplayer.c side stays a bit awkward,
because the (now by default unused) DVD path keeps getting in the way.
In demux.c there's lots of weird stuff (3 functions that read packets,
really?), but we want to keep the code equivalent for now to avoid
hitting weird issues and corner cases.
---
 demux/demux.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 12e0d9083a..25f31a3f60 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -801,20 +801,20 @@ int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts)
     return len;
 }
 
-int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start)
+struct demux_packet *ds_get_packet_sub(demux_stream_t *ds)
 {
-    int len;
     if (ds->buffer_pos >= ds->buffer_size) {
-        *start = NULL;
         if (!ds->packs)
-            return -1;  // no sub
+            return NULL;  // no sub
         if (!ds_fill_buffer(ds))
-            return -1;  // EOF
+            return NULL;  // EOF
     }
-    len = ds->buffer_size - ds->buffer_pos;
-    *start = &ds->buffer[ds->buffer_pos];
-    ds->buffer_pos += len;
-    return len;
+    if (ds->buffer_pos < ds->buffer_size) {
+        ds->current->buffer += ds->buffer_pos;
+        ds->buffer_size -= ds->buffer_pos;
+    }
+    ds->buffer_pos = ds->buffer_size;
+    return ds->current;
 }
 
 struct demux_packet *ds_get_packet2(struct demux_stream *ds, bool repeat_last)
-- 
cgit v1.2.3