]> git.sesse.net Git - vlc/commitdiff
Added a csri based renderer/decoder for ass/ssa subtitles. Can use
authorSigmund Augdal Helberg <sigmunau@videolan.org>
Fri, 25 Jan 2008 21:31:18 +0000 (21:31 +0000)
committerSigmund Augdal Helberg <sigmunau@videolan.org>
Fri, 25 Jan 2008 21:31:18 +0000 (21:31 +0000)
libass and asa as rendering backends. By equinox. Part of Google
Summer of Code

modules/codec/Modules.am
modules/codec/csri.c [new file with mode: 0644]

index 1b153f1b8fad1051564ee6616b7e56c86a8993cc..0ff33a05ddbb3453e071d56d720003a49f35f00b 100644 (file)
@@ -29,6 +29,7 @@ SOURCES_fake = fake.c
 SOURCES_realaudio = realaudio.c
 SOURCES_sdl_image = sdl_image.c
 SOURCES_zvbi = zvbi.c
+SOURCES_csri = csri.c
 SOURCES_cdg = cdg.c
 SOURCES_fluidsynth = fluidsynth.c
 SOURCES_cc = cc.c cc.h
diff --git a/modules/codec/csri.c b/modules/codec/csri.c
new file mode 100644 (file)
index 0000000..c4b17b4
--- /dev/null
@@ -0,0 +1,295 @@
+/*****************************************************************************
+ * csri.c : Load CSRI subtitle renderer
+ *****************************************************************************
+ * Copyright (C) 2007 the VideoLAN team
+ * $Id$
+ *
+ * Authors: David Lamparter <equinox@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_LINUX_LIMITS_H
+#   include <linux/limits.h>
+#endif
+
+#include "config.h"
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
+#include <vlc_stream.h>
+#include <vlc_xml.h>
+
+#include <math.h>
+
+#ifdef HAVE_ERRNO_H
+#   include <errno.h>
+#endif
+
+#include <csri/csri.h>
+#include <csri/stream.h>
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int  Create ( vlc_object_t * );
+static void Destroy( vlc_object_t * );
+
+static subpicture_t *DecodeBlock( decoder_t *, block_t ** );
+static void DestroySubpicture( subpicture_t * );
+static void PreRender( video_format_t *, spu_t *, subpicture_t *, mtime_t );
+static subpicture_region_t *UpdateRegions( video_format_t *, spu_t *,
+                                           subpicture_t *, mtime_t );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+
+vlc_module_begin();
+    set_shortname( _("Subtitles (advanced)"));
+    set_description( _("Wrapper for subtitle renderers using CSRI/asa") );
+    set_capability( "decoder", 60 );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_SCODEC );
+    set_callbacks( Create, Destroy );
+vlc_module_end();
+
+/*****************************************************************************
+ * decoder_sys_t: filter data
+ *****************************************************************************/
+struct decoder_sys_t
+{
+    subpicture_t *p_spu_final;
+    video_format_t fmt_cached;
+    csri_inst *p_instance;
+    void (*pf_push_packet)(csri_inst *inst, const void *packet,
+                           size_t packetlen, double pts_start,
+                           double pts_end);
+};
+
+struct subpicture_sys_t
+{
+    decoder_t *p_dec;
+    void *p_subs_data;
+    int i_subs_len;
+};
+
+/*****************************************************************************
+ * Create: Open CSRI renderer
+ *****************************************************************************
+ * Comment me.
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+    decoder_t *p_dec = (decoder_t *)p_this;
+    decoder_sys_t *p_sys;
+    csri_rend *p_render;
+    struct csri_stream_ext *p_streamext;
+
+    if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') )
+    {
+        return VLC_EGENERIC;
+    }
+
+    p_render = csri_renderer_default();
+    if (!p_render)
+    {
+        msg_Err( p_dec, "can't load csri renderer" );
+        return VLC_EGENERIC;
+    }
+    p_streamext = csri_query_ext(p_render, CSRI_EXT_STREAM_ASS);
+    if (!p_streamext)
+    {
+        msg_Err( p_dec, "csri renderer does not support ASS streaming" );
+        return VLC_EGENERIC;
+    }
+
+    p_dec->pf_decode_sub = DecodeBlock;
+
+    p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
+    if( !p_sys )
+    {
+        msg_Err( p_dec, "out of memory" );
+        return VLC_ENOMEM;
+    }
+    memset( &p_dec->p_sys->fmt_cached, 0, sizeof( p_dec->p_sys->fmt_cached ) );
+
+    p_sys->pf_push_packet = p_streamext->push_packet;
+    p_sys->p_instance = p_streamext->init_stream(p_render,
+                                                 p_dec->fmt_in.p_extra,
+                                                 p_dec->fmt_in.i_extra - 1,
+                                                 NULL);
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Destroy: finish
+ *****************************************************************************
+ * Comment me.
+ *****************************************************************************/
+static void Destroy( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    free( p_sys );
+}
+
+/****************************************************************************
+ * DecodeBlock: the whole thing
+ ****************************************************************************
+ * This function must be fed with complete subtitles units.
+ ****************************************************************************/
+static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+{
+    subpicture_t *p_spu = NULL;
+    block_t *p_block;
+
+    msg_Dbg( p_dec, "DecodeBlock %p", (void *)pp_block);
+    if( !pp_block || *pp_block == NULL ) return NULL;
+    p_block = *pp_block;
+    if( p_block->i_buffer == 0 || p_block->p_buffer[0] == '\0' ) return NULL;
+
+    p_spu = p_dec->pf_spu_buffer_new( p_dec );
+    if( !p_spu )
+    {
+        msg_Warn( p_dec, "can't get spu buffer" );
+        block_Release( *pp_block );
+        *pp_block = NULL;
+        return NULL;
+    }
+
+    p_spu->p_sys = malloc( sizeof( subpicture_sys_t ));
+    if( !p_spu->p_sys )
+    {
+        msg_Err( p_dec, "out of memory" );
+        p_dec->pf_spu_buffer_del( p_dec, p_spu );
+        block_Release( *pp_block );
+        *pp_block = NULL;
+        return NULL;
+    }
+    p_spu->p_sys->p_dec = p_dec;
+
+    p_spu->p_sys->i_subs_len = p_block->i_buffer;
+    p_spu->p_sys->p_subs_data = malloc( p_block->i_buffer );
+    if( !p_spu->p_sys->p_subs_data )
+    {
+        msg_Err( p_dec, "out of memory" );
+        free( p_spu->p_sys );
+        p_dec->pf_spu_buffer_del( p_dec, p_spu );
+        block_Release( *pp_block );
+        *pp_block = NULL;
+        return NULL;
+    }
+    memcpy( p_spu->p_sys->p_subs_data, p_block->p_buffer,
+            p_block->i_buffer );
+
+    p_spu->i_x = 0;
+    p_spu->i_y = 0;
+    p_spu->i_start = p_block->i_pts;
+    p_spu->i_stop = p_block->i_pts + p_block->i_length;
+    p_spu->b_ephemer = VLC_FALSE;
+    p_spu->b_absolute = VLC_FALSE;
+    p_spu->b_pausable = VLC_TRUE;
+
+    msg_Dbg( p_dec, "BS %lf..%lf", p_spu->i_start * 0.000001, p_spu->i_stop * 0.000001);
+    p_dec->p_sys->pf_push_packet(p_dec->p_sys->p_instance,
+                                 p_spu->p_sys->p_subs_data, p_block->i_buffer,
+                                 p_spu->i_start * 0.000001,
+                                 p_spu->i_stop * 0.000001);
+
+    p_spu->pf_pre_render = PreRender;
+    p_spu->pf_update_regions = UpdateRegions;
+    p_spu->pf_destroy = DestroySubpicture;
+
+    block_Release( *pp_block );
+    *pp_block = NULL;
+
+    return p_spu;
+}
+
+static void DestroySubpicture( subpicture_t *p_subpic )
+{
+    msg_Dbg( p_subpic->p_sys->p_dec, "drop spu %p", (void *)p_subpic );
+    free( p_subpic->p_sys->p_subs_data );
+    free( p_subpic->p_sys );
+}
+
+static void PreRender( video_format_t *p_fmt, spu_t *p_spu,
+                       subpicture_t *p_subpic, mtime_t ts )
+{
+    decoder_t *p_dec = p_subpic->p_sys->p_dec;
+    p_dec->p_sys->p_spu_final = p_subpic;
+}
+
+static subpicture_region_t *UpdateRegions( video_format_t *p_fmt, spu_t *p_spu,
+                                           subpicture_t *p_subpic, mtime_t ts )
+{
+    decoder_t *p_dec = p_subpic->p_sys->p_dec;
+    subpicture_region_t *p_spu_region;
+    video_format_t fmt;
+    struct csri_frame csri_frame;
+
+    if (p_subpic != p_dec->p_sys->p_spu_final)
+    {
+        return NULL;
+    }
+
+    memcpy( &fmt, p_fmt, sizeof( fmt ) );
+    fmt.i_chroma = VLC_FOURCC('R','G','B','A');
+    fmt.i_width = fmt.i_visible_width;
+    fmt.i_height = fmt.i_visible_height;
+    fmt.i_bits_per_pixel = 0;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+
+    if (memcmp(&fmt, &p_dec->p_sys->fmt_cached, sizeof(fmt)))
+    {
+        struct csri_fmt csri_fmt;
+        memset(&csri_fmt, 0, sizeof(csri_fmt));
+        csri_fmt.pixfmt = CSRI_F_RGBA;
+        csri_fmt.width = fmt.i_width;
+        csri_fmt.height = fmt.i_height;
+        if( csri_request_fmt(p_dec->p_sys->p_instance, &csri_fmt) )
+            msg_Dbg( p_dec, "csri error: format not supported" );
+
+        memcpy(&p_dec->p_sys->fmt_cached, &fmt, sizeof(fmt));
+    }
+
+    p_spu_region = p_subpic->pf_create_region( VLC_OBJECT(p_dec), &fmt );
+    p_spu_region->i_align = SUBPICTURE_ALIGN_TOP;
+
+    csri_frame.pixfmt = CSRI_F_RGBA;
+    csri_frame.planes[0] = (unsigned char*)p_spu_region->picture.Y_PIXELS;
+    csri_frame.strides[0] = p_spu_region->picture.Y_PITCH;
+
+    msg_Dbg( p_dec, "TS %lf", ts * 0.000001 );
+    csri_render( p_dec->p_sys->p_instance, &csri_frame, ts * 0.000001 );
+    memset(p_spu_region->picture.Y_PIXELS, 0xff, fmt.i_width);
+    memset(p_spu_region->picture.Y_PIXELS + p_spu_region->picture.Y_PITCH
+                    * (fmt.i_height - 1), 0x88, fmt.i_width);
+
+    p_subpic->p_region = p_spu_region;
+    return p_spu_region;
+}
+