#include <assert.h>
#include <libzvbi.h>
-#include "vlc_vout.h"
-#include "vlc_codec.h"
+#include <vlc_codec.h>
+#include <vlc_vout_osd.h>
/*****************************************************************************
* Module descriptor.
{ 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( 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 );
+vlc_module_begin ()
+ 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, 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 );
+ 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, NULL );
add_bool( "vbi-text", false, NULL,
- TELX_TEXT, TELX_LONGTEXT, false );
-vlc_module_end();
+ TELX_TEXT, TELX_LONGTEXT, false )
+vlc_module_end ()
/****************************************************************************
* Local structures
// #define ZVBI_DEBUG
+//Guessing table for missing "default region triplet"
+static const int pi_default_triplet[] = {
+ 0, 0, // slo cze
+ 8, // pol
+ 24,24,24,24, //ssc scr slv rum
+ 32,32,32,32,32, //est lit rus bul ukr
+ 48,48, //gre ell
+ 64, //ara
+ 88, //heb
+ 16 }; //default
+static const char *const ppsz_default_triplet[] = {
+ "slo", "cze",
+ "pol",
+ "ssc", "scr", "slv", "rum",
+ "est", "lit", "rus", "bul", "ukr",
+ "gre", "ell",
+ "ara",
+ "heb",
+ NULL
+};
+
+typedef enum {
+ ZVBI_KEY_RED = 'r' << 16,
+ ZVBI_KEY_GREEN = 'g' << 16,
+ ZVBI_KEY_YELLOW = 'y' << 16,
+ ZVBI_KEY_BLUE = 'b' << 16,
+ ZVBI_KEY_INDEX = 'i' << 16,
+} ttxt_key_id;
+
typedef enum {
DATA_UNIT_EBU_TELETEXT_NON_SUBTITLE = 0x02,
DATA_UNIT_EBU_TELETEXT_SUBTITLE = 0x03,
int i_align;
/* */
unsigned int i_wanted_page;
+ unsigned int i_wanted_subpage;
/* */
bool b_opaque;
+ struct {
+ int pgno, subno;
+ } nav_link[6];
+ int i_key[3];
};
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, bool b_opaque );
-
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,
vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data );
/*****************************************************************************
* Open: probe the decoder and return score
decoder_t *p_dec = (decoder_t *) p_this;
decoder_sys_t *p_sys = NULL;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_TELETEXT )
return VLC_EGENERIC;
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 == NULL )
return VLC_ENOMEM;
- memset( p_sys, 0, sizeof(decoder_sys_t) );
+ p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0';
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 );
return VLC_ENOMEM;
}
- 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,
- EventHandler, p_dec );
+ /* Some broadcasters in countries with level 1 and level 1.5 still not send a G0 to do
+ * matches against table 32 of ETSI 300 706. We try to do some best effort guessing
+ * This is not perfect, but might handle some cases where we know the vbi language
+ * is known. It would be better if people started sending G0 */
+ for( int i = 0; ppsz_default_triplet[i] != NULL; i++ )
+ {
+ if( p_dec->fmt_in.psz_language && !strcasecmp( p_dec->fmt_in.psz_language, ppsz_default_triplet[i] ) )
+ {
+ vbi_teletext_set_default_region( p_sys->p_vbi_dec, pi_default_triplet[i]);
+ msg_Dbg( p_dec, "overwriting default zvbi region: %d", pi_default_triplet[i] );
+ }
+ }
+
+ vbi_event_handler_register( p_sys->p_vbi_dec, VBI_EVENT_TTX_PAGE | VBI_EVENT_NETWORK |
+#ifdef ZVBI_DEBUG
+ VBI_EVENT_CAPTION | VBI_EVENT_TRIGGER |
+ VBI_EVENT_ASPECT | VBI_EVENT_PROG_INFO | VBI_EVENT_NETWORK_ID |
+#endif
+ 0 , EventHandler, p_dec );
/* Create the var on vlc_global. */
p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" );
- var_AddCallback( p_dec, "vbi-page",
- RequestPage, p_sys );
+ var_AddCallback( p_dec, "vbi-page", RequestPage, p_sys );
+
+ /* Check if the Teletext track has a known "initial page". */
+ if( p_sys->i_wanted_page == 100 && p_dec->fmt_in.subs.teletext.i_magazine != -1 )
+ {
+ p_sys->i_wanted_page = 100 * p_dec->fmt_in.subs.teletext.i_magazine +
+ vbi_bcd2dec( p_dec->fmt_in.subs.teletext.i_page );
+ var_SetInteger( p_dec, "vbi-page", p_sys->i_wanted_page );
+ }
+ p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
p_sys->b_opaque = var_CreateGetBool( p_dec, "vbi-opaque" );
var_AddCallback( p_dec, "vbi-opaque", Opaque, p_sys );
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',' ' ) );
+ /* Listen for keys */
+ var_AddCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_dec );
+
+ es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_CODEC_SPU );
if( p_sys->b_text )
- p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
+ p_dec->fmt_out.video.i_chroma = VLC_CODEC_TEXT;
else
- p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A');
+ p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGBA;
return VLC_SUCCESS;
}
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 );
+ var_DelCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_dec );
vlc_mutex_destroy( &p_sys->lock );
*****************************************************************************/
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_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 unsigned int i_wanted_subpage = p_sys->i_wanted_subpage;
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 */
+ memset( &p_page, 0, sizeof(vbi_page) );
b_cached = vbi_fetch_vt_page( p_sys->p_vbi_dec, &p_page,
vbi_dec2bcd( i_wanted_page ),
- VBI_ANY_SUBNO, VBI_WST_LEVEL_3p5,
- 25, FALSE );
+ i_wanted_subpage, VBI_WST_LEVEL_3p5,
+ 25, true );
- if( !b_cached )
+ if( i_wanted_page == p_sys->i_last_page && !p_sys->b_update )
goto error;
- if( ( i_wanted_page == p_sys->i_last_page ) &&
- ( p_sys->b_update != 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 = false;
p_sys->i_last_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') :
- VLC_FOURCC('R','G','B','A');
- fmt.i_aspect = p_sys->b_text ? 0 : VOUT_ASPECT_FACTOR;
- if( p_sys->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 = p_page.columns * 12;
- fmt.i_height = fmt.i_visible_height = p_page.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" );
- goto error;
- }
-
- 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 = (mtime_t) p_block->i_pts;
- p_spu->i_stop = (mtime_t) 0;
- p_spu->b_ephemer = true;
- p_spu->b_absolute = false;
- p_spu->b_pausable = true;
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 );
}
else
{
- picture_t *p_pic = &p_spu->p_region->picture;
+ picture_t *p_pic = p_spu->p_region->p_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->p_picture->p->p_pixels, 1, 1 );
- OpaquePage( p_dec, p_page, fmt, &p_spu->p_region->picture, b_opaque );
+ vlc_mutex_lock( &p_sys->lock );
+ memcpy( p_sys->nav_link, &p_page.nav_link, sizeof( p_sys->nav_link )) ;
+ vlc_mutex_unlock( &p_sys->lock );
- /* */
- 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;
+ OpaquePage( p_pic, p_page, fmt, b_opaque );
}
+exit:
vbi_unref_page( &p_page );
block_Release( p_block );
return p_spu;
vbi_unref_page( &p_page );
if( p_spu != NULL )
{
- p_dec->pf_spu_buffer_del( p_dec, p_spu );
+ decoder_DeleteSubpicture( p_dec, p_spu );
p_spu = NULL;
}
return NULL;
}
+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 = decoder_NewSubpicture( p_dec, NULL );
+ 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_CODEC_TEXT :
+ VLC_CODEC_RGBA;
+ if( b_text )
+ {
+ fmt.i_bits_per_pixel = 0;
+ fmt.i_sar_num = 0;
+ fmt.i_sar_den = 0;
+ }
+ else
+ {
+ fmt.i_sar_num = 1;
+ 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 = subpicture_region_New( &fmt );
+ if( p_spu->p_region == NULL )
+ {
+ msg_Err( p_dec, "cannot allocate SPU region" );
+ decoder_DeleteSubpicture( 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;
+
+ p_spu->i_start = i_pts;
+ p_spu->i_stop = 0;
+ p_spu->b_ephemer = true;
+ p_spu->b_absolute = false;
+
+ if( !b_text )
+ {
+ p_spu->i_original_picture_width = fmt.i_width;
+ 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;
#endif
if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) )
p_sys->b_update = true;
-
+#ifdef ZVBI_DEBUG
if( ev->ev.ttx_page.clock_update )
msg_Dbg( p_dec, "clock" );
-#ifdef ZVBI_DEBUG
if( ev->ev.ttx_page.header_update )
msg_Dbg( p_dec, "header" );
#endif
}
+ else if( ev->type == VBI_EVENT_CLOSE )
+ msg_Dbg( p_dec, "Close event" );
else if( ev->type == VBI_EVENT_CAPTION )
msg_Dbg( p_dec, "Caption line: %x", ev->ev.caption.pgno );
else if( ev->type == VBI_EVENT_NETWORK )
- msg_Dbg( p_dec, "Network change" );
+ {
+ msg_Dbg( p_dec, "Network change");
+ vbi_network n = ev->ev.network;
+ msg_Dbg( p_dec, "Network id:%d name: %s, call: %s ", n.nuid, n.name, n.call );
+ }
+ else if( ev->type == VBI_EVENT_TRIGGER )
+ msg_Dbg( p_dec, "Trigger event" );
else if( ev->type == VBI_EVENT_ASPECT )
msg_Dbg( p_dec, "Aspect update" );
- else if( ev->type == VBI_EVENT_NETWORK )
+ else if( ev->type == VBI_EVENT_PROG_INFO )
msg_Dbg( p_dec, "Program info received" );
+ else if( ev->type == VBI_EVENT_NETWORK_ID )
+ msg_Dbg( p_dec, "Network ID changed" );
}
-static int OpaquePage( decoder_t *p_dec, vbi_page p_page,
- video_format_t fmt, picture_t *p_src, bool b_opaque )
+static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+ const video_format_t fmt, bool b_opaque )
{
- decoder_sys_t *p_sys = (decoder_sys_t *) p_dec->p_sys;
unsigned int x, y;
- assert( fmt.i_chroma == VLC_FOURCC('R','G','B','A' ) );
+ assert( fmt.i_chroma == VLC_CODEC_RGBA );
/* Kludge since zvbi doesn't provide an option to specify opacity. */
for( y = 0; y < fmt.i_height; y++ )
for( x = 0; x < fmt.i_width; x++ )
{
const vbi_opacity opacity = p_page.text[ y/10 * p_page.columns + x/12 ].opacity;
+ const int background = p_page.text[ y/10 * p_page.columns + x/12 ].background;
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;
+ /* Display foreground and background color */
/* To make the boxed text "closed captioning" transparent
* change true to false.
*/
case VBI_OPAQUE:
+ /* alpha blend video into background color */
+ case VBI_SEMI_TRANSPARENT:
if( b_opaque )
break;
/* Full text transparency. only foreground color is show */
case VBI_TRANSPARENT_FULL:
- *p_pixel = 0;
- break;
- /* Transparency for boxed text */
- case VBI_SEMI_TRANSPARENT:
- if( (*p_pixel & 0xffffff00) == 0xff ) /* FIXME cannot be true ? */
+ if( (*p_pixel) == (0xff000000 | p_page.color_map[background] ) )
*p_pixel = 0;
break;
}
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);
vlc_mutex_lock( &p_sys->lock );
+ switch( newval.i_int )
+ {
+ case ZVBI_KEY_RED:
+ p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[0].pgno );
+ p_sys->i_wanted_subpage = p_sys->nav_link[0].subno;
+ break;
+ case ZVBI_KEY_GREEN:
+ p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[1].pgno );
+ p_sys->i_wanted_subpage = p_sys->nav_link[1].subno;
+ break;
+ case ZVBI_KEY_YELLOW:
+ p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[2].pgno );
+ p_sys->i_wanted_subpage = p_sys->nav_link[2].subno;
+ break;
+ case ZVBI_KEY_BLUE:
+ p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[3].pgno );
+ p_sys->i_wanted_subpage = p_sys->nav_link[3].subno;
+ break;
+ case ZVBI_KEY_INDEX:
+ p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[5].pgno ); /* #4 is SKIPPED */
+ p_sys->i_wanted_subpage = p_sys->nav_link[5].subno;
+ break;
+ }
if( newval.i_int > 0 && newval.i_int < 999 )
+ {
p_sys->i_wanted_page = newval.i_int;
+ p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
+ }
vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
vlc_mutex_lock( &p_sys->lock );
p_sys->b_opaque = newval.b_bool;
+ p_sys->b_update = true;
vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
return VLC_SUCCESS;
}
+
+#include <vlc_vout.h>
+#define OSDMessage(dec, fmt, ...) do { \
+ vout_thread_t *p_vout = vlc_object_find( dec, VLC_OBJECT_VOUT, FIND_ANYWHERE ); \
+ if( p_vout ) { \
+ vout_OSDMessage( p_vout, fmt, __VA_ARGS__ ); \
+ vlc_object_release( p_vout ); \
+ } } while(0)
+
+static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ decoder_t *p_dec = p_data;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+
+ /* FIXME: Capture + and - key for subpage browsing */
+ if( newval.i_int == '-' || newval.i_int == '+' )
+ {
+ vlc_mutex_lock( &p_sys->lock );
+ if( p_sys->i_wanted_subpage == VBI_ANY_SUBNO && newval.i_int == '+' )
+ p_sys->i_wanted_subpage = vbi_dec2bcd(1);
+ else if ( newval.i_int == '+' )
+ p_sys->i_wanted_subpage = vbi_add_bcd( p_sys->i_wanted_subpage, 1);
+ else if( newval.i_int == '-')
+ p_sys->i_wanted_subpage = vbi_add_bcd( p_sys->i_wanted_subpage, 0xF9999999); /* BCD complement - 1 */
+
+ if ( !vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x00 ) || vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x99 ) )
+ p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
+ else
+ OSDMessage( p_this, SPU_DEFAULT_CHANNEL, "%s: %d", _("Subpage"), vbi_bcd2dec( p_sys->i_wanted_subpage) );
+
+ p_sys->b_update = true;
+ vlc_mutex_unlock( &p_sys->lock );
+ }
+
+ /* Capture 0-9 for page selection */
+ if( newval.i_int < '0' || newval.i_int > '9' )
+ return VLC_SUCCESS;
+
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->i_key[0] = p_sys->i_key[1];
+ p_sys->i_key[1] = p_sys->i_key[2];
+ p_sys->i_key[2] = (int)(newval.i_int - '0');
+ OSDMessage( p_this, SPU_DEFAULT_CHANNEL, "%s: %c%c%c", _("Page"), (char)(p_sys->i_key[0]+'0'), (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') );
+
+ int i_new_page = 0;
+
+ if( p_sys->i_key[0] > 0 && p_sys->i_key[0] <= 8 &&
+ p_sys->i_key[1] >= 0 && p_sys->i_key[1] <= 9 &&
+ p_sys->i_key[2] >= 0 && p_sys->i_key[2] <= 9 )
+ {
+ i_new_page = p_sys->i_key[0]*100 + p_sys->i_key[1]*10 + p_sys->i_key[2];
+ p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0';
+ }
+ vlc_mutex_unlock( &p_sys->lock );
+
+ if( i_new_page > 0 )
+ var_SetInteger( p_dec, "vbi-page", i_new_page );
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff