#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
#include <vlc_codec.h>
#include <vlc_sout.h>
-#include "vlc_bits.h"
+#include <vlc_bits.h>
/* #define DEBUG_DVBSUB 1 */
static void CloseEncoder( vlc_object_t * );
static block_t *Encode ( encoder_t *, subpicture_t * );
-vlc_module_begin();
+vlc_module_begin ()
# define DVBSUB_CFG_PREFIX "dvbsub-"
- set_description( N_("DVB subtitles decoder") );
- set_capability( "decoder", 50 );
- 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 );
+ set_description( N_("DVB subtitles decoder") )
+ set_shortname( N_("DVB subtitles") )
+ set_capability( "decoder", 50 )
+ 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 )
# define ENC_CFG_PREFIX "sout-dvbsub-"
- add_submodule();
- set_description( N_("DVB subtitles encoder") );
- set_capability( "encoder", 100 );
- set_callbacks( OpenEncoder, CloseEncoder );
+ 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 */
-vlc_module_end();
+ 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 */
+vlc_module_end ()
static const char *const ppsz_enc_options[] = { "x", "y", NULL };
vlc_value_t val;
int i_posx, i_posy;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('d','v','b','s') )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_DVBS )
{
return VLC_EGENERIC;
}
p_sys->i_spu_y = i_posy;
}
- es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 'd','v','b','s' ) );
+ p_dec->fmt_out.i_cat = SPU_ES;
+ p_dec->fmt_out.i_codec = 0;
default_clut_init( p_dec );
msg_Dbg( p_dec, "new region: %i", i_id );
#endif
p_region = *pp_region = malloc( sizeof(dvbsub_region_t) );
- if( p_region )
- {
- memset( p_region, 0, sizeof(dvbsub_region_t) );
- p_region->p_object_defs = NULL;
- p_region->p_pixbuf = NULL;
- p_region->p_next = NULL;
- }
+ 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;
}
/* Region attributes */
p_obj->i_x = bs_read( s, 12 );
bs_skip( s, 4 ); /* Reserved */
p_obj->i_y = bs_read( s, 12 );
- p_obj->psz_text = 0;
+ p_obj->psz_text = NULL;
i_processed_length += 6;
subpicture_t *p_spu;
subpicture_region_t **pp_spu_region;
int i, j, i_timeout = 0;
+ int i_base_x;
+ int i_base_y;
/* Allocate the subpicture internal data. */
- p_spu = p_dec->pf_spu_buffer_new( p_dec );
- if( !p_spu ) return NULL;
+ p_spu = decoder_NewSubpicture( p_dec );
+ 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_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);
+
+ /* Correct positioning of SPU */
+ i_base_x = p_sys->i_spu_x;
+ i_base_y = p_sys->i_spu_y;
+ p_spu->i_original_picture_width = 720;
+ p_spu->i_original_picture_height = 576;
+
+ if( p_sys->p_display )
+ {
+ p_spu->i_original_picture_width = p_sys->p_display->i_width;
+ p_spu->i_original_picture_height = p_sys->p_display->i_height;
+
+ if( p_sys->p_display->b_windowed )
+ {
+ /* TODO: check that this actually works */
+ p_spu->i_original_picture_width = p_sys->p_display->i_max_x - p_sys->p_display->i_x;
+ p_spu->i_original_picture_height = p_sys->p_display->i_max_y - p_sys->p_display->i_y;
+ i_base_x += p_sys->p_display->i_x;
+ i_base_y += p_sys->p_display->i_y;
+ }
+ }
pp_spu_region = &p_spu->p_region;
subpicture_region_t *p_spu_region;
uint8_t *p_src, *p_dst;
video_format_t fmt;
+ video_palette_t palette;
int i_pitch;
i_timeout = p_sys->p_page->i_timeout;
continue;
}
- /* FIXME: don't create a subpicture region with VLC_FOURCC YUVP
+ /* FIXME: don't create a subpicture region with VLC CODEC YUVP
* when it actually is a TEXT region */
/* Create new SPU region */
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('Y','U','V','P');
+ fmt.i_chroma = VLC_CODEC_YUVP;
fmt.i_aspect = 0; /* 0 means use aspect ratio of background video */
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 = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
- if( !p_spu_region )
- {
- msg_Err( p_dec, "cannot allocate SPU region" );
- continue;
- }
- p_spu_region->i_x = p_regiondef->i_x;
- p_spu_region->i_y = p_regiondef->i_y;
- p_spu_region->i_align = p_sys->i_spu_position;
- *pp_spu_region = p_spu_region;
- pp_spu_region = &p_spu_region->p_next;
-
- /* Build palette */
+ fmt.p_palette = &palette;
fmt.p_palette->i_entries = ( p_region->i_depth == 1 ) ? 4 :
( ( p_region->i_depth == 2 ) ? 16 : 256 );
p_color = ( p_region->i_depth == 1 ) ? p_clut->c_2b :
fmt.p_palette->palette[j][3] = 0xff - p_color[j].T;
}
+ p_spu_region = subpicture_region_New( &fmt );
+ if( !p_spu_region )
+ {
+ msg_Err( p_dec, "cannot allocate SPU region" );
+ continue;
+ }
+ p_spu_region->i_x = i_base_x + p_regiondef->i_x;
+ p_spu_region->i_y = i_base_y + p_regiondef->i_y;
+ p_spu_region->i_align = p_sys->i_spu_position;
+ *pp_spu_region = p_spu_region;
+ pp_spu_region = &p_spu_region->p_next;
+
p_src = p_region->p_pixbuf;
- p_dst = p_spu_region->picture.Y_PIXELS;
- i_pitch = p_spu_region->picture.Y_PITCH;
+ p_dst = p_spu_region->p_picture->Y_PIXELS;
+ i_pitch = p_spu_region->p_picture->Y_PITCH;
/* Copy pixel buffer */
for( j = 0; j < p_region->i_height; j++ )
/* Create new SPU region */
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('T','E','X','T');
+ fmt.i_chroma = VLC_CODEC_TEXT;
fmt.i_aspect = VOUT_ASPECT_FACTOR;
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 = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
+ p_spu_region = subpicture_region_New( &fmt );
if( !p_region )
{
msg_Err( p_dec, "cannot allocate SPU region" );
}
p_spu_region->psz_text = strdup( p_object_def->psz_text );
- p_spu_region->i_x = p_regiondef->i_x + p_object_def->i_x;
- p_spu_region->i_y = p_regiondef->i_y + p_object_def->i_y;
+ p_spu_region->i_x = i_base_x + p_regiondef->i_x + p_object_def->i_x;
+ p_spu_region->i_y = i_base_y + p_regiondef->i_y + p_object_def->i_y;
p_spu_region->i_align = p_sys->i_spu_position;
*pp_spu_region = p_spu_region;
pp_spu_region = &p_spu_region->p_next;
}
}
- /* Set the pf_render callback */
- p_spu->i_start = (mtime_t) 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);
-
- /* Correct positioning of SPU */
- p_spu->b_absolute = p_sys->b_absolute;
- p_spu->i_x = p_sys->i_spu_x;
- p_spu->i_y = p_sys->i_spu_y;
- p_spu->i_original_picture_width = 720;
- p_spu->i_original_picture_height = 576;
-
- if( p_sys->p_display )
- {
- p_spu->i_original_picture_width = p_sys->p_display->i_width;
- p_spu->i_original_picture_height = p_sys->p_display->i_height;
-
- if( p_sys->p_display->b_windowed )
- {
- /* TODO: check that this actually works */
- p_spu->i_original_picture_width = p_sys->p_display->i_max_x - p_sys->p_display->i_x;
- p_spu->i_original_picture_height = p_sys->p_display->i_max_y - p_sys->p_display->i_y;
- p_spu->i_x += p_sys->p_display->i_x;
- p_spu->i_y += p_sys->p_display->i_y;
- }
- }
-
return p_spu;
}
encoder_sys_t *p_sys;
vlc_value_t val;
- if( ( p_enc->fmt_out.i_codec != VLC_FOURCC('d','v','b','s') ) &&
+ if( ( p_enc->fmt_out.i_codec != VLC_CODEC_DVBS ) &&
!p_enc->b_force )
{
return VLC_EGENERIC;
p_enc->p_sys = p_sys;
p_enc->pf_encode_sub = Encode;
- p_enc->fmt_out.i_codec = VLC_FOURCC('d','v','b','s');
+ p_enc->fmt_out.i_codec = VLC_CODEC_DVBS;
p_enc->fmt_out.subs.dvb.i_id = 1 << 16 | 1;
config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
return VLC_SUCCESS;
}
-/* FIXME: this routine is a hack to convert VLC_FOURCC('Y','U','V','A')
- * into VLC_FOURCC('Y','U','V','P')
+/* FIXME: this routine is a hack to convert VLC_CODEC_YUVA
+ * into VLC_CODEC_YUVP
*/
static subpicture_t *YuvaYuvp( subpicture_t *p_subpic )
{
#else
int *pi_delta;
#endif
- int i_pixels = p_region->picture.p[0].i_visible_lines
- * p_region->picture.p[0].i_pitch;
- int i_iterator = p_region->picture.p[0].i_visible_lines * 3 / 4
- * p_region->picture.p[0].i_pitch
- + p_region->picture.p[0].i_pitch * 1 / 3;
+ int i_pixels = p_region->p_picture->p[0].i_visible_lines
+ * p_region->p_picture->p[0].i_pitch;
+ int i_iterator = p_region->p_picture->p[0].i_visible_lines * 3 / 4
+ * p_region->p_picture->p[0].i_pitch
+ + p_region->p_picture->p[0].i_pitch * 1 / 3;
int i_tolerance = 0;
#ifdef DEBUG_DVBSUB
msg_Dbg( p_enc, "YuvaYuvp: i_pixels=%d, i_iterator=%d", i_pixels, i_iterator );
#endif
- p_fmt->i_chroma = VLC_FOURCC('Y','U','V','P');
+ p_fmt->i_chroma = VLC_CODEC_YUVP;
p_fmt->p_palette = (video_palette_t *) malloc( sizeof( video_palette_t ) );
if( !p_fmt->p_palette ) break;
p_fmt->p_palette->i_entries = 0;
for( i = 0; i < i_pixels ; )
{
uint8_t y, u, v, a;
- y = p_region->picture.p[0].p_pixels[i];
- u = p_region->picture.p[1].p_pixels[i];
- v = p_region->picture.p[2].p_pixels[i];
- a = p_region->picture.p[3].p_pixels[i];
+ y = p_region->p_picture->p[0].p_pixels[i];
+ u = p_region->p_picture->p[1].p_pixels[i];
+ v = p_region->p_picture->p[2].p_pixels[i];
+ a = p_region->p_picture->p[3].p_pixels[i];
for( j = 0; j < p_fmt->p_palette->i_entries; j++ )
{
if( abs((int)p_fmt->p_palette->palette[j][0] - (int)y) <= i_tolerance &&
#endif
#ifndef RANDOM_DITHERING
- pi_delta = malloc( ( p_region->picture.p[0].i_pitch + 1 )
+ pi_delta = malloc( ( p_region->p_picture->p[0].i_pitch + 1 )
* sizeof(int) * 4 );
- for( i = 0; i < (p_region->picture.p[0].i_pitch + 1) * 4 ; i++ )
+ for( i = 0; i < (p_region->p_picture->p[0].i_pitch + 1) * 4 ; i++ )
{
pi_delta[ i ] = 0;
}
#endif
/* Fill image with our new colours */
- for( p = 0; p < p_region->picture.p[0].i_visible_lines ; p++ )
+ for( p = 0; p < p_region->p_picture->p[0].i_visible_lines ; p++ )
{
int i_ydelta = 0, i_udelta = 0, i_vdelta = 0, i_adelta = 0;
- for( n = 0; n < p_region->picture.p[0].i_pitch ; n++ )
+ for( n = 0; n < p_region->p_picture->p[0].i_pitch ; n++ )
{
- int i_offset = p * p_region->picture.p[0].i_pitch + n;
+ int i_offset = p * p_region->p_picture->p[0].i_pitch + n;
int y, u, v, a;
int i_mindist, i_best;
- y = (int)p_region->picture.p[0].p_pixels[i_offset];
- u = (int)p_region->picture.p[1].p_pixels[i_offset];
- v = (int)p_region->picture.p[2].p_pixels[i_offset];
- a = (int)p_region->picture.p[3].p_pixels[i_offset];
+ y = (int)p_region->p_picture->p[0].p_pixels[i_offset];
+ u = (int)p_region->p_picture->p[1].p_pixels[i_offset];
+ v = (int)p_region->p_picture->p[2].p_pixels[i_offset];
+ a = (int)p_region->p_picture->p[3].p_pixels[i_offset];
/* Add dithering compensation */
#ifdef RANDOM_DITHERING
}
/* Set pixel to best color */
- p_region->picture.p[0].p_pixels[i_offset] = i_best;
+ p_region->p_picture->p[0].p_pixels[i_offset] = i_best;
/* Update dithering state */
#ifdef RANDOM_DITHERING
if( !p_subpic || !p_subpic->p_region ) return NULL;
- /* FIXME: this is a hack to convert VLC_FOURCC('Y','U','V','A') into
- * VLC_FOURCC('Y','U','V','P')
+ /* FIXME: this is a hack to convert VLC_CODEC_YUVA into
+ * VLC_CODEC_YUVP
*/
p_region = p_subpic->p_region;
- if( p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','A') )
+ if( p_region->fmt.i_chroma == VLC_CODEC_YUVA )
{
p_temp = YuvaYuvp( p_subpic );
if( !p_temp )
/* Sanity check */
if( !p_region ) return NULL;
- if( ( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) &&
- ( p_region->fmt.i_chroma != VLC_FOURCC('Y','U','V','P') ) )
+ if( ( p_region->fmt.i_chroma != VLC_CODEC_TEXT ) &&
+ ( p_region->fmt.i_chroma != VLC_CODEC_YUVP ) )
{
char psz_fourcc[5];
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
}
else
{
- bs_write( s, 16, p_subpic->i_x + p_region->i_x );
- bs_write( s, 16, p_subpic->i_y + p_region->i_y );
+ bs_write( s, 16, p_region->i_x );
+ bs_write( s, 16, p_region->i_y );
}
}
}
/* Sanity check */
if( !p_region ) return;
- if( p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P') )
+ if( p_region->fmt.i_chroma == VLC_CODEC_YUVP )
{
p_pal = p_region->fmt.p_palette;
}
{
int i_entries = 4, i_depth = 0x1, i_bg = 0;
bool b_text =
- ( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') );
+ ( p_region->fmt.i_chroma == VLC_CODEC_TEXT );
if( !b_text )
{
/* object coding method */
switch( p_region->fmt.i_chroma )
{
- case VLC_FOURCC( 'Y','U','V','P' ):
+ case VLC_CODEC_YUVP:
bs_write( s, 2, 0 );
break;
- case VLC_FOURCC( 'T','E','X','T' ):
+ case VLC_CODEC_TEXT:
bs_write( s, 2, 1 );
break;
default:
bs_write( s, 1, 0 ); /* non modifying color flag */
bs_write( s, 1, 0 ); /* Reserved */
- if( p_region->fmt.i_chroma == VLC_FOURCC( 'T','E','X','T' ) )
+ if( p_region->fmt.i_chroma == VLC_CODEC_TEXT )
{
int i_size, i;
unsigned int i_line;
/* Sanity check */
- if( p_region->fmt.i_chroma != VLC_FOURCC('Y','U','V','P') ) return;
+ if( p_region->fmt.i_chroma != VLC_CODEC_YUVP ) return;
/* Encode line by line */
for( i_line = !b_top; i_line < p_region->fmt.i_visible_height;
int i_line )
{
unsigned int i, i_length = 0;
- int i_pitch = p_region->picture.p->i_pitch;
- uint8_t *p_data = &p_region->picture.p->p_pixels[ i_pitch * i_line ];
+ int i_pitch = p_region->p_picture->p->i_pitch;
+ uint8_t *p_data = &p_region->p_picture->p->p_pixels[ i_pitch * i_line ];
int i_last_pixel = p_data[0];
for( i = 0; i <= p_region->fmt.i_visible_width; i++ )
int i_line )
{
unsigned int i, i_length = 0;
- int i_pitch = p_region->picture.p->i_pitch;
- uint8_t *p_data = &p_region->picture.p->p_pixels[ i_pitch * i_line ];
+ int i_pitch = p_region->p_picture->p->i_pitch;
+ uint8_t *p_data = &p_region->p_picture->p->p_pixels[ i_pitch * i_line ];
int i_last_pixel = p_data[0];
for( i = 0; i <= p_region->fmt.i_visible_width; i++ )
int i_line )
{
unsigned int i, i_length = 0;
- int i_pitch = p_region->picture.p->i_pitch;
- uint8_t *p_data = &p_region->picture.p->p_pixels[ i_pitch * i_line ];
+ int i_pitch = p_region->p_picture->p->i_pitch;
+ uint8_t *p_data = &p_region->p_picture->p->p_pixels[ i_pitch * i_line ];
int i_last_pixel = p_data[0];
for( i = 0; i <= p_region->fmt.i_visible_width; i++ )
projects / vlc / blobdiff