#include <libzvbi.h>
#include <vlc_codec.h>
-#include <vlc_vout_osd.h>
/*****************************************************************************
* Module descriptor.
#define PAGE_LONGTEXT N_("Open the indicated Teletext page." \
"Default page is index 100")
-#define OPAQUE_TEXT N_("Text is always opaque")
+#define OPAQUE_TEXT N_("Teletext transparency")
#define OPAQUE_LONGTEXT N_("Setting vbi-opaque to false " \
"makes the boxed text transparent." )
DATA_UNIT_STUFFING = 0xFF,
} data_unit_id;
+#define MAX_SLICES 32
+
struct decoder_sys_t
{
vbi_decoder * p_vbi_dec;
- vbi_dvb_demux * p_dvb_demux;
+ vbi_sliced p_vbi_sliced[MAX_SLICES];
unsigned int i_last_page;
bool b_update;
bool b_text; /* Subtitles as text */
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 );
vlc_mutex_init( &p_sys->lock );
- if( (p_sys->p_vbi_dec == NULL) || (p_sys->p_dvb_demux == NULL) )
+ if( p_sys->p_vbi_dec == NULL )
{
- msg_Err( p_dec, "VBI decoder/demux could not be created." );
+ msg_Err( p_dec, "VBI decoder could not be created." );
Close( p_this );
return VLC_ENOMEM;
}
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:
*****************************************************************************/
video_format_t fmt;
bool b_cached = false;
vbi_page p_page;
- const uint8_t *p_pos;
- unsigned int i_left;
if( (pp_block == NULL) || (*pp_block == NULL) )
return NULL;
p_block = *pp_block;
*pp_block = NULL;
- p_pos = p_block->p_buffer;
- i_left = p_block->i_buffer;
-
- while( i_left > 0 )
+ if( p_block->i_buffer > 0 &&
+ ( ( p_block->p_buffer[0] >= 0x10 && p_block->p_buffer[0] <= 0x1f ) ||
+ ( p_block->p_buffer[0] >= 0x99 && p_block->p_buffer[0] <= 0x9b ) ) )
{
- vbi_sliced p_sliced[MAX_SLICES];
- unsigned int i_lines = 0;
- int64_t i_pts;
+ vbi_sliced *p_sliced = p_sys->p_vbi_sliced;
+ unsigned int i_lines = 0;
- i_lines = vbi_dvb_demux_cor( p_sys->p_dvb_demux, p_sliced,
- MAX_SLICES, &i_pts, &p_pos, &i_left );
+ p_block->i_buffer--;
+ p_block->p_buffer++;
+ while( p_block->i_buffer >= 2 )
+ {
+ int i_id = p_block->p_buffer[0];
+ unsigned i_size = p_block->p_buffer[1];
+
+ if( 2 + i_size > p_block->i_buffer )
+ break;
+
+ 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++;
+ }
+
+ p_block->i_buffer -= 2 + i_size;
+ p_block->p_buffer += 2 + i_size;
+ }
if( i_lines > 0 )
- vbi_decode( p_sys->p_vbi_dec, p_sliced, i_lines, i_pts / 90000.0 );
+ vbi_decode( p_sys->p_vbi_dec, p_sliced, i_lines, (double)p_block->i_pts / 1000000 );
}
/* */
}
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = b_text ? VLC_CODEC_TEXT :
- VLC_CODEC_RGBA;
+ fmt.i_chroma = b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA;
+ fmt.i_sar_num = 0;
+ fmt.i_sar_den = 1;
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;
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);
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED( p_this );
/* FIXME: Capture + and - key for subpage browsing */
if( newval.i_int == '-' || newval.i_int == '+' )
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) );
+ msg_Info( p_dec, "subpage: %d",
+ vbi_bcd2dec( p_sys->i_wanted_subpage) );
p_sys->b_update = true;
vlc_mutex_unlock( &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') );
+ msg_Info( p_dec, "page: %c%c%c", (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;
projects / vlc / blobdiff