Add SSA subtitle support

Thanks to davidfster


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3342 b64f7644-9d1e-0410-96f1-a4d463321fa5

7 files changed, 39 insertions, 22 deletions

diff --git a/libhb/common.h b/libhb/common.h
index 0f9741924..7f2d61126 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -504,7 +504,7 @@ struct hb_subtitle_s
     hb_subtitle_config_t config;
 
     enum subtype { PICTURESUB, TEXTSUB } format;
-    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB } source;
+    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB, SSASUB } source;
     char lang[1024];
     char iso639_2[4];
     uint8_t type; /* Closed Caption, Childrens, Directors etc */
@@ -730,6 +730,7 @@ extern hb_work_object_t hb_deccc608;
 extern hb_work_object_t hb_decsrtsub;
 extern hb_work_object_t hb_decutf8sub;
 extern hb_work_object_t hb_dectx3gsub;
+extern hb_work_object_t hb_decssasub;
 extern hb_work_object_t hb_render;
 extern hb_work_object_t hb_encavcodec;
 extern hb_work_object_t hb_encx264;
diff --git a/libhb/dectx3gsub.c b/libhb/dectx3gsub.c
index e9a178ec0..e466ac5d5 100644
--- a/libhb/dectx3gsub.c
+++ b/libhb/dectx3gsub.c
@@ -128,6 +128,8 @@ static hb_buffer_t *tx3g_decode_to_utf8( hb_buffer_t *in )
      */
     int maxOutputSize = textLength + (numStyleRecords * NUM_FACE_STYLE_FLAGS * (MAX_OPEN_TAG_SIZE + MAX_CLOSE_TAG_SIZE));
     hb_buffer_t *out = hb_buffer_init( maxOutputSize );
+    if ( out == NULL )
+        goto fail;
     uint8_t *dst = out->data;
     int charIndex = 0;
     for ( pos = text, end = text + textLength; pos < end; pos++ ) {
@@ -165,6 +167,7 @@ static hb_buffer_t *tx3g_decode_to_utf8( hb_buffer_t *in )
     out->start = in->start;
     out->stop = in->stop;
     
+fail:
     free( startStyle );
     free( endStyle );
     
@@ -204,19 +207,21 @@ static int dectx3gWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
         out = hb_buffer_init( 0 );
     }
     
