/*****************************************************************************
- * 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>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <string.h>
+
#include <assert.h>
#include <vlc_common.h>
static void Eia608Init( eia608_t * );
static bool Eia608Parse( eia608_t *h, int i_channel_selected, const uint8_t data[2] );
static char *Eia608Text( eia608_t *h, bool b_html );
-static void Eia608Exit( eia608_t * );
/* It will be enough up to 63 B frames, which is far too high for
* broadcast environment */
#define CC_MAX_REORDER_SIZE (64)
struct decoder_sys_t
{
- int i;
-
int i_block;
block_t *pp_block[CC_MAX_REORDER_SIZE];
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- int i;
- for( i = 0; i < p_sys->i_block; i++ )
+ for( int i = 0; i < p_sys->i_block; i++ )
block_Release( p_sys->pp_block[i] );
- Eia608Exit( &p_sys->eia608 );
free( p_sys );
}
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
int i_index;
- int i;
/* XXX Cc captions data are OUT OF ORDER (because we receive them in the bitstream
* order (ie ordered by video picture dts) instead of the display order.
* We will simulate a simple IPB buffer scheme
p_block = p_sys->pp_block[i_index = 0];
if( p_block->i_pts > VLC_TS_INVALID )
{
- for( i = 1; i < p_sys->i_block-1; i++ )
+ for( int i = 1; i < p_sys->i_block-1; i++ )
{
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 )
static void Eia608ClearScreenRowX( eia608_t *h, int i_screen, int i_row, int x )
{
eia608_screen *screen = &h->screen[i_screen];
- int i;
if( x == 0 )
{
else
{
screen->row_used[i_row] = false;
- for( i = 0; i < x; i++ )
+ for( int i = 0; i < x; i++ )
{
if( screen->characters[i_row][i] != ' ' ||
screen->colors[i_row][i] != EIA608_COLOR_DEFAULT ||
static void Eia608ClearScreen( eia608_t *h, int i_screen )
{
- int i;
- for( i = 0; i < EIA608_SCREEN_ROWS; i++ )
+ for( int i = 0; i < EIA608_SCREEN_ROWS; i++ )
Eia608ClearScreenRow( h, i_screen, i );
}
eia608_screen *screen = &h->screen[i_screen];
int keep_lines;
- int i;
/* Window size */
if( h->mode == EIA608_MODE_ROLLUP_2 )
h->cursor.i_column = 0;
/* Erase lines above our window */
- for( i = 0; i < h->cursor.i_row - keep_lines; i++ )
+ for( int i = 0; i < h->cursor.i_row - keep_lines; i++ )
Eia608ClearScreenRow( h, i_screen, i );
/* Move up */
- for( i = 0; i < keep_lines-1; i++ )
+ for( int i = 0; i < keep_lines-1; i++ )
{
const int i_row = h->cursor.i_row - keep_lines + i + 1;
if( i_row < 0 )
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;
}
#undef E2
#undef E1
- static const int i_c2utf8 = sizeof(c2utf8)/sizeof(*c2utf8);
- int i;
+ for( size_t i = 0; i < ARRAY_SIZE(c2utf8) ; i++ )
+ if( c2utf8[i].c == c ) {
+ strcpy( psz_utf8, c2utf8[i].utf8 );
+ return;
+ }
- for( i = 0; i < i_c2utf8; i++ )
- {
- if( c2utf8[i].c == c )
- break;
- }
- if( i >= i_c2utf8 )
- {
- psz_utf8[0] = c < 0x80 ? c : '?'; /* Normal : Unsupported */
- psz_utf8[1] = '\0';
- }
- else
- {
- strcpy( psz_utf8, c2utf8[i].utf8 );
- }
+ psz_utf8[0] = c < 0x80 ? c : '?'; /* Normal : Unsupported */
+ psz_utf8[1] = '\0';
}
static void Eia608Strlcat( char *d, const char *s, int i_max )
struct eia608_screen *screen = &h->screen[h->i_screen];
bool b_first = true;
char *psz;
- int i;
/* We allocate a buffer big enough for normal case */
psz = malloc( i_size );
*psz = '\0';
if( b_html )
Eia608Strlcat( psz, "<text>", i_size );
- for( i = 0; i < EIA608_SCREEN_ROWS; i++ )
+ for( int i = 0; i < EIA608_SCREEN_ROWS; i++ )
{
if( !screen->row_used[i] )
continue;
Eia608Strlcat( psz, "</text>", i_size );
return psz;
}
-
-static void Eia608Exit( eia608_t *h )
-{
- VLC_UNUSED( h );
-}
-
projects / vlc / blobdiff