Ticket #1389: vobsub.patch

vobsub.c

@@ -285 +285 @@
     unsigned char *packet;
     unsigned int packet_reserve;
     unsigned int packet_size;
+    
+    unsigned int last_pts;
+    int last_pts_diff;
 } mpeg_t;
 
 static mpeg_t *mpeg_open(const char *filename)
@@ -293 +296 @@
     int err = res == NULL;
     if (!err) {
         res->pts            = 0;
+        res->last_pts       = 0;
+        res->last_pts_diff  = INT_MAX;
         res->aid            = -1;
         res->packet         = NULL;
         res->packet_size    = 0;
@@ -416 +421 @@
                 } else
                     mpeg->pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 | (buf[2] & 0xfe) << 14
                         | buf[3] << 7 | (buf[4] >> 1));
+                if (mpeg->last_pts > 0) {
+                    mpeg->last_pts_diff = mpeg->pts - mpeg->last_pts;
+                }
+                mp_msg(MSGT_VOBSUB, MSGL_DBG3, "mpeg_run: pts=%d diff=%d \n", mpeg->pts, mpeg->last_pts_diff);
+                mpeg->last_pts = mpeg->pts;
             } else /* if ((pts_flags & 0xc0) == 0xc0) */ {
                 /* what's this? */
                 /* abort(); */
@@ -1026 +1036 @@
                                             last_pts_diff = pkt->pts100 - mpg->pts;
                                         else
                                             pkt->pts100 = mpg->pts;
+                                        
+                                        /* KLUGE: arbitrary pts difference
+                                            to merge packets */
+                                        if (mpg->last_pts_diff < 10000) {
+                                            packet_t *last = queue->packets + queue->current_index-1;
+                                            mp_msg(MSGT_VOBSUB, MSGL_DBG3, "vobsub_open: new pts probably belongs to last chunk. pts=%d last=%d \n", pkt->pts100, last->pts100);
+                                            pkt->pts100 = last->pts100;
+                                        }
+
                                         /* FIXME: should not use mpg_sub internal informations, make a copy */
                                         pkt->data = mpg->packet;
                                         pkt->size = mpg->packet_size;
+                                        mp_msg(MSGT_VOBSUB, MSGL_DBG3, "vobsub_open: adding packet.  pos=%lx size=%d pts100=%d \n", pos, pkt->size, pkt->pts100);
                                         mpg->packet = NULL;
                                         mpg->packet_reserve = 0;
                                         mpg->packet_size = 0;