changeset 27518:e54c9b7eb0d8

Revert bad changes to SSA/ASS subtitle packet format The following commits are reverted partially or completely: "a valid ASS line contains 9 ',' before actual text" "demux_mkv: output correctly formated ASS packets" "libass: add a new ass_process_data() to process demuxed subtitle packets" These commits converted the internal representation of SSA/ASS subtitle packets from the format used by Matroska to a custom format where each packet has contents exactly matching one line in complete SSA script files. AFAIK no files natively use such a format for muxed subtitles. The stated reason for this change was to use a format that could in principle be muxed into a maximal number of containers. SSA subtitles do not have an implicit duration so both start time and duration or end time need to be specified explicitly; the new format moved timing information inside the codec packet data so it could be muxed without modification into containers that can represent only start time at the container level. However such a change is wrong from the viewpoint of program architecture. Timing information belongs to the demuxer level, but these commits moved not only the duration but also the authoritative value of the start time to inside the codec data. Additionally the new format lost the value of the Matroska ReadOrder field which is used by MPlayer. This commit changes the internal packet format back to that used by Matroska and makes the internal Matroska demuxer output that format again. Libavformat still outputs the "new" format; it could be converted back to the Matroska format in demux_lavf.c, but I'm not adding that code at least yet. The current lavf code has similar problems as the reverted code in MPlayer, and it also currently fails to provide any way to access the value of the ReadOrder field. I hope that the lavf side will be improved; if it isn't conversion can be added later. For now I'll make MPlayer default to the internal Matroska demuxer instead of the lavf one in a separate commit.

--- a/libmpdemux/demux_mkv.c	Mon Sep 08 20:01:10 2008 +0000
+++ b/libmpdemux/demux_mkv.c	Mon Sep 08 21:26:22 2008 +0000
@@ -2566,42 +2566,10 @@
   return 0;
 }
 
-static void fix_ass_packet(char **block, int64_t *size,
-                           uint64_t block_duration, uint64_t timecode)
-{
-    char *line, *layer, *ptr = *block, *end = ptr+*size;
-    *end = 0;
-    for (; *ptr!=',' && ptr<end-1; ptr++);
-    if (*ptr == ',')
-        layer = ++ptr;
-    for (; *ptr!=',' && ptr<end-1; ptr++);
-    if (*ptr == ',') {
-        int64_t end_pts = timecode + block_duration;
-        int sc = timecode / 10;
-        int ec = end_pts  / 10;
-        int sh, sm, ss, eh, em, es, len;
-        sh = sc/360000;  sc -= 360000*sh;
-        sm = sc/  6000;  sc -=   6000*sm;
-        ss = sc/   100;  sc -=    100*ss;
-        eh = ec/360000;  ec -= 360000*eh;
-        em = ec/  6000;  ec -=   6000*em;
-        es = ec/   100;  ec -=    100*es;
-        *ptr++ = '\0';
-        len = 50 + end-ptr;
-        if (!(line = malloc(len)))
-            return;
-        snprintf(line,len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s",
-                 layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
-        *block = line;
-        *size = strlen(line);
-    }
-}
-
 static void
 handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block,
                  int64_t size, uint64_t block_duration, uint64_t timecode)
 {
-  char *data = block;
   demux_packet_t *dp;
 
   if (block_duration == 0)
@@ -2611,17 +2579,12 @@
       return;
     }
 
-  if (track->subtitle_type == MATROSKA_SUBTYPE_SSA)
-      fix_ass_packet(&data, &size, block_duration, timecode);
-
   sub_utf8 = 1;
   dp = new_demux_packet(size);
-  memcpy(dp->buffer, data, size);
+  memcpy(dp->buffer, block, size);
   dp->pts = timecode / 1000.0f;
   dp->endpts = (timecode + block_duration) / 1000.0f;
   ds_add_packet(demuxer->sub, dp);
-  if (data != block)
-      free(data);
 }
 
 // Taken from demux_real.c. Thanks to the original developpers :)

--- a/mpcommon.c	Mon Sep 08 20:01:10 2008 +0000
+++ b/mpcommon.c	Mon Sep 08 21:26:22 2008 +0000
@@ -122,7 +122,9 @@
                 ass_track = sh ? sh->ass_track : NULL;
                 if (!ass_track) continue;
                 if (type == 'a') { // ssa/ass subs with libass
-                    ass_process_data(ass_track, packet, len);
+                    ass_process_chunk(ass_track, packet, len,
+                                      (long long)(pts*1000 + 0.5),
+                                      (long long)((endpts-pts)*1000 + 0.5));
                 } else { // plaintext subs with libass
                     vo_sub = NULL;
                     if (pts != MP_NOPTS_VALUE) {
@@ -143,7 +145,7 @@
                 if (type == 'a') { // ssa/ass subs without libass => convert to plaintext
                     int i;
                     unsigned char* p = packet;
-                    for (i=0; i < 9 && *p != '\0'; p++)
+                    for (i=0; i < 8 && *p != '\0'; p++)
                         if (*p == ',')
                             i++;
                     if (*p == '\0')  /* Broken line? */