Ticket #611: movsubstest.2.diff

libmpdemux/demux_mov.c

@@ -32 +32 @@
 
 #include "bswap.h"
 
+#include "libvo/sub.h"
+extern subtitle *vo_sub;
+
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
@@ -290 +293 @@
 }
 
 #define MOV_MAX_TRACKS 256
+#define MOV_MAX_SUBLEN 1024
 
 typedef struct {
     off_t moov_start;
@@ -300 +304 @@
     mov_track_t* tracks[MOV_MAX_TRACKS];
     int timescale; // movie timescale
     int duration;  // movie duration (in movie timescale units)
+    subtitle subs;
+    char subtext[MOV_MAX_SUBLEN + 1];
 } mov_priv_t;
 
 #define MOV_FOURCC(a,b,c,d) ((a<<24)|(b<<16)|(c<<8)|(d))
@@ -2115 +2121 @@
     
     ++trak->pos;
 
+    if (demuxer->sub->id >= 0 && demuxer->sub->id < priv->track_db) {
+      int samplenr = 0;
+      trak = priv->tracks[demuxer->sub->id];
+      while (samplenr < trak->samples_size) {
+        double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale;
+        if (subpts >= pts) break;
+        samplenr++;
+      }
+      samplenr--;
+      if (samplenr < 0)
+        vo_sub = NULL;
+      else {
+        off_t pos = trak->samples[samplenr].pos + 2;
+        int len = trak->samples[samplenr].size - 2;
+        if (len < 0) len = 0;
+        if (len > MOV_MAX_SUBLEN) len = MOV_MAX_SUBLEN;
+        stream_seek(demuxer->stream, pos);
+        stream_read(demuxer->stream, priv->subtext, len);
+        priv->subtext[len] = 0;
+        priv->subs.lines = 1;
+        priv->subs.text[0] = &priv->subtext;
+        vo_sub = &priv->subs;
+      }
+      vo_osd_changed (OSDTYPE_SUBTITLE);
+    }
+
     return 1;
     
 }