* Copyright (C) 2007, M2X
* $Id$
*
- * Authors: Derk-Jan Hartman <djhartman at m2x dot nl> for M2X
+ * Authors: Derk-Jan Hartman <djhartman at m2x dot nl>
+ * Jean-Paul Saman <jpsaman at m2x dot nl>
*
* 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
add_integer( "vbi-page", 100, NULL,
PAGE_TEXT, PAGE_LONGTEXT, VLC_FALSE );
+ change_safe();
add_bool( "vbi-opaque", VLC_TRUE, NULL,
OPAQUE_TEXT, OPAQUE_LONGTEXT, VLC_FALSE );
+ change_safe();
add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+ change_safe();
add_bool( "vbi-text", VLC_FALSE, NULL,
TELX_TEXT, TELX_LONGTEXT, VLC_FALSE );
+ change_safe();
vlc_module_end();
/****************************************************************************
/* Positioning of Teletext images */
int i_align;
+
+ /* Misc */
+#ifdef HAVE_FFMPEG_SWSCALE_H
+ image_handler_t *p_image;
+#endif
};
static void event_handler( vbi_event *ev, void *user_data );
static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int OpaquePage( decoder_t *p_dec, vbi_page p_page, video_format_t fmt,
+ picture_t **p_src );
+static int Opaque_32bpp( decoder_t *p_dec, vbi_page p_page, video_format_t fmt,
+ picture_t **p_src );
+static int Opaque_8bpp( decoder_t *p_dec, vbi_page p_page, video_format_t fmt,
+ picture_t **p_src );
+
static int Opaque( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data );
static int Position( vlc_object_t *p_this, char const *psz_cmd,
{
msg_Err( p_dec, "out of memory" );
return VLC_ENOMEM;
-
}
memset( p_sys, 0, sizeof(decoder_sys_t) );
+#ifdef HAVE_FFMPEG_SWSCALE_H
+ p_sys->p_image = image_HandlerCreate( VLC_OBJECT(p_dec) );
+ if( !p_sys->p_image )
+ {
+ free( p_sys );
+ msg_Err( p_dec, "out of memory" );
+ return VLC_ENOMEM;
+ }
+#endif
+
+ p_sys->b_update = VLC_FALSE;
p_sys->p_vbi_dec = vbi_decoder_new();
p_sys->p_dvb_demux = vbi_dvb_pes_demux_new( NULL, NULL );
event_handler, p_dec );
/* Create the var on vlc_global. */
- p_sys->i_wanted_page = var_CreateGetInteger( p_dec->p_libvlc, "vbi-page" );
- var_AddCallback( p_dec->p_libvlc, "vbi-page",
+ p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" );
+ var_AddCallback( p_dec, "vbi-page",
RequestPage, p_sys );
p_sys->b_opaque = var_CreateGetBool( p_dec, "vbi-opaque" );
p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" );
// var_AddCallback( p_dec, "vbi-text", Text, p_sys );
+ es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
+ if( p_sys->b_text )
+ p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
+ else
+#ifdef HAVE_FFMPEG_SWSCALE_H
+ p_dec->fmt_out.video.i_chroma = VLC_FOURCC('Y','U','V','A');
+#else
+ p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A');
+#endif
return VLC_SUCCESS;
}
decoder_t *p_dec = (decoder_t*) p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
+ var_Destroy( p_dec, "vbi-opaque" );
+ var_Destroy( p_dec, "vbi-page" );
+ var_DelCallback( p_dec, "vbi-page", RequestPage, p_sys );
+ var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
+
+#ifdef HAVE_FFMPEG_SWSCALE_H
+ if( p_sys->p_image ) image_HandlerDelete( p_sys->p_image );
+#endif
if( p_sys->p_vbi_dec ) vbi_decoder_delete( p_sys->p_vbi_dec );
if( p_sys->p_dvb_demux ) vbi_dvb_demux_delete( p_sys->p_dvb_demux );
free( p_sys );
*****************************************************************************/
static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
{
- decoder_sys_t *p_sys = p_dec->p_sys;
+ decoder_sys_t *p_sys = (decoder_sys_t *) p_dec->p_sys;
block_t *p_block;
subpicture_t *p_spu = NULL;
video_format_t fmt;
const uint8_t *p_pos;
unsigned int i_left;
- /* part of kludge */
- uint32_t *p_begin, *p_end;
- unsigned int x = 0, y = 0;
- vbi_opacity opacity;
- /* end part of kludge */
-
if( (pp_block == NULL) || (*pp_block == NULL) )
return NULL;
+
p_block = *pp_block;
*pp_block = NULL;
if( !b_cached )
goto error;
- if( (p_sys->i_wanted_page == p_sys->i_last_page) &&
- (p_sys->b_update != VLC_TRUE) )
+ if( ( p_sys->i_wanted_page == p_sys->i_last_page ) &&
+ ( p_sys->b_update != VLC_TRUE ) )
goto error;
- p_sys->i_last_page = p_sys->i_wanted_page;
p_sys->b_update = VLC_FALSE;
+ p_sys->i_last_page = p_sys->i_wanted_page;
+#if 0
msg_Dbg( p_dec, "we now have page: %d ready for display",
- p_sys->i_wanted_page );
-
+ p_sys->i_wanted_page );
+#endif
/* If there is a page or sub to render, then we do that here */
/* Create the subpicture unit */
p_spu = p_dec->pf_spu_buffer_new( p_dec );
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = p_sys->b_text ? VLC_FOURCC('T','E','X','T') : VLC_FOURCC('R','G','B','A');
+ fmt.i_chroma = p_sys->b_text ? VLC_FOURCC('T','E','X','T') :
+#ifdef HAVE_FFMPEG_SWSCALE_H
+ VLC_FOURCC('Y','U','V','A');
+#else
+ VLC_FOURCC('R','G','B','A');
+#endif
fmt.i_aspect = p_sys->b_text ? 0 : VOUT_ASPECT_FACTOR;
fmt.i_sar_num = fmt.i_sar_den = 1;
fmt.i_width = fmt.i_visible_width = p_page.columns * 12;
fmt.i_height = fmt.i_visible_height = p_page.rows * 10;
- fmt.i_bits_per_pixel = p_sys->b_text ? 0 : 32;
+ fmt.i_bits_per_pixel = p_sys->b_text ? 0 : 32;
fmt.i_x_offset = fmt.i_y_offset = 0;
p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
p_spu->p_region->i_x = 0;
p_spu->p_region->i_y = 0;
- p_spu->p_region->i_align = SUBPICTURE_ALIGN_TOP;
+ p_spu->p_region->i_align = SUBPICTURE_ALIGN_BOTTOM;
/* Normal text subs, easy markup */
p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM;
- p_spu->i_start = p_block->i_pts;
+ p_spu->i_start = (mtime_t) p_block->i_dts;
p_spu->i_stop = (mtime_t) 0;
p_spu->b_ephemer = VLC_TRUE;
p_spu->b_absolute = VLC_FALSE;
p_spu->b_pausable = VLC_TRUE;
+ p_spu->i_width = fmt.i_width;
+ p_spu->i_height = fmt.i_height;
p_spu->i_original_picture_width = p_page.columns * 12;
p_spu->i_original_picture_height = p_page.rows * 10;
+#ifdef WORDS_BIGENDIAN
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_BE
+#else
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_LE
+#endif
+
if( p_sys->b_text )
{
- unsigned int i_total, i_textsize = 7000;
+ unsigned int i_textsize = 7000;
+ int i_total;
char p_text[7000];
i_total = vbi_print_page_region( &p_page, p_text, i_textsize,
- "ASCII", 0, 0, 0, 0, p_page.columns,
- p_page.rows );
+ "UTF-8", 0, 0, 0, 0, p_page.columns, p_page.rows );
p_text[i_total] = '\0';
/* Strip off the pagenumber */
- if( i_total <= 8 ) goto error;
+ if( i_total <= 40 ) goto error;
p_spu->p_region->psz_text = strdup( &p_text[8] );
- msg_Dbg( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
+ p_spu->p_region->fmt.i_height = p_spu->p_region->fmt.i_visible_height = p_page.rows + 1;
+ msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
}
- else
+ else
{
- vbi_draw_vt_page( &p_page, VBI_PIXFMT_RGBA32_LE,
- p_spu->p_region->picture.p->p_pixels, 1, 1 );
- p_spu->p_region->picture.p->i_lines = p_page.rows * 10;
- p_spu->p_region->picture.p->i_pitch = p_page.columns * 12 * 4;
- }
+#ifdef HAVE_FFMPEG_SWSCALE_H
+ video_format_t fmt_in;
+ picture_t *p_pic, *p_dest;
- /* Kludge since zvbi doesn't provide an option to specify opacity. */
- if( p_sys->b_opaque && !p_sys->b_text )
- {
- p_begin = (uint32_t *)p_spu->p_region->picture.p->p_pixels;
- p_end = (uint32_t *)p_spu->p_region->picture.p->p_pixels+(fmt.i_width * fmt.i_height);
+ p_pic = ( picture_t * ) malloc( sizeof( picture_t ) );
+ if( !p_pic )
+ {
+ msg_Err( p_dec, "out of memory" );
+ goto error;
+ }
- for( ; p_begin < p_end; p_begin++ )
+ memset( &fmt_in, 0, sizeof( video_format_t ) );
+ memset( p_pic, 0, sizeof( picture_t ) );
+
+ fmt_in = fmt;
+ fmt_in.i_chroma = VLC_FOURCC('R','G','B','A');
+
+ vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic, fmt_in.i_chroma,
+ fmt_in.i_width, fmt_in.i_height, fmt_in.i_aspect );
+ if( !p_pic->i_planes )
{
- opacity = p_page.text[ y / 10 * p_page.columns + x / 12 ].opacity;
- switch( opacity )
- {
- /* Show video instead of this character */
- case VBI_TRANSPARENT_SPACE:
- *p_begin = 0;
- break;
- /* To make the boxed text "closed captioning" transparent
- * change VLC_TRUE to VLC_FALSE.
- */
- case VBI_OPAQUE:
- if( p_sys->b_opaque )
- break;
- /* Full text transparency. only foreground color is show */
- case VBI_TRANSPARENT_FULL:
- /* Transparency for boxed text */
- case VBI_SEMI_TRANSPARENT:
- if( (*p_begin & 0xffffff00) == 0xff )
- *p_begin = 0;
- break;
- default:
- break;
- }
- x++;
- if( x >= fmt.i_width )
- {
- x = 0;
- y++;
- }
+ free( p_pic->p_data_orig );
+ free( p_pic );
+ goto error;
}
+
+ vbi_draw_vt_page( &p_page, ZVBI_PIXFMT_RGBA32,
+ p_pic->p->p_pixels, 1, 1 );
+
+ p_pic->p->i_lines = p_page.rows * 10;
+ p_pic->p->i_pitch = p_page.columns * 12 * 4;
+
+#if 0
+ msg_Dbg( p_dec, "page %x-%x(%d,%d)",
+ p_page.pgno, p_page.subno,
+ p_page.rows, p_page.columns );
+#endif
+ p_dest = image_Convert( p_sys->p_image, p_pic, &fmt_in,
+ &p_spu->p_region->fmt );
+ if( !p_dest )
+ {
+ free( p_pic->p_data_orig );
+ free( p_pic );
+ msg_Err( p_dec, "chroma conversion failed" );
+ goto error;
+ }
+ OpaquePage( p_dec, p_page, p_spu->p_region->fmt, &p_dest );
+ vout_CopyPicture( VLC_OBJECT(p_dec), &(p_spu->p_region->picture),
+ p_dest );
+
+ free( p_pic->p_data_orig );
+ free( p_pic );
+
+ free( p_dest->p_data_orig );
+ free( p_dest );
+#else
+ picture_t *p_pic;
+
+ vbi_draw_vt_page( &p_page, ZVBI_PIXFMT_RGBA32,
+ p_spu->p_region->picture.p->p_pixels, 1, 1 );
+
+ p_spu->p_region->picture.p->i_lines = p_page.rows * 10;
+ p_spu->p_region->picture.p->i_pitch = p_page.columns * 12 * 4;
+
+ p_pic = &(p_spu->p_region->picture);
+ OpaquePage( p_dec, p_page, fmt, &p_pic );
+#endif
}
- /* end of kludge */
+
+#undef PIXFMT_RGBA32
vbi_unref_page( &p_page );
block_Release( p_block );
if( ev->type == VBI_EVENT_TTX_PAGE )
{
- /* msg_Dbg( p_dec, "Page %03x.%02x ",
+ /* msg_Info( p_dec, "Page %03x.%02x ",
ev->ev.ttx_page.pgno,
ev->ev.ttx_page.subno & 0xFF);
*/
if( ev->ev.ttx_page.clock_update )
msg_Dbg( p_dec, "clock" );
- if( ev->ev.ttx_page.header_update )
+/* if( ev->ev.ttx_page.header_update )
msg_Dbg( p_dec, "header" );
+*/
}
else if( ev->type == VBI_EVENT_CAPTION )
msg_Dbg( p_dec, "Caption line: %x", ev->ev.caption.pgno );
msg_Dbg( p_dec, "Program info received" );
}
+static int OpaquePage( decoder_t *p_dec, vbi_page p_page,
+ video_format_t fmt, picture_t **p_src )
+{
+ int result = VLC_EGENERIC;
+
+ /* Kludge since zvbi doesn't provide an option to specify opacity. */
+ switch( fmt.i_chroma )
+ {
+ case VLC_FOURCC('R','G','B','A' ):
+ result = Opaque_32bpp( p_dec, p_page, fmt, p_src );
+ break;
+ case VLC_FOURCC('Y','U','V','A' ):
+ result = Opaque_8bpp( p_dec, p_page, fmt, p_src );
+ break;
+ default:
+ msg_Err( p_dec, "chroma not supported %4.4s", (char *)&fmt.i_chroma );
+ return VLC_EGENERIC;
+ }
+ return result;
+}
+
+static int Opaque_32bpp( decoder_t *p_dec, vbi_page p_page,
+ video_format_t fmt, picture_t **p_src )
+{
+ decoder_sys_t *p_sys = (decoder_sys_t *) p_dec->p_sys;
+ uint32_t *p_begin, *p_end;
+ unsigned int x = 0, y = 0;
+ vbi_opacity opacity;
+
+ /* Kludge since zvbi doesn't provide an option to specify opacity. */
+ switch( fmt.i_chroma )
+ {
+ case VLC_FOURCC('R','G','B','A' ):
+ p_begin = (uint32_t *)(*p_src)->p->p_pixels;
+ p_end = (uint32_t *)(*p_src)->p->p_pixels +
+ ( fmt.i_width * fmt.i_height );
+ break;
+ default:
+ msg_Err( p_dec, "chroma not supported %4.4s", (char *)&fmt.i_chroma );
+ return VLC_EGENERIC;
+ }
+
+ for( ; p_begin < p_end; p_begin++ )
+ {
+ opacity = p_page.text[ y / 10 * p_page.columns + x / 12 ].opacity;
+ switch( opacity )
+ {
+ /* Show video instead of this character */
+ case VBI_TRANSPARENT_SPACE:
+ *p_begin = 0;
+ break;
+ /* To make the boxed text "closed captioning" transparent
+ * change VLC_TRUE to VLC_FALSE.
+ */
+ case VBI_OPAQUE:
+ if( p_sys->b_opaque )
+ break;
+ /* Full text transparency. only foreground color is show */
+ case VBI_TRANSPARENT_FULL:
+ *p_begin = 0;
+ break;
+ /* Transparency for boxed text */
+ case VBI_SEMI_TRANSPARENT:
+ if( (*p_begin & 0xffffff00) == 0xff )
+ *p_begin = 0;
+ break;
+ }
+ x++;
+ if( x >= fmt.i_width )
+ {
+ x = 0;
+ y++;
+ }
+ }
+ /* end of kludge */
+ return VLC_SUCCESS;
+}
+
+static int Opaque_8bpp( decoder_t *p_dec, vbi_page p_page,
+ video_format_t fmt, picture_t **p_src )
+{
+ decoder_sys_t *p_sys = (decoder_sys_t *) p_dec->p_sys;
+ uint8_t *p_begin, *p_end;
+ uint32_t i_width = 0;
+ unsigned int x = 0, y = 0;
+ vbi_opacity opacity;
+
+ /* Kludge since zvbi doesn't provide an option to specify opacity. */
+ switch( fmt.i_chroma )
+ {
+ case VLC_FOURCC('Y','U','V','A' ):
+ p_begin = (uint8_t *)(*p_src)->p[A_PLANE].p_pixels;
+ p_end = (uint8_t *)(*p_src)->p[A_PLANE].p_pixels +
+ ( fmt.i_height * (*p_src)->p[A_PLANE].i_pitch );
+ i_width = (*p_src)->p[A_PLANE].i_pitch;
+ break;
+ default:
+ msg_Err( p_dec, "chroma not supported %4.4s", (char *)&fmt.i_chroma );
+ return VLC_EGENERIC;
+ }
+
+ for( ; p_begin < p_end; p_begin++ )
+ {
+ opacity = p_page.text[ y / 10 * p_page.columns + x / 12 ].opacity;
+ switch( opacity )
+ {
+ /* Show video instead of this character */
+ case VBI_TRANSPARENT_SPACE:
+ *p_begin = 0;
+ break;
+ /* To make the boxed text "closed captioning" transparent
+ * change VLC_TRUE to VLC_FALSE.
+ */
+ case VBI_OPAQUE:
+ if( p_sys->b_opaque )
+ break;
+ /* Full text transparency. only foreground color is show */
+ case VBI_TRANSPARENT_FULL:
+ *p_begin = 0;
+ break;
+ /* Transparency for boxed text */
+ case VBI_SEMI_TRANSPARENT:
+ if( (*p_begin & 0xffffff00) == 0xff )
+ *p_begin = 0;
+ break;
+ }
+ x++;
+ if( x >= i_width )
+ {
+ x = 0;
+ y++;
+ }
+ }
+ /* end of kludge */
+ return VLC_SUCCESS;
+}
+
static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
projects / vlc / blobdiff