#include <vlc_codec.h>
#include <vlc_input.h>
-#include <vlc_osd.h>
#include <vlc_filter.h>
#include <vlc_image.h>
#include <vlc_charset.h>
#include <vlc_stream.h>
#include <vlc_xml.h>
-#include <errno.h>
#include <string.h>
#include <assert.h>
return NULL;
p_block = p_sys->pp_block[i_index = 0];
- if( p_block->i_pts > 0 )
+ if( p_block->i_pts > VLC_TS_INVALID )
{
for( i = 1; i < p_sys->i_block-1; i++ )
{
- if( p_sys->pp_block[i]->i_pts > 0 && p_block->i_pts > 0 &&
+ if( p_sys->pp_block[i]->i_pts > VLC_TS_INVALID && p_block->i_pts > VLC_TS_INVALID &&
p_sys->pp_block[i]->i_pts < p_block->i_pts )
p_block = p_sys->pp_block[i_index = i];
}
video_format_t fmt;
/* We cannot display a subpicture with no date */
- if( i_pts == 0 )
+ if( i_pts <= VLC_TS_INVALID )
{
msg_Warn( p_dec, "subtitle without a date" );
return NULL;
EnsureUTF8( psz_html );
/* Create the subpicture unit */
- p_spu = decoder_NewSubpicture( p_dec );
+ p_spu = decoder_NewSubpicture( p_dec, NULL );
if( !p_spu )
{
msg_Warn( p_dec, "can't get spu buffer" );
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_TEXT;
- fmt.i_aspect = 0;
fmt.i_width = fmt.i_height = 0;
fmt.i_x_offset = fmt.i_y_offset = 0;
p_spu->p_region = subpicture_region_New( &fmt );
static void Eia608RollUp( eia608_t *h )
{
+ if( h->mode == EIA608_MODE_TEXT )
+ return;
+
const int i_screen = Eia608GetWritingScreenIndex( h );
eia608_screen *screen = &h->screen[i_screen];
/* Reset current row */
Eia608ClearScreenRow( h, i_screen, h->cursor.i_row );
}
-static void Eia608ParseChannel( eia608_t *h, uint8_t d[2] )
+static void Eia608ParseChannel( eia608_t *h, const uint8_t d[2] )
{
/* Check odd parity */
static const int p4[16] = {
/* */
const int d1 = d[0] & 0x7f;
- const int d2 = d[1] & 0x7f;
- if( d1 == 0x14 )
- h->i_channel = 1;
- else if( d1 == 0x1c )
- h->i_channel = 2;
- else if( d1 == 0x15 )
+ if( d1 >= 0x10 && d1 <= 0x1f )
+ h->i_channel = 1 + ((d1 & 0x08) != 0);
+ else if( d1 < 0x10 )
h->i_channel = 3;
- else if( d1 == 0x1d )
- h->i_channel = 4;
}
static bool Eia608ParseTextAttribute( eia608_t *h, uint8_t d2 )
{
static void Eia608Exit( eia608_t *h )
{
+ VLC_UNUSED( h );
}