Skip to content

V
vlc
Commit bcae143e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Delete CSRI module. Unmaintained and libass is better.

parent 7dfa2737
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 332 deletions
NEWS
View file @ bcae143e
......@@ -27,6 +27,9 @@ Video Output:
Visualisation:
* Support of .milk visualisation files using projectM libraries
Removed modules:
* csri
Changes between 0.9.9a and 1.0.0:
---------------------------------
......
configure.ac
View file @ bcae143e
......@@ -3674,23 +3674,6 @@ AS_IF( [test "${enable_telx}" != "no" ],[
VLC_ADD_PLUGIN([telx])
])
dnl
dnl asa/csri subtitle rendering module
dnl
AC_ARG_ENABLE(csri,
[ --enable-csri Subtitle support using CSRI / asa (default disabled)])
AS_IF( [test "${enable_csri}" = "yes"], [
PKG_CHECK_MODULES(CSRI,
csri >= 0.1.0,
[
VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS])
VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS])
VLC_ADD_PLUGIN([csri])
],[
AC_MSG_WARN([CSRI helper library not found])
])
])
dnl
dnl libass subtitle rendering module
dnl
......
modules/LIST
View file @ bcae143e
......@@ -74,7 +74,6 @@ $Id$
* converter_float: Floating-point audio format conversions
* crop: Crop video filter
* croppadd: Crop/Padd image filter
* csri: common subtitle interface decoder
* cvdsub: CVD subtitles decoder
* dbus: D-Bus control interface
* dc1394: firewire input module
......
modules/codec/Modules.am
View file @ bcae143e
......@@ -30,7 +30,6 @@ SOURCES_realaudio = realaudio.c
SOURCES_realvideo = realvideo.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
......
modules/codec/csri.c deleted 100644 → 0
View file @ 7dfa2737
/*****************************************************************************
* 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
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <string.h>
#include <math.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_osd.h>
#include <vlc_input.h>
#include <csri/csri.h>
#include <csri/stream.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
vlc_module_begin ()
set_shortname( N_("Subtitles (advanced)"))
set_description( N_("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 ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static subpicture_t *DecodeBlock( decoder_t *, block_t ** );
static void DestroySubpicture( subpicture_t * );
static void UpdateRegions( spu_t *, subpicture_t *,
const video_format_t *, mtime_t );
/*****************************************************************************
* decoder_sys_t: decoder data
*****************************************************************************/
struct decoder_sys_t
{
video_format_t fmt_cached;
csri_inst *p_instance;
struct csri_stream_ext *p_stream_ext;
void (*pf_push_packet)(csri_inst *inst, const void *packet,
size_t packetlen, double pts_start,
double pts_end);
mtime_t i_max_stop;
};
struct subpicture_sys_t
{
decoder_t *p_dec;
void *p_subs_data;
int i_subs_len;
mtime_t i_pts;
};
/*****************************************************************************
* 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_stream_ext;
if( p_dec->fmt_in.i_codec != VLC_CODEC_SSA )
return VLC_EGENERIC;
p_render = csri_renderer_default();
if (!p_render)
{
msg_Err( p_dec, "can't load csri renderer" );
return VLC_EGENERIC;
}
p_stream_ext = csri_query_ext(p_render, CSRI_EXT_STREAM_ASS);
if (!p_stream_ext)
{
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 = calloc( 1, sizeof( decoder_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
p_sys->p_stream_ext = p_stream_ext;
p_sys->pf_push_packet = p_stream_ext->push_packet;
p_sys->p_instance = p_stream_ext->init_stream( p_render,
p_dec->fmt_in.p_extra,
p_dec->fmt_in.p_extra ? strnlen( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra ) : 0,
NULL);
p_sys->i_max_stop = VLC_TS_INVALID;
p_dec->fmt_out.i_cat = SPU_ES;
p_dec->fmt_out.i_codec = VLC_CODEC_RGBA;
return VLC_SUCCESS;
}
/*****************************************************************************
* Destroy: finish
*****************************************************************************
* Comment me.
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
if( p_sys->p_stream_ext->discard )
p_sys->p_stream_ext->discard( p_sys->p_instance, true );
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 )
{
decoder_sys_t *p_sys = p_dec->p_sys;
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_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
p_sys->i_max_stop = VLC_TS_INVALID;
block_Release( p_block );
return NULL;
}
*pp_block = NULL;
if( p_block->i_buffer == 0 || p_block->p_buffer[0] == '\0' )
{
block_Release( p_block );
return NULL;
}
p_spu = decoder_NewSubpicture( p_dec );
if( !p_spu )
{
msg_Warn( p_dec, "can't get spu buffer" );
block_Release( p_block );
return NULL;
}
p_spu->p_sys = malloc( sizeof( subpicture_sys_t ));
if( !p_spu->p_sys )
{
decoder_DeleteSubpicture( p_dec, p_spu );
block_Release( p_block );
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 )
{
free( p_spu->p_sys );
decoder_DeleteSubpicture( p_dec, p_spu );
block_Release( p_block );
return NULL;
}
memcpy( p_spu->p_sys->p_subs_data, p_block->p_buffer,
p_block->i_buffer );
p_spu->p_sys->i_pts = p_block->i_pts;
p_spu->i_start = p_block->i_pts;
p_spu->i_stop = __MAX( p_sys->i_max_stop, p_block->i_pts + p_block->i_length );
p_spu->b_ephemer = true;
p_spu->b_absolute = true;
p_sys->i_max_stop = p_spu->i_stop;
//msg_Dbg( p_dec, "BS %lf..%lf", p_spu->i_start * 0.000001, p_spu->i_stop * 0.000001);
p_sys->pf_push_packet( p_sys->p_instance,
p_spu->p_sys->p_subs_data, p_spu->p_sys->i_subs_len,
p_block->i_pts * 0.000001,
(p_block->i_pts + p_block->i_length) * 0.000001);
p_spu->pf_update_regions = UpdateRegions;
p_spu->pf_destroy = DestroySubpicture;
block_Release( p_block );
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 UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic,
const video_format_t *p_fmt, mtime_t i_ts )
{
decoder_t *p_dec = p_subpic->p_sys->p_dec;
decoder_sys_t *p_sys = p_dec->p_sys;
subpicture_region_t *p_spu_region;
video_format_t fmt;
/* TODO maybe checking if we really need redrawing */
subpicture_region_ChainDelete( p_subpic->p_region );
p_subpic->p_region = NULL;
#if 0
msg_Warn( p_dec, "---- fmt: %dx%d %dx%d chroma=%4.4s",
p_fmt->i_width, p_fmt->i_height,
p_fmt->i_visible_width, p_fmt->i_visible_height,
(const char*)&p_fmt->i_chroma );
#endif
/* XXX On x86 at least our RGBA is mapped to their BGRA
* TODO confirm that is the same on big endian cpu */
fmt = *p_fmt;
fmt.i_chroma = VLC_CODEC_RGBA;
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;
fmt.i_sar_num = 1;
fmt.i_sar_den = 1;
if( memcmp(&fmt, &p_sys->fmt_cached, sizeof(fmt)) )
{
//msg_Warn( p_dec, "---- fmt: new %dx%d", fmt.i_width, fmt.i_height );
struct csri_fmt csri_fmt;
memset(&csri_fmt, 0, sizeof(csri_fmt));
csri_fmt.pixfmt = CSRI_F_BGRA;
csri_fmt.width = fmt.i_width;
csri_fmt.height = fmt.i_height;
if( csri_request_fmt( p_sys->p_instance, &csri_fmt ) )
msg_Dbg( p_dec, "csri error: format not supported" );
p_sys->fmt_cached = fmt;
}
p_subpic->i_original_picture_height = fmt.i_height;
p_subpic->i_original_picture_width = fmt.i_width;
p_spu_region = p_subpic->p_region = subpicture_region_New( &fmt );
if( p_spu_region )
{
struct csri_frame csri_frame;
/* */
p_spu_region->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;
memset( p_spu_region->p_picture->Y_PIXELS, 0x00, p_spu_region->p_picture->Y_PITCH * p_sys->fmt_cached.i_height );
/* */
const mtime_t i_stream_date = p_subpic->p_sys->i_pts + (i_ts - p_subpic->i_start);
//msg_Dbg( p_dec, "TS %lf", ts * 0.000001 );
memset( &csri_frame, 0, sizeof(csri_frame) );
csri_frame.pixfmt = CSRI_F_BGRA;
csri_frame.planes[0] = (unsigned char*)p_spu_region->p_picture->Y_PIXELS;
csri_frame.strides[0] = p_spu_region->p_picture->Y_PITCH;
csri_render( p_sys->p_instance, &csri_frame, i_stream_date * 0.000001 );
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment