/*****************************************************************************
- * cc608.c : CC 608/708 subtitles decoder
+ * cc.c : CC 608/708 subtitles decoder
*****************************************************************************
- * Copyright (C) 2007 Laurent Aimar
- * $Id$
+ * Copyright © 2007-2010 Laurent Aimar, 2011 VLC authors and VideoLAN
*
* Authors: Laurent Aimar < fenrir # via.ecp.fr>
*
# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
#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>
+#include "substext.h"
/*****************************************************************************
* Module descriptor.
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_shortname( N_("CC 608/708"));
- set_description( N_("Closed Captions decoder") );
- set_capability( "decoder", 50 );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( N_("CC 608/708"))
+ set_description( N_("Closed Captions decoder") )
+ set_capability( "decoder", 50 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
p_dec->pf_decode_sub = Decode;
/* Allocate the memory needed to store the decoder's structure */
- p_dec->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+ p_dec->p_sys = p_sys = calloc( 1, sizeof( *p_sys ) );
if( p_sys == NULL )
return VLC_ENOMEM;
/* init of p_sys */
- memset( p_sys, 0, sizeof( *p_sys ) );
- p_sys->i_block = 0;
-
p_sys->i_field = i_field;
p_sys->i_channel = i_channel;
Eia608Init( &p_sys->eia608 );
+ p_dec->fmt_out.i_cat = SPU_ES;
+ p_dec->fmt_out.i_codec = VLC_CODEC_TEXT;
+
return VLC_SUCCESS;
}
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];
}
{
//decoder_sys_t *p_sys = p_dec->p_sys;
subpicture_t *p_spu = NULL;
- 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 = p_dec->pf_spu_buffer_new( p_dec );
+ p_spu = decoder_NewSubpictureText( p_dec );
if( !p_spu )
{
- msg_Warn( p_dec, "can't get spu buffer" );
- free( psz_subtitle );
- free( psz_html );
- return NULL;
- }
-
- p_spu->b_pausable = true;
-
- /* Create a new subpicture region */
- memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('T','E','X','T');
- fmt.i_aspect = 0;
- fmt.i_width = fmt.i_height = 0;
- 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 )
- {
- msg_Err( p_dec, "cannot allocate SPU region" );
free( psz_subtitle );
free( psz_html );
- p_dec->pf_spu_buffer_del( p_dec, p_spu );
return NULL;
}
+ p_spu->i_start = i_pts;
+ p_spu->i_stop = i_pts + 10000000; /* 10s max */
+ p_spu->b_ephemer = true;
+ p_spu->b_absolute = false;
- /* Decode and format the subpicture unit */
- /* Normal text subs, easy markup */
- p_spu->p_region->i_align = SUBPICTURE_ALIGN_BOTTOM;// | SUBPICTURE_ALIGN_LEFT;// | p_sys->i_align;
- p_spu->i_x = 0; //p_sys->i_align ? 20 : 0;
- p_spu->i_y = 10;
-
- p_spu->p_region->psz_text = psz_subtitle;
- p_spu->p_region->psz_html = psz_html;
+ subpicture_updater_sys_t *p_spu_sys = p_spu->updater.p_sys;
- p_spu->i_start = i_pts;
- p_spu->i_stop = i_pts + 10000000; /* 10s max */
- p_spu->b_ephemer = true;
- p_spu->b_absolute = false;
+ p_spu_sys->align = SUBPICTURE_ALIGN_BOTTOM;
+ p_spu_sys->text = psz_subtitle;
+ p_spu_sys->html = psz_html;
return p_spu;
}
static subpicture_t *Convert( decoder_t *p_dec, block_t *p_block )
{
+ assert( p_block );
+
decoder_sys_t *p_sys = p_dec->p_sys;
const int64_t i_pts = p_block->i_pts;
bool b_changed = false;
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 d1 )
+static void Eia608ParseChannel( eia608_t *h, const uint8_t d[2] )
{
- if( d1 == 0x14 )
- h->i_channel = 1;
- else if( d1 == 0x1c )
- h->i_channel = 2;
- else if( ( d1 >= 0x01 && d1 <= 0x0f ) || d1 == 0x15 )
+ /* Check odd parity */
+ static const int p4[16] = {
+ 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0
+ };
+ if( p4[d[0] & 0xf] == p4[d[0] >> 4] ||
+ p4[d[1] & 0xf] == p4[ d[1] >> 4] )
+ {
+ h->i_channel = -1;
+ return;
+ }
+
+ /* */
+ const int d1 = d[0] & 0x7f;
+ 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 )
{
else if( d2 >= 0x40 )
d2 -= 0x40;
h->cursor.i_column = pac2_attribs[d2].i_column;
+ h->color = pac2_attribs[d2].i_color;
+ h->font = pac2_attribs[d2].i_font;
+
return false;
}
E2( 0x86, 0xc2,0xa3), // Pounds sterling
E3( 0x87, 0xe2,0x99,0xaa), // Music note
E2( 0x88, 0xc3,0xa0), // lowercase a, grave accent
- E1( 0x89, 0x20), // transparent space, we make it regular
+ E2( 0x89, 0xc2,0xa0), // transparent space
E2( 0x8a, 0xc3,0xa8), // lowercase e, grave accent
E2( 0x8b, 0xc3,0xa2), // lowercase a, circumflex accent
E2( 0x8c, 0xc3,0xaa), // lowercase e, circumflex accent
E2( 0x94, 0xc3,0x9c), // capital letter U with diaresis
E2( 0x95, 0xc3,0xbc), // lowercase letter U with diaeresis
E1( 0x96, 0x27), // apostrophe
- E2( 0x97, 0xc1,0xa1), // inverted exclamation mark
+ E2( 0x97, 0xc2,0xa1), // inverted exclamation mark
E1( 0x98, 0x2a), // asterisk
E1( 0x99, 0x27), // apostrophe (yes, duped). See CCADI source code.
E1( 0x9a, 0x2d), // hyphen-minus
E2( 0x9b, 0xc2,0xa9), // copyright sign
E3( 0x9c, 0xe2,0x84,0xa0), // Service mark
E1( 0x9d, 0x2e), // Full stop (.)
- E1( 0x9e, 0x22), // Quoatation mark
- E1( 0x9f, 0x22), // Quoatation mark
+ E3( 0x9e, 0xe2,0x80,0x9c), // Quotation mark
+ E3( 0x9f, 0xe2,0x80,0x9d), // Quotation mark
E2( 0xa0, 0xc3,0x80), // uppercase A, grave accent
E2( 0xa1, 0xc3,0x82), // uppercase A, circumflex
E2( 0xa2, 0xc3,0x87), // uppercase C with cedilla
/* Be sure to create valid html */
b_close_italics |= b_last_italics && b_close_color;
- b_close_underline = b_last_underline && ( b_close_italics || b_close_color );
+ b_close_underline |= b_last_underline && ( b_close_italics || b_close_color );
if( b_close_underline )
CAT( "</u>" );
}
static bool Eia608Parse( eia608_t *h, int i_channel_selected, const uint8_t data[2] )
{
- const uint8_t d1 = data[0] & 0x7f; /* Removed parity bit TODO we might want to check them */
+ const uint8_t d1 = data[0] & 0x7f; /* Removed parity bit */
const uint8_t d2 = data[1] & 0x7f;
bool b_screen_changed = false;
if( d1 == 0 && d2 == 0 )
- return false; /* Ignore padding */
+ return false; /* Ignore padding (parity check are sometimes invalid on them) */
- Eia608ParseChannel( h, d1 );
+ Eia608ParseChannel( h, data );
if( h->i_channel != i_channel_selected )
return false;
//fprintf( stderr, "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC %x %x\n", data[0], data[1] );
static void Eia608Exit( eia608_t *h )
{
+ VLC_UNUSED( h );
}
projects / vlc / blobdiff