* DVB subtitles encoder (developed for Anevia, www.anevia.com)
*****************************************************************************
* Copyright (C) 2003 ANEVIA
- * Copyright (C) 2003-2009 the VideoLAN team
+ * Copyright (C) 2003-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Derk-Jan Hartman <hartman #at# videolan dot org>
* Simon Hailes <simon _a_ screen.subtitling.com>
*
- * 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* character table identified in the subtitle descriptor.
*
* The spec is quite vague in this area, but what is meant is perhaps that it
- * refers to the character index in the codepage belonging to the language specified
- * in the subtitle descriptor. Potentially it's designed for widechar
+ * refers to the character index in the codepage belonging to the language
+ * specified in the subtitle descriptor. Potentially it's designed for widechar
* (but not for UTF-*) codepages.
*****************************************************************************
*
*****************************************************************************
* Notes on DDS (Display Definition Segment)
- * DDS (Display Definition Segment) tells the decoder how the subtitle image relates to
- * the video image.
- * For SD, the subtitle image is always considered to be for display at 720x576
- * (although it's assumed that for NTSC, this is 720x480, this is not documented well)
- * Also, for SD, the subtitle image is drawn 'on the glass' (i.e. after video scaling,
- + * letterbox, etc.)
- * For 'HD' (subs marked type 0x14/0x24 in PSI), a DDS must be present, and the subs area
- * is drawn onto the video area (scales if necessary). The DDS tells the decoder what
- * resolution the subtitle images were intended for, and hence how to scale the subtitle
- * images for a particular video size
- * i.e. if HD video is presented as letterbox, the subs will
- * be in the same place on the video as if the video was presented on an HD set
- * indeed, if the HD video was pillarboxed by the decoder, the subs may be cut off as
- * well as the video. The intent here is that the subs can be placed accurately on the video
- * - somthing which was missed in the original spec.
+ * -----------------------------------------
+ * DDS (Display Definition Segment) tells the decoder how the subtitle image
+ * relates to the video image.
+ * For SD, the subtitle image is always considered to be for display at
+ * 720x576 (although it's assumed that for NTSC, this is 720x480, this
+ * is not documented well) Also, for SD, the subtitle image is drawn 'on
+ * the glass' (i.e. after video scaling, letterbox, etc.)
+ * For 'HD' (subs marked type 0x14/0x24 in PSI), a DDS must be present,
+ * and the subs area is drawn onto the video area (scales if necessary).
+ * The DDS tells the decoder what resolution the subtitle images were
+ * intended for, and hence how to scale the subtitle images for a
+ * particular video size
+ * i.e. if HD video is presented as letterbox, the subs will be in the
+ * same place on the video as if the video was presented on an HD set
+ * indeed, if the HD video was pillarboxed by the decoder, the subs may
+ * be cut off as well as the video. The intent here is that the subs can
+ * be placed accurately on the video - something which was missed in the
+ * original spec.
*
* A DDS may also specify a window - this is where the subs images are moved so that the (0,0)
* origin of decode is offset.
static void Close( vlc_object_t * );
static subpicture_t *Decode( decoder_t *, block_t ** );
+#ifdef ENABLE_SOUT
static int OpenEncoder ( vlc_object_t * );
static void CloseEncoder( vlc_object_t * );
static block_t *Encode ( encoder_t *, subpicture_t * );
+#endif
vlc_module_begin ()
# define DVBSUB_CFG_PREFIX "dvbsub-"
set_description( N_("DVB subtitles decoder") )
set_shortname( N_("DVB subtitles") )
- set_capability( "decoder", 50 )
+ set_capability( "decoder", 80 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_SCODEC )
set_callbacks( Open, Close )
- add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, true )
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
- add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false )
- add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false )
+ add_integer( DVBSUB_CFG_PREFIX "position", 8, POS_TEXT, POS_LONGTEXT, true )
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions )
+ add_integer( DVBSUB_CFG_PREFIX "x", -1, POSX_TEXT, POSX_LONGTEXT, false )
+ add_integer( DVBSUB_CFG_PREFIX "y", -1, POSY_TEXT, POSY_LONGTEXT, false )
+#ifdef ENABLE_SOUT
# define ENC_CFG_PREFIX "sout-dvbsub-"
add_submodule ()
set_description( N_("DVB subtitles encoder") )
set_capability( "encoder", 100 )
set_callbacks( OpenEncoder, CloseEncoder )
- add_integer( ENC_CFG_PREFIX "x", -1, NULL, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, false )
- add_integer( ENC_CFG_PREFIX "y", -1, NULL, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, false )
- add_obsolete_integer( ENC_CFG_PREFIX "timeout" ) /* Suppressed since 0.8.5 */
+ add_integer( ENC_CFG_PREFIX "x", -1, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, false )
+ add_integer( ENC_CFG_PREFIX "y", -1, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, false )
+#endif
vlc_module_end ()
static const char *const ppsz_enc_options[] = { "x", "y", NULL };
{
decoder_t *p_dec = (decoder_t *) p_this;
decoder_sys_t *p_sys;
- vlc_value_t val;
int i_posx, i_posy;
if( p_dec->fmt_in.i_codec != VLC_CODEC_DVBS )
}
p_dec->pf_decode_sub = Decode;
- p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
+ p_sys = p_dec->p_sys = calloc( 1, sizeof(decoder_sys_t) );
if( !p_sys )
return VLC_ENOMEM;
- memset( p_sys, 0, sizeof(decoder_sys_t) );
- p_sys->i_pts = (mtime_t) 0;
+ p_sys->i_pts = VLC_TS_INVALID;
p_sys->i_id = p_dec->fmt_in.subs.dvb.i_id & 0xFFFF;
p_sys->i_ancillary_id = p_dec->fmt_in.subs.dvb.i_id >> 16;
/* configure for SD res in case DDS is not present */
default_dds_init( p_dec );
- var_Create( p_this, DVBSUB_CFG_PREFIX "position",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, DVBSUB_CFG_PREFIX "position", &val );
- p_sys->i_spu_position = val.i_int;
- var_Create( p_this, DVBSUB_CFG_PREFIX "x",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, DVBSUB_CFG_PREFIX "x", &val );
- i_posx = val.i_int;
- var_Create( p_this, DVBSUB_CFG_PREFIX "y",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, DVBSUB_CFG_PREFIX "y", &val );
- i_posy = val.i_int;
+ p_sys->i_spu_position = var_CreateGetInteger( p_this,
+ DVBSUB_CFG_PREFIX "position" );
+ i_posx = var_CreateGetInteger( p_this, DVBSUB_CFG_PREFIX "x" );
+ i_posy = var_CreateGetInteger( p_this, DVBSUB_CFG_PREFIX "y" );
/* Check if subpicture position was overridden */
p_sys->b_absolute = true;
default_dds_init( p_dec );
p_sys->i_pts = p_block->i_pts;
- if( p_sys->i_pts <= 0 )
+ if( p_sys->i_pts <= VLC_TS_INVALID )
{
#ifdef DEBUG_DVBSUB
/* Some DVB channels send stuffing segments in non-dated packets so
decode_segment( p_dec, &p_sys->bs );
}
- if( bs_read( &p_sys->bs, 8 ) != 0xff ) /* End marker */
+ if( ( bs_read( &p_sys->bs, 8 ) & 0x3f ) != 0x3f ) /* End marker */
{
msg_Warn( p_dec, "end marker not found (corrupted subtitle ?)" );
block_Release( p_block );
if( p_sys->p_page->i_region_defs == 0 ) return;
p_sys->p_page->p_region_defs =
- malloc( p_sys->p_page->i_region_defs * sizeof(dvbsub_region_t) );
+ malloc( p_sys->p_page->i_region_defs * sizeof(dvbsub_regiondef_t) );
if( p_sys->p_page->p_region_defs )
{
for( i = 0; i < p_sys->p_page->i_region_defs; i++ )
#ifdef DEBUG_DVBSUB
msg_Dbg( p_dec, "new region: %i", i_id );
#endif
- p_region = *pp_region = malloc( sizeof(dvbsub_region_t) );
+ p_region = *pp_region = calloc( 1, sizeof(dvbsub_region_t) );
if( !p_region )
return;
- memset( p_region, 0, sizeof(dvbsub_region_t) );
p_region->p_object_defs = NULL;
p_region->p_pixbuf = NULL;
p_region->p_next = NULL;
free( p_region->p_pixbuf );
}
- p_region->p_pixbuf = malloc( i_height * i_width );
+ p_region->p_pixbuf = xmalloc( i_height * i_width );
p_region->i_depth = 0;
b_fill = true;
}
/* We create a new object */
p_region->i_object_defs++;
- p_region->p_object_defs =
- realloc( p_region->p_object_defs,
+ p_region->p_object_defs = xrealloc( p_region->p_object_defs,
sizeof(dvbsub_objectdef_t) * p_region->i_object_defs );
/* We parse object properties */
{
decoder_sys_t *p_sys = p_dec->p_sys;
dvbsub_region_t *p_region;
- int i_segment_length, i_coding_method, i_version, i_id, i;
- bool b_non_modify_color;
+ int i_segment_length, i_coding_method, i_id, i;
/* ETSI 300-743 paragraph 7.2.4
* sync_byte, segment_type and page_id have already been processed.
*/
i_segment_length = bs_read( s, 16 );
i_id = bs_read( s, 16 );
- i_version = bs_read( s, 4 );
+ bs_skip( s, 4 ); /* version */
i_coding_method = bs_read( s, 2 );
if( i_coding_method > 1 )
msg_Dbg( p_dec, "new object: %i", i_id );
#endif
- b_non_modify_color = bs_read( s, 1 );
+ bs_skip( s, 1 ); /* non_modify_color */
bs_skip( s, 1 ); /* Reserved */
if( i_coding_method == 0x00 )
if( p_region->p_object_defs[i].i_id != i_id ) continue;
p_region->p_object_defs[i].psz_text =
- realloc( p_region->p_object_defs[i].psz_text,
+ xrealloc( p_region->p_object_defs[i].psz_text,
i_number_of_codes + 1 );
/* FIXME 16bits -> char ??? See Preamble */
decoder_sys_t *p_sys = p_dec->p_sys;
subpicture_t *p_spu;
subpicture_region_t **pp_spu_region;
- int i, j, i_timeout = 0;
+ int i, j;
int i_base_x;
int i_base_y;
/* Allocate the subpicture internal data. */
- p_spu = decoder_NewSubpicture( p_dec );
+ p_spu = decoder_NewSubpicture( p_dec, NULL );
if( !p_spu )
return NULL;
p_spu->b_absolute = p_sys->b_absolute;
/* Set the pf_render callback */
- p_spu->i_start = (mtime_t) p_sys->i_pts;
+ p_spu->i_start = p_sys->i_pts;
//p_spu->i_stop = (mtime_t) 0;
p_spu->b_ephemer = true;
//p_spu->b_fade = true;
//p_spu->i_stop = p_spu->i_start + (mtime_t) (i_timeout * 1000000);
+ p_spu->b_subtitle = true;
/* Correct positioning of SPU */
i_base_x = p_sys->i_spu_x;
video_palette_t palette;
int i_pitch;
- i_timeout = p_sys->p_page->i_timeout;
-
p_regiondef = &p_sys->p_page->p_region_defs[i];
/* Find associated region */
/* Create new SPU region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_YUVP;
- fmt.i_aspect = 0; /* 0 means use aspect ratio of background video */
+ fmt.i_sar_num = 0; /* 0 means use aspect ratio of background video */
+ fmt.i_sar_den = 1;
fmt.i_width = fmt.i_visible_width = p_region->i_width;
fmt.i_height = fmt.i_visible_height = p_region->i_height;
fmt.i_x_offset = fmt.i_y_offset = 0;
/* Create new SPU region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_TEXT;
- fmt.i_aspect = VOUT_ASPECT_FACTOR;
+ fmt.i_sar_num = 1;
+ fmt.i_sar_den = 1;
fmt.i_width = fmt.i_visible_width = p_region->i_width;
fmt.i_height = fmt.i_visible_height = p_region->i_height;
fmt.i_x_offset = fmt.i_y_offset = 0;
p_spu_region = subpicture_region_New( &fmt );
- if( !p_region )
- {
- msg_Err( p_dec, "cannot allocate SPU region" );
- continue;
- }
p_spu_region->psz_text = strdup( p_object_def->psz_text );
p_spu_region->i_x = i_base_x + p_regiondef->i_x + p_object_def->i_x;
int i_offset_y;
};
+#ifdef ENABLE_SOUT
static void encode_page_composition( encoder_t *, bs_t *, subpicture_t * );
static void encode_clut( encoder_t *, bs_t *, subpicture_t * );
static void encode_region_composition( encoder_t *, bs_t *, subpicture_t * );
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
- vlc_value_t val;
if( ( p_enc->fmt_out.i_codec != VLC_CODEC_DVBS ) &&
!p_enc->b_force )
p_sys->i_regions = 0;
p_sys->p_regions = 0;
- var_Create( p_this, ENC_CFG_PREFIX "x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, ENC_CFG_PREFIX "x", &val );
- p_sys->i_offset_x = val.i_int;
- var_Create( p_this, ENC_CFG_PREFIX "y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, ENC_CFG_PREFIX "y", &val );
- p_sys->i_offset_y = val.i_int;
+ p_sys->i_offset_x = var_CreateGetInteger( p_this, ENC_CFG_PREFIX "x" );
+ p_sys->i_offset_y = var_CreateGetInteger( p_this, ENC_CFG_PREFIX "y" );
return VLC_SUCCESS;
}
#endif
#ifndef RANDOM_DITHERING
- pi_delta = malloc( ( p_region->p_picture->p[0].i_pitch + 1 )
+ pi_delta = xmalloc( ( p_region->p_picture->p[0].i_pitch + 1 )
* sizeof(int) * 4 );
for( i = 0; i < (p_region->p_picture->p[0].i_pitch + 1) * 4 ; i++ )
{
char psz_fourcc[5];
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
vlc_fourcc_to_char( p_region->fmt.i_chroma, &psz_fourcc );
- msg_Err( p_enc, "chroma %4s not supported", psz_fourcc );
+ msg_Err( p_enc, "chroma %4.4s not supported", psz_fourcc );
return NULL;
}
#ifdef DEBUG_DVBSUB
msg_Dbg( p_enc, "encoding subpicture" );
#endif
- p_block = block_New( p_enc, 64000 );
+ p_block = block_Alloc( 64000 );
bs_init( s, p_block->p_buffer, p_block->i_buffer );
bs_write( s, 8, 0x20 ); /* Data identifier */
p_block->i_length = p_subpic->i_stop - p_subpic->i_start;
/* Send another (empty) subtitle to signal the end of display */
- p_block_stop = block_New( p_enc, 64000 );
+ p_block_stop = block_Alloc( 64000 );
bs_init( s, p_block_stop->p_buffer, p_block_stop->i_buffer );
bs_write( s, 8, 0x20 ); /* Data identifier */
bs_write( s, 8, 0x0 ); /* Subtitle stream id */
{
encoder_region_t region;
region.i_width = region.i_height = 0;
- p_sys->p_regions =
- realloc( p_sys->p_regions, sizeof(encoder_region_t) *
- (p_sys->i_regions + 1) );
+ p_sys->p_regions = xrealloc( p_sys->p_regions,
+ sizeof(encoder_region_t) * (p_sys->i_regions + 1) );
p_sys->p_regions[p_sys->i_regions++] = region;
}
bs_align_0( s );
}
+#endif
static void default_dds_init( decoder_t * p_dec )
{
projects / vlc / blobdiff