# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <assert.h>
-#include <stdint.h>
#include <libzvbi.h>
#include "vlc_vout.h"
-#include "vlc_bits.h"
#include "vlc_codec.h"
-#include "vlc_image.h"
-
-typedef enum {
- DATA_UNIT_EBU_TELETEXT_NON_SUBTITLE = 0x02,
- DATA_UNIT_EBU_TELETEXT_SUBTITLE = 0x03,
- DATA_UNIT_EBU_TELETEXT_INVERTED = 0x0C,
-
- DATA_UNIT_ZVBI_WSS_CPR1204 = 0xB4,
- DATA_UNIT_ZVBI_CLOSED_CAPTION_525 = 0xB5,
- DATA_UNIT_ZVBI_MONOCHROME_SAMPLES_525 = 0xB6,
-
- DATA_UNIT_VPS = 0xC3,
- DATA_UNIT_WSS = 0xC4,
- DATA_UNIT_CLOSED_CAPTION = 0xC5,
- DATA_UNIT_MONOCHROME_SAMPLES = 0xC6,
-
- DATA_UNIT_STUFFING = 0xFF,
-} data_unit_id;
/*****************************************************************************
* Module descriptor.
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-static subpicture_t *Decode( decoder_t *, block_t ** );
#define PAGE_TEXT N_("Teletext page")
#define PAGE_LONGTEXT N_("Open the indicated Teletext page." \
#define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
"instead of as RGBA" )
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
vlc_module_begin();
- set_description( _("VBI and Teletext decoder") );
- set_shortname( "VBI & Teletext" );
+ set_description( N_("VBI and Teletext decoder") );
+ set_shortname( N_("VBI & Teletext") );
set_capability( "decoder", 51 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_SCODEC );
set_callbacks( Open, Close );
add_integer( "vbi-page", 100, NULL,
- PAGE_TEXT, PAGE_LONGTEXT, VLC_FALSE );
- add_bool( "vbi-opaque", VLC_TRUE, NULL,
- OPAQUE_TEXT, OPAQUE_LONGTEXT, VLC_FALSE );
- add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+ PAGE_TEXT, PAGE_LONGTEXT, false );
+ add_bool( "vbi-opaque", true, NULL,
+ OPAQUE_TEXT, OPAQUE_LONGTEXT, false );
+ add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false );
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
- add_bool( "vbi-text", VLC_FALSE, NULL,
- TELX_TEXT, TELX_LONGTEXT, VLC_FALSE );
+ add_bool( "vbi-text", false, NULL,
+ TELX_TEXT, TELX_LONGTEXT, false );
vlc_module_end();
/****************************************************************************
* Local structures
****************************************************************************/
+// #define ZVBI_DEBUG
+
+typedef enum {
+ DATA_UNIT_EBU_TELETEXT_NON_SUBTITLE = 0x02,
+ DATA_UNIT_EBU_TELETEXT_SUBTITLE = 0x03,
+ DATA_UNIT_EBU_TELETEXT_INVERTED = 0x0C,
+
+ DATA_UNIT_ZVBI_WSS_CPR1204 = 0xB4,
+ DATA_UNIT_ZVBI_CLOSED_CAPTION_525 = 0xB5,
+ DATA_UNIT_ZVBI_MONOCHROME_SAMPLES_525 = 0xB6,
+
+ DATA_UNIT_VPS = 0xC3,
+ DATA_UNIT_WSS = 0xC4,
+ DATA_UNIT_CLOSED_CAPTION = 0xC5,
+ DATA_UNIT_MONOCHROME_SAMPLES = 0xC6,
+
+ DATA_UNIT_STUFFING = 0xFF,
+} data_unit_id;
+
struct decoder_sys_t
{
- vbi_decoder * p_vbi_dec;
- vbi_dvb_demux * p_dvb_demux;
- unsigned int i_wanted_page;
- unsigned int i_last_page;
- vlc_bool_t b_update;
- vlc_bool_t b_opaque;
-
- /* Subtitles as text */
- vlc_bool_t b_text;
+ vbi_decoder * p_vbi_dec;
+ vbi_dvb_demux * p_dvb_demux;
+ unsigned int i_last_page;
+ bool b_update;
+ bool b_text; /* Subtitles as text */
+ vlc_mutex_t lock; /* Lock to protect the following variables */
/* Positioning of Teletext images */
- int i_align;
-
- /* Misc */
-#ifdef HAVE_LIBSWSCALE_SWSCALE_H
- image_handler_t *p_image;
-#endif
+ int i_align;
+ /* */
+ unsigned int i_wanted_page;
+ /* */
+ bool b_opaque;
};
-static void event_handler( vbi_event *ev, void *user_data );
+static subpicture_t *Decode( decoder_t *, block_t ** );
+
+static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
+ bool b_text,
+ int i_columns, int i_rows,
+ int i_align, mtime_t i_pts );
+
+static void EventHandler( vbi_event *ev, void *user_data );
+static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+ const video_format_t fmt, bool b_opaque );
+
+/* Properties callbacks */
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,
decoder_sys_t *p_sys = NULL;
if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
- {
return VLC_EGENERIC;
- }
p_dec->pf_decode_sub = Decode;
p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
if( p_sys == NULL )
- {
- msg_Err( p_dec, "out of memory" );
return VLC_ENOMEM;
- }
memset( p_sys, 0, sizeof(decoder_sys_t) );
-#ifdef HAVE_LIBSWSCALE_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->b_update = false;
p_sys->p_vbi_dec = vbi_decoder_new();
p_sys->p_dvb_demux = vbi_dvb_pes_demux_new( NULL, NULL );
+ vlc_mutex_init( &p_sys->lock );
if( (p_sys->p_vbi_dec == NULL) || (p_sys->p_dvb_demux == NULL) )
{
vbi_event_handler_register( p_sys->p_vbi_dec, VBI_EVENT_TTX_PAGE |
VBI_EVENT_CAPTION | VBI_EVENT_NETWORK |
VBI_EVENT_ASPECT | VBI_EVENT_PROG_INFO,
- event_handler, p_dec );
+ EventHandler, p_dec );
/* Create the var on vlc_global. */
p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" );
if( p_sys->b_text )
p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
else
-#ifdef HAVE_LIBSWSCALE_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-position", Position, p_sys );
var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
+ var_DelCallback( p_dec, "vbi-page", RequestPage, p_sys );
-#ifdef HAVE_LIBSWSCALE_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 );
+ vlc_mutex_destroy( &p_sys->lock );
+
+ 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 );
}
#define MAX_SLICES 32
+#ifdef WORDS_BIGENDIAN
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_BE
+#else
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_LE
+#endif
+
+
/*****************************************************************************
* Decode:
*****************************************************************************/
static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
{
- decoder_sys_t *p_sys = (decoder_sys_t *) p_dec->p_sys;
+ decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
subpicture_t *p_spu = NULL;
video_format_t fmt;
- vlc_bool_t b_cached = VLC_FALSE;
+ bool b_cached = false;
vbi_page p_page;
const uint8_t *p_pos;
unsigned int i_left;
vbi_decode( p_sys->p_vbi_dec, p_sliced, i_lines, i_pts / 90000.0 );
}
+ /* */
+ vlc_mutex_lock( &p_sys->lock );
+ const int i_align = p_sys->i_align;
+ const unsigned int i_wanted_page = p_sys->i_wanted_page;
+ const bool b_opaque = p_sys->b_opaque;
+ vlc_mutex_unlock( &p_sys->lock );
+
+
/* Try to see if the page we want is in the cache yet */
b_cached = vbi_fetch_vt_page( p_sys->p_vbi_dec, &p_page,
- vbi_dec2bcd( p_sys->i_wanted_page ),
+ vbi_dec2bcd( i_wanted_page ),
VBI_ANY_SUBNO, VBI_WST_LEVEL_3p5,
25, FALSE );
- if( !b_cached )
+ if( i_wanted_page == p_sys->i_last_page && !p_sys->b_update )
goto error;
- if( ( p_sys->i_wanted_page == p_sys->i_last_page ) &&
- ( p_sys->b_update != VLC_TRUE ) )
+ if( !b_cached )
+ {
+ if( p_sys->i_last_page != i_wanted_page )
+ {
+ /* We need to reset the subtitle */
+ p_spu = Subpicture( p_dec, &fmt, true,
+ p_page.columns, p_page.rows,
+ i_align, p_block->i_pts );
+ if( !p_spu )
+ goto error;
+ p_spu->p_region->psz_text = strdup("");
+
+ p_sys->b_update = true;
+ p_sys->i_last_page = i_wanted_page;
+ goto exit;
+ }
goto error;
+ }
- p_sys->b_update = VLC_FALSE;
- p_sys->i_last_page = p_sys->i_wanted_page;
-#if 0
+ p_sys->b_update = false;
+ p_sys->i_last_page = i_wanted_page;
+#ifdef ZVBI_DEBUG
msg_Dbg( p_dec, "we now have page: %d ready for display",
- p_sys->i_wanted_page );
+ 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 );
+ p_spu = Subpicture( p_dec, &fmt, p_sys->b_text,
+ p_page.columns, p_page.rows,
+ i_align, p_block->i_pts );
if( !p_spu )
- {
- msg_Warn( p_dec, "can't get spu buffer" );
goto error;
- }
-
- /* 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') :
-#ifdef HAVE_LIBSWSCALE_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_x_offset = fmt.i_y_offset = 0;
-
- p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
- if( p_spu->p_region == NULL )
- {
- msg_Err( p_dec, "cannot allocate SPU region" );
- goto error;
- }
-
- p_spu->p_region->i_x = 0;
- p_spu->p_region->i_y = 0;
- 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 = (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_textsize = 7000;
int i_total;
- char p_text[7000];
+ char p_text[i_textsize+1];
i_total = vbi_print_page_region( &p_page, p_text, i_textsize,
"UTF-8", 0, 0, 0, 0, p_page.columns, p_page.rows );
p_text[i_total] = '\0';
/* Strip off the pagenumber */
- if( i_total <= 40 ) goto error;
+ if( i_total <= 40 )
+ goto error;
p_spu->p_region->psz_text = strdup( &p_text[8] );
- p_spu->p_region->fmt.i_height = p_spu->p_region->fmt.i_visible_height = p_page.rows + 1;
+#ifdef ZVBI_DEBUG
msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
+#endif
}
else
{
-#ifdef HAVE_LIBSWSCALE_SWSCALE_H
- video_format_t fmt_in;
- picture_t *p_pic, *p_dest;
-
- p_pic = ( picture_t * ) malloc( sizeof( picture_t ) );
- if( !p_pic )
- {
- msg_Err( p_dec, "out of memory" );
- goto error;
- }
-
- 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 )
- {
- 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;
+ picture_t *p_pic = &p_spu->p_region->picture;
+ /* ZVBI is stupid enough to assume pitch == width */
+ p_pic->p->i_pitch = 4 * fmt.i_width;
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
+ OpaquePage( p_pic, p_page, fmt, b_opaque );
}
-#undef PIXFMT_RGBA32
-
+exit:
vbi_unref_page( &p_page );
block_Release( p_block );
return p_spu;
return NULL;
}
-static void event_handler( vbi_event *ev, void *user_data )
+static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
+ bool b_text,
+ int i_columns, int i_rows, int i_align,
+ mtime_t i_pts )
+{
+ video_format_t fmt;
+ subpicture_t *p_spu;
+
+ /* 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 );
+ if( !p_spu )
+ {
+ msg_Warn( p_dec, "can't get spu buffer" );
+ return NULL;
+ }
+
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = b_text ? VLC_FOURCC('T','E','X','T') :
+ VLC_FOURCC('R','G','B','A');
+ fmt.i_aspect = b_text ? 0 : VOUT_ASPECT_FACTOR;
+ if( b_text )
+ {
+ fmt.i_bits_per_pixel = 0;
+ }
+ else
+ {
+ fmt.i_sar_num = fmt.i_sar_den = 1;
+ fmt.i_width = fmt.i_visible_width = i_columns * 12;
+ fmt.i_height = fmt.i_visible_height = i_rows * 10;
+ fmt.i_bits_per_pixel = 32;
+ }
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+
+ p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
+ if( p_spu->p_region == NULL )
+ {
+ msg_Err( p_dec, "cannot allocate SPU region" );
+ p_dec->pf_spu_buffer_del( p_dec, p_spu );
+ return NULL;
+ }
+
+ p_spu->p_region->i_x = 0;
+ p_spu->p_region->i_y = 0;
+ p_spu->p_region->i_align = i_align;
+
+ /* Normal text subs, easy markup */
+ p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM;
+
+ p_spu->i_start = i_pts;
+ p_spu->i_stop = 0;
+ p_spu->b_ephemer = true;
+ p_spu->b_absolute = false;
+ p_spu->b_pausable = true;
+
+
+ if( !b_text )
+ {
+ p_spu->i_width =
+ p_spu->i_original_picture_width = fmt.i_width;
+ p_spu->i_height =
+ p_spu->i_original_picture_height = fmt.i_height;
+ }
+
+ /* */
+ *p_fmt = fmt;
+ return p_spu;
+}
+
+static void EventHandler( vbi_event *ev, void *user_data )
{
decoder_t *p_dec = (decoder_t *)user_data;
decoder_sys_t *p_sys = p_dec->p_sys;
if( ev->type == VBI_EVENT_TTX_PAGE )
{
- /* msg_Info( p_dec, "Page %03x.%02x ",
+#ifdef ZVBI_DEBUG
+ msg_Info( p_dec, "Page %03x.%02x ",
ev->ev.ttx_page.pgno,
ev->ev.ttx_page.subno & 0xFF);
- */
+#endif
if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) )
- p_sys->b_update = VLC_TRUE;
+ p_sys->b_update = true;
if( ev->ev.ttx_page.clock_update )
msg_Dbg( p_dec, "clock" );
-/* if( ev->ev.ttx_page.header_update )
+#ifdef ZVBI_DEBUG
+ if( ev->ev.ttx_page.header_update )
msg_Dbg( p_dec, "header" );
-*/
+#endif
}
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 )
+static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+ const video_format_t fmt, bool b_opaque )
{
- int result = VLC_EGENERIC;
+ unsigned int x, y;
- /* 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;
+ assert( fmt.i_chroma == VLC_FOURCC('R','G','B','A' ) );
/* Kludge since zvbi doesn't provide an option to specify opacity. */
- switch( fmt.i_chroma )
+ for( y = 0; y < fmt.i_height; y++ )
{
- 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 )
+ for( x = 0; x < fmt.i_width; x++ )
{
- /* 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 )
+ const vbi_opacity opacity = p_page.text[ y/10 * p_page.columns + x/12 ].opacity;
+ uint32_t *p_pixel = (uint32_t*)&p_src->p->p_pixels[y * p_src->p->i_pitch + 4*x];
+ switch( opacity )
+ {
+ /* Show video instead of this character */
+ case VBI_TRANSPARENT_SPACE:
+ *p_pixel = 0;
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 )
+ /* To make the boxed text "closed captioning" transparent
+ * change true to false.
+ */
+ case VBI_OPAQUE:
+ if( b_opaque )
+ break;
+ /* Full text transparency. only foreground color is show */
+ case VBI_TRANSPARENT_FULL:
+ *p_pixel = 0;
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++;
+ /* Transparency for boxed text */
+ case VBI_SEMI_TRANSPARENT:
+ if( (*p_pixel & 0xffffff00) == 0xff ) /* FIXME cannot be true ? */
+ *p_pixel = 0;
+ break;
+ }
}
}
/* end of kludge */
return VLC_SUCCESS;
}
+/* Callbacks */
static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- decoder_sys_t *p_sys = p_data;
+ decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- if( (newval.i_int > 0) && (newval.i_int < 999) )
+ vlc_mutex_lock( &p_sys->lock );
+ if( newval.i_int > 0 && newval.i_int < 999 )
p_sys->i_wanted_page = newval.i_int;
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->b_opaque = newval.b_bool;
+ vlc_mutex_unlock( &p_sys->lock );
- if( p_sys )
- p_sys->b_opaque = newval.b_bool;
return VLC_SUCCESS;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->i_align = newval.i_int;
+ vlc_mutex_unlock( &p_sys->lock );
- if( p_sys )
- p_sys->i_align = newval.i_int;
return VLC_SUCCESS;
}
projects / vlc / blobdiff