OPAQUE_TEXT, OPAQUE_LONGTEXT, false )
add_integer( "vbi-position", 8, POS_TEXT, POS_LONGTEXT, false )
change_integer_list( pi_pos_values, ppsz_pos_descriptions );
- add_bool( "vbi-text", true,
+ add_bool( "vbi-text", false,
TELX_TEXT, TELX_LONGTEXT, false )
vlc_module_end ()
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,
+static int OpaquePage( picture_t *p_src, const vbi_page *p_page,
const video_format_t fmt, bool b_opaque, const int text_offset );
static int get_first_visible_row( vbi_char *p_text, int rows, int columns);
static int get_last_visible_row( vbi_char *p_text, int rows, int columns);
if( ( i_id == 0x02 || i_id == 0x03 ) && i_size >= 44 && i_lines < MAX_SLICES )
{
- unsigned line_offset = p_block->p_buffer[2] & 0x1f;
- unsigned field_parity = p_block->p_buffer[2] & 0x20;
-
- p_sliced[i_lines].id = VBI_SLICED_TELETEXT_B;
- if( line_offset > 0 )
- p_sliced[i_lines].line = line_offset + (field_parity ? 0 : 313);
- else
- p_sliced[i_lines].line = 0;
- for( int i = 0; i < 42; i++ )
- p_sliced[i_lines].data[i] = vbi_rev8( p_block->p_buffer[4 + i] );
- i_lines++;
+ if(p_block->p_buffer[3] == 0xE4 ) /* framing_code */
+ {
+ unsigned line_offset = p_block->p_buffer[2] & 0x1f;
+ unsigned field_parity = p_block->p_buffer[2] & 0x20;
+
+ p_sliced[i_lines].id = VBI_SLICED_TELETEXT_B;
+ if( line_offset > 0 )
+ p_sliced[i_lines].line = line_offset + (field_parity ? 0 : 313);
+ else
+ p_sliced[i_lines].line = 0;
+ for( int i = 0; i < 42; i++ )
+ p_sliced[i_lines].data[i] = vbi_rev8( p_block->p_buffer[4 + i] );
+ i_lines++;
+ }
}
p_block->i_buffer -= 2 + i_size;
if( !b_cached )
{
- if( p_sys->i_last_page != i_wanted_page )
+ if( p_sys->b_text && p_sys->i_last_page != i_wanted_page )
{
/* We need to reset the subtitle */
p_spu = Subpicture( p_dec, &fmt, true,
/* Ignore transparent rows at the beginning and end */
int i_first_row = get_first_visible_row( p_page.text, p_page.rows, p_page.columns );
- if ( i_first_row < 0 )
- goto error;
- int i_num_rows = get_last_visible_row( p_page.text, p_page.rows, p_page.columns ) - i_first_row + 1;
+ int i_num_rows;
+ if ( i_first_row < 0 ) {
+ i_first_row = p_page.rows - 1;
+ i_num_rows = 0;
+ } else {
+ i_num_rows = get_last_visible_row( p_page.text, p_page.rows, p_page.columns ) - i_first_row + 1;
+ }
#ifdef ZVBI_DEBUG
msg_Dbg( p_dec, "After top and tail of page we have rows %i-%i of %i",
i_first_row + 1, i_first_row + i_num_rows, p_page.rows );
memcpy( p_sys->nav_link, &p_page.nav_link, sizeof( p_sys->nav_link )) ;
vlc_mutex_unlock( &p_sys->lock );
- OpaquePage( p_pic, p_page, fmt, b_opaque, i_first_row * p_page.columns );
+ OpaquePage( p_pic, &p_page, fmt, b_opaque, i_first_row * p_page.columns );
}
exit:
error:
vbi_unref_page( &p_page );
- if( p_spu != NULL )
- {
- decoder_DeleteSubpicture( p_dec, p_spu );
- p_spu = NULL;
- }
-
block_Release( p_block );
return NULL;
}
return NULL;
}
- memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA;
- fmt.i_sar_num = 0;
- fmt.i_sar_den = 1;
+ video_format_Init(&fmt, b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA);
if( b_text )
{
fmt.i_bits_per_pixel = 0;
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_sar_num = fmt.i_sar_den = 0; /* let the vout set the correct AR */
}
fmt.i_x_offset = fmt.i_y_offset = 0;
if( p_spu->p_region == NULL )
{
msg_Err( p_dec, "cannot allocate SPU region" );
- decoder_DeleteSubpicture( p_dec, p_spu );
+ subpicture_Delete( p_spu );
return NULL;
}
p_spu->p_region->i_y = 0;
p_spu->i_start = i_pts;
- p_spu->i_stop = b_text ? i_pts + 1000000 : 0;
+ p_spu->i_stop = b_text ? i_pts + (10*CLOCK_FREQ): 0;
p_spu->b_ephemer = true;
p_spu->b_absolute = b_text ? false : true;
}
}
- return rows;
+ return -1;
}
static int get_last_visible_row( vbi_char *p_text, int rows, int columns)
{
if (p_text[i].opacity != VBI_TRANSPARENT_SPACE)
{
- return ( i + columns - 1) / columns;
+ return i / columns;
}
}
- return 0;
+ return -1;
}
-static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+static int OpaquePage( picture_t *p_src, const vbi_page *p_page,
const video_format_t fmt, bool b_opaque, const int text_offset )
{
unsigned int x, y;
{
for( x = 0; x < fmt.i_width; x++ )
{
- const vbi_opacity opacity = p_page.text[ text_offset + y/10 * p_page.columns + x/12 ].opacity;
- const int background = p_page.text[ text_offset + y/10 * p_page.columns + x/12 ].background;
+ const vbi_opacity opacity = p_page->text[ text_offset + y/10 * p_page->columns + x/12 ].opacity;
+ const int background = p_page->text[ text_offset + 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 )
break;
/* Full text transparency. only foreground color is show */
case VBI_TRANSPARENT_FULL:
- if( (*p_pixel) == (0xff000000 | p_page.color_map[background] ) )
+ if( (*p_pixel) == (0xff000000 | p_page->color_map[background] ) )
*p_pixel = 0;
break;
}
{
decoder_sys_t *p_sys = p_data;
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+ int want_navlink = -1;
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;
+ want_navlink = 0;
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;
+ want_navlink = 1;
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;
+ want_navlink = 2;
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;
+ want_navlink = 3;
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;
+ want_navlink = 5; /* #4 is SKIPPED */
break;
}
- if( newval.i_int > 0 && newval.i_int < 999 )
+
+ if (want_navlink > -1)
+ {
+ int page = vbi_bcd2dec( p_sys->nav_link[want_navlink].pgno );
+ if (page > 0 && page < 999) {
+ p_sys->i_wanted_page = page;
+ p_sys->i_wanted_subpage = p_sys->nav_link[want_navlink].subno;
+ }
+ }
+ else 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;
projects / vlc / blobdiff