-    // We shouldn't be storing the extra NULL character,
-    // but the MP4 muxer expects this, unfortunately.
-    if ( out->size > 0 && out->data[out->size - 1] != '\0' ) {
-        // NOTE: out->size remains unchanged
-        hb_buffer_realloc( out, out->size + 1 );
-        out->data[out->size] = '\0';
-    }
-    
-    // If the input packet was non-empty, do not pass through
-    // an empty output packet (even if the subtitle was empty),
-    // as this would be interpreted as an end-of-stream
-    if ( in->size > 0 && out->size == 0 ) {
-        hb_buffer_close(&out);
+    if ( out != NULL ) {
+        // We shouldn't be storing the extra NULL character,
+        // but the MP4 muxer expects this, unfortunately.
+        if ( out->size > 0 && out->data[out->size - 1] != '\0' ) {
+            // NOTE: out->size remains unchanged
+            hb_buffer_realloc( out, out->size + 1 );
+            out->data[out->size] = '\0';
+        }
+        
+        // If the input packet was non-empty, do not pass through
+        // an empty output packet (even if the subtitle was empty),
+        // as this would be interpreted as an end-of-stream
+        if ( in->size > 0 && out->size == 0 ) {
+            hb_buffer_close(&out);
+        }
     }
     
     // Dispose the input packet, as it is no longer needed
diff --git a/libhb/hb.c b/libhb/hb.c
index 075bb81f1..a835d2766 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -318,6 +318,7 @@ hb_handle_t * hb_init( int verbose, int update_check )
     hb_register( &hb_decsrtsub );
     hb_register( &hb_decutf8sub );
     hb_register( &hb_dectx3gsub );
+    hb_register( &hb_decssasub );
 	hb_register( &hb_render );
 	hb_register( &hb_encavcodec );
 	hb_register( &hb_encx264 );
@@ -421,6 +422,7 @@ hb_handle_t * hb_init_dl( int verbose, int update_check )
     hb_register( &hb_decsrtsub );
     hb_register( &hb_decutf8sub );
     hb_register( &hb_dectx3gsub );
+    hb_register( &hb_decssasub );
 	hb_register( &hb_render );
 	hb_register( &hb_encavcodec );
 	hb_register( &hb_encx264 );
diff --git a/libhb/internal.h b/libhb/internal.h
index f7092f104..135d73fcc 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -311,6 +311,7 @@ enum
     WORK_DECSRTSUB,
     WORK_DECUTF8SUB,
     WORK_DECTX3GSUB,
+    WORK_DECSSASUB,
     WORK_ENCVOBSUB,
     WORK_RENDER,
     WORK_ENCAVCODEC,
diff --git a/libhb/stream.c b/libhb/stream.c
index 35b705af4..24093e62a 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -2982,14 +2982,11 @@ static void add_ffmpeg_subtitle( hb_title_t *title, hb_stream_t *stream, int id
             subtitle->source = TX3GSUB;
             subtitle->config.dest = PASSTHRUSUB;
             break;
-        // TODO(davidfstr): implement SSA subtitle support
-        /*
         case CODEC_ID_SSA:
             subtitle->format = TEXTSUB;
             subtitle->source = SSASUB;
             subtitle->config.dest = PASSTHRUSUB;
             break;
-        */
         default:
             hb_log( "add_ffmpeg_subtitle: unknown subtitle stream type: 0x%x", (int) codec->codec_id );
             free(subtitle);
@@ -3262,6 +3259,10 @@ static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf )
      * VOB subtitles (CODEC_ID_DVD_SUBTITLE) do not have their duration stored in
      * either field. This is not a problem because the VOB decoder can extract this
      * information from the packet payload itself.
+     * 
+     * SSA subtitles (CODEC_ID_SSA) do not have their duration stored in
+     * either field. This is not a problem because the SSA decoder can extract this
+     * information from the packet payload itself.
      */
     enum CodecID ffmpeg_pkt_codec = stream->ffmpeg_ic->streams[stream->ffmpeg_pkt->stream_index]->codec->codec_id;
     if ( ffmpeg_pkt_codec == CODEC_ID_TEXT ) {
diff --git a/libhb/sync.c b/libhb/sync.c
index 8972c7244..9c36ee30a 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -566,7 +566,8 @@ int syncVideoWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
             subtitle->source == CC708SUB ||
             subtitle->source == SRTSUB ||
             subtitle->source == UTF8SUB ||
-            subtitle->source == TX3GSUB)
+            subtitle->source == TX3GSUB ||
+            subtitle->source == SSASUB)
         {
             /*
              * Rewrite timestamps on subtitles that came from Closed Captions
diff --git a/libhb/work.c b/libhb/work.c
index d6e60ea3a..c1891a683 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -320,7 +320,8 @@ void hb_display_job_info( hb_job_t * job )
                         subtitle->source == VOBSUB ? "VOBSUB" : 
                         subtitle->source == CC608SUB || subtitle->source == CC708SUB ? "CC" : 
                         subtitle->source == UTF8SUB ? "UTF-8" : 
-                        subtitle->source == TX3GSUB ? "TX3G" : "Unknown",
+                        subtitle->source == TX3GSUB ? "TX3G" : 
+                        subtitle->source == SSASUB ? "SSA" : "Unknown",
                         subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through",
                         subtitle->config.force ? ", Forced Only" : "",
                         subtitle->config.default_track ? ", Default" : "" );
@@ -797,14 +798,19 @@ static void do_job( hb_job_t * job, int cpu_count )
             
             if( !job->indepth_scan && subtitle->source == TX3GSUB )
             {
-                // TODO(davidfstr): For MP4 containers, an alternate work-object
-                //                  should be used that just passes the packets through,
-                //                  instead of downconverting to UTF-8 subtitles.
                 w = hb_get_work( WORK_DECTX3GSUB );
                 w->fifo_in  = subtitle->fifo_in;
                 w->fifo_out = subtitle->fifo_raw;
                 hb_list_add( job->list_work, w );
             }
+            
+            if( !job->indepth_scan && subtitle->source == SSASUB )
+            {
+                w = hb_get_work( WORK_DECSSASUB );
+                w->fifo_in  = subtitle->fifo_in;
+                w->fifo_out = subtitle->fifo_raw;
+                hb_list_add( job->list_work, w );
+            }
 
             if( !job->indepth_scan && 
                 subtitle->format == PICTURESUB