#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_osd.h>
#include <vlc_bits.h>
/*****************************************************************************
if( p_sys == NULL )
return VLC_ENOMEM;
- p_sys->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" );
+ p_sys->i_debug = var_InheritInteger( p_this, MODULE_STRING "-debug" );
- p_sys->i_image = -1;
+ p_sys->i_image = -1;
p_sys->i_state = SUBTITLE_BLOCK_EMPTY;
p_sys->p_spu = NULL;
int i;
/* 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->i_start = p_data->i_pts;
Two candidates are the video and the other possibility would be
the access module.
*/
- fmt.i_aspect = VOUT_ASPECT_FACTOR;
+ fmt.i_sar_num = p_sys->i_height;
+ fmt.i_sar_den = p_sys->i_width;
fmt.i_width = fmt.i_visible_width = p_sys->i_width;
fmt.i_height = fmt.i_visible_height = p_sys->i_height;
int i_field; /* The subtitles are interlaced */
int i_row, i_column; /* scanline row/column number */
uint8_t i_color, i_count;
- bsw_t bs;
+ bs_t bs;
- bsw_init_writable( &bs, p_data->p_buffer + p_sys->i_image_offset,
+ bs_init( &bs, p_data->p_buffer + p_sys->i_image_offset,
p_data->i_buffer - p_sys->i_image_offset );
for( i_field = 0; i_field < 2; i_field++ )
{
for( i_column = 0; i_column < p_sys->i_width; i_column++ )
{
- i_color = bsw_read( &bs, 2 );
- if( i_color == 0 && (i_count = bsw_read( &bs, 2 )) )
+ i_color = bs_read( &bs, 2 );
+ if( i_color == 0 && (i_count = bs_read( &bs, 2 )) )
{
i_count = __MIN( i_count, p_sys->i_width - i_column );
memset( &p_dest[i_row * p_region->p_picture->Y_PITCH +
p_dest[i_row * p_region->p_picture->Y_PITCH + i_column] = i_color;
}
- bsw_align( &bs );
+ bs_align( &bs );
}
/* odd field */
- bsw_init_writable( &bs, p_data->p_buffer + p_sys->i_image_offset +
+ bs_init( &bs, p_data->p_buffer + p_sys->i_image_offset +
p_sys->second_field_offset,
p_data->i_buffer - p_sys->i_image_offset -
p_sys->second_field_offset );