/*****************************************************************************
- * telx.c : Minimalistic Teletext subtitles decoder
+ * zvbi.c : VBI and Teletext PES demux and decoder using libzvbi
*****************************************************************************
- * Copyright (C) 2007 Vincent Penne
- * Some code converted from ProjectX java dvb decoder (c) 2001-2005 by dvb.matt
+ * Copyright (C) 2007, M2X
* $Id$
*
+ * Authors: Derk-Jan Hartman <djhartman at m2x dot nl>
+ * Jean-Paul Saman <jpsaman at m2x dot nl>
+ *
* 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
* http://pdc.ro.nu/teletext.html
*
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <assert.h>
-#include <stdint.h>
-#include "vlc_vout.h"
-#include "vlc_bits.h"
-#include "vlc_codec.h"
+/* This module implements:
+ * ETSI EN 301 775: VBI data in PES
+ * ETSI EN 300 472: EBU Teletext data in PES
+ * ETSI EN 300 706: Enhanced Teletext (libzvbi)
+ * ETSI EN 300 231: Video Programme System [VPS] (libzvbi)
+ * ETSI EN 300 294: 625-line Wide Screen Signaling [WSS] (libzvbi)
+ * EIA-608 Revision A: Closed Captioning [CC] (libzvbi)
+ */
-/* #define TELX_DEBUG */
-#ifdef TELX_DEBUG
-# define dbg( a ) msg_Dbg a
-#else
-# define dbg( a )
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <assert.h>
+#include <libzvbi.h>
+
+#include <vlc_vout.h>
+#include <vlc_codec.h>
+#include <vlc_osd.h>
+
/*****************************************************************************
* Module descriptor.
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-static subpicture_t *Decode( decoder_t *, block_t ** );
-#define OVERRIDE_PAGE_TEXT N_("Override page")
-#define OVERRIDE_PAGE_LONGTEXT N_("Override the indicated page, try this if " \
- "your subtitles don't appear (-1 = autodetect from TS, " \
- "0 = autodetect from teletext, " \
- ">0 = actual page number, usually 888 or 889).")
-
-#define IGNORE_SUB_FLAG_TEXT N_("Ignore subtitle flag")
-#define IGNORE_SUB_FLAG_LONGTEXT N_("Ignore the subtitle flag, try this if " \
- "your subtitles don't appear.")
-
-#define FRENCH_WORKAROUND_TEXT N_("Workaround for France")
-#define FRENCH_WORKAROUND_LONGTEXT N_("Some French channels do not flag " \
- "their subtitling pages correctly due to a historical " \
- "interpretation mistake. Try using this wrong interpretation if " \
- "your subtitles don't appear.")
-
-vlc_module_begin();
- set_description( _("Teletext subtitles decoder") );
- set_shortname( "Teletext" );
- set_capability( "decoder", 50 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_SCODEC );
- set_callbacks( Open, Close );
-
- add_integer( "telx-override-page", -1, NULL,
- OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, VLC_TRUE );
- add_bool( "telx-ignore-subtitle-flag", 0, NULL,
- IGNORE_SUB_FLAG_TEXT, IGNORE_SUB_FLAG_LONGTEXT, VLC_TRUE );
- add_bool( "telx-french-workaround", 0, NULL,
- FRENCH_WORKAROUND_TEXT, FRENCH_WORKAROUND_LONGTEXT, VLC_TRUE );
-
-vlc_module_end();
+#define PAGE_TEXT N_("Teletext page")
+#define PAGE_LONGTEXT N_("Open the indicated Teletext page." \
+ "Default page is index 100")
+
+#define OPAQUE_TEXT N_("Text is always opaque")
+#define OPAQUE_LONGTEXT N_("Setting vbi-opaque to false " \
+ "makes the boxed text transparent." )
+
+#define POS_TEXT N_("Teletext alignment")
+#define POS_LONGTEXT N_( \
+ "You can enforce the teletext position on the video " \
+ "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
+ "also use combinations of these values, eg. 6 = top-right).")
+
+#define TELX_TEXT N_("Teletext text subtitles")
+#define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
+ "instead of as RGBA" )
+
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
+{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
+ N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
+
+vlc_module_begin ()
+ set_description( N_("VBI and Teletext decoder") )
+ set_shortname( N_("VBI & Teletext") )
+ set_capability( "decoder", 51 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_SCODEC )
+ set_callbacks( Open, Close )
+
+ add_integer( "vbi-page", 100, NULL,
+ PAGE_TEXT, PAGE_LONGTEXT, false );
+ add_bool( "vbi-opaque", true, NULL,
+ OPAQUE_TEXT, OPAQUE_LONGTEXT, false );
+ add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false )
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
+ add_bool( "vbi-text", false, NULL,
+ TELX_TEXT, TELX_LONGTEXT, false );
+vlc_module_end ()
/****************************************************************************
* Local structures
****************************************************************************/
-struct decoder_sys_t
-{
- int i_align;
- vlc_bool_t b_is_subtitle[9];
- char ppsz_lines[32][128];
- char psz_prev_text[512];
- mtime_t prev_pts;
- int i_page[9];
- vlc_bool_t b_erase[9];
- uint16_t * pi_active_national_set[9];
- int i_wanted_page, i_wanted_magazine;
- vlc_bool_t b_ignore_sub_flag;
+// #define ZVBI_DEBUG
+
+//Guessing table for missing "default region triplet"
+static const int pi_default_triplet[] = {
+ 0, 0, // slo cze
+ 8, // pol
+ 24,24,24,24, //ssc scr slv rum
+ 32,32,32,32,32, //est lit rus bul ukr
+ 48,48, //gre ell
+ 64, //ara
+ 88, //heb
+ 16 }; //default
+static const char *const ppsz_default_triplet[] = {
+ "slo", "cze",
+ "pol",
+ "ssc", "scr", "slv", "rum",
+ "est", "lit", "rus", "bul", "ukr",
+ "gre", "ell",
+ "ara",
+ "heb",
+ NULL
};
-/****************************************************************************
- * Local data
- ****************************************************************************/
-
-/*
- * My doc only mentions 13 national characters, but experiments show there
- * are more, in france for example I already found two more (0x9 and 0xb).
- *
- * Conversion is in this order :
- *
- * 0x23 0x24 0x40 0x5b 0x5c 0x5d 0x5e 0x5f 0x60 0x7b 0x7c 0x7d 0x7e
- * (these are the standard ones)
- * 0x08 0x09 0x0a 0x0b 0x0c 0x0d (apparently a control character) 0x0e 0x0f
- */
-
-static uint16_t ppi_national_subsets[][20] =
-{
- { 0x00a3, 0x0024, 0x0040, 0x00ab, 0x00bd, 0x00bb, 0x005e, 0x0023,
- 0x002d, 0x00bc, 0x00a6, 0x00be, 0x00f7 }, /* english ,000 */
-
- { 0x00e9, 0x00ef, 0x00e0, 0x00eb, 0x00ea, 0x00f9, 0x00ee, 0x0023,
- 0x00e8, 0x00e2, 0x00f4, 0x00fb, 0x00e7, 0, 0x00eb, 0, 0x00ef }, /* french ,001 */
-
- { 0x0023, 0x00a4, 0x00c9, 0x00c4, 0x00d6, 0x00c5, 0x00dc, 0x005f,
- 0x00e9, 0x00e4, 0x00f6, 0x00e5, 0x00fc }, /* swedish,finnish,hungarian ,010 */
-
- { 0x0023, 0x016f, 0x010d, 0x0165, 0x017e, 0x00fd, 0x00ed, 0x0159,
- 0x00e9, 0x00e1, 0x0115, 0x00fa, 0x0161 }, /* czech,slovak ,011 */
-
- { 0x0023, 0x0024, 0x00a7, 0x00c4, 0x00d6, 0x00dc, 0x005e, 0x005f,
- 0x00b0, 0x00e4, 0x00f6, 0x00fc, 0x00df }, /* german ,100 */
-
- { 0x00e7, 0x0024, 0x00a1, 0x00e1, 0x00e9, 0x00ed, 0x00f3, 0x00fa,
- 0x00bf, 0x00fc, 0x00f1, 0x00e8, 0x00e0 }, /* portuguese,spanish ,101 */
+typedef enum {
+ ZVBI_KEY_RED = 'r' << 16,
+ ZVBI_KEY_GREEN = 'g' << 16,
+ ZVBI_KEY_YELLOW = 'y' << 16,
+ ZVBI_KEY_BLUE = 'b' << 16,
+ ZVBI_KEY_INDEX = 'i' << 16,
+} ttxt_key_id;
- { 0x00a3, 0x0024, 0x00e9, 0x00b0, 0x00e7, 0x00bb, 0x005e, 0x0023,
- 0x00f9, 0x00e0, 0x00f2, 0x00e8, 0x00ec }, /* italian ,110 */
+typedef enum {
+ DATA_UNIT_EBU_TELETEXT_NON_SUBTITLE = 0x02,
+ DATA_UNIT_EBU_TELETEXT_SUBTITLE = 0x03,
+ DATA_UNIT_EBU_TELETEXT_INVERTED = 0x0C,
- { 0x0023, 0x00a4, 0x0162, 0x00c2, 0x015e, 0x0102, 0x00ce, 0x0131,
- 0x0163, 0x00e2, 0x015f, 0x0103, 0x00ee }, /* rumanian ,111 */
+ DATA_UNIT_ZVBI_WSS_CPR1204 = 0xB4,
+ DATA_UNIT_ZVBI_CLOSED_CAPTION_525 = 0xB5,
+ DATA_UNIT_ZVBI_MONOCHROME_SAMPLES_525 = 0xB6,
- /* I have these tables too, but I don't know how they can be triggered */
- { 0x0023, 0x0024, 0x0160, 0x0117, 0x0119, 0x017d, 0x010d, 0x016b,
- 0x0161, 0x0105, 0x0173, 0x017e, 0x012f }, /* lettish,lithuanian ,1000 */
+ DATA_UNIT_VPS = 0xC3,
+ DATA_UNIT_WSS = 0xC4,
+ DATA_UNIT_CLOSED_CAPTION = 0xC5,
+ DATA_UNIT_MONOCHROME_SAMPLES = 0xC6,
- { 0x0023, 0x0144, 0x0105, 0x005a, 0x015a, 0x0141, 0x0107, 0x00f3,
- 0x0119, 0x017c, 0x015b, 0x0142, 0x017a }, /* polish, 1001 */
+ DATA_UNIT_STUFFING = 0xFF,
+} data_unit_id;
- { 0x0023, 0x00cb, 0x010c, 0x0106, 0x017d, 0x0110, 0x0160, 0x00eb,
- 0x010d, 0x0107, 0x017e, 0x0111, 0x0161 }, /* serbian,croatian,slovenian, 1010 */
-
- { 0x0023, 0x00f5, 0x0160, 0x00c4, 0x00d6, 0x017e, 0x00dc, 0x00d5,
- 0x0161, 0x00e4, 0x00f6, 0x017e, 0x00fc }, /* estonian ,1011 */
-
- { 0x0054, 0x011f, 0x0130, 0x015e, 0x00d6, 0x00c7, 0x00dc, 0x011e,
- 0x0131, 0x015f, 0x00f6, 0x00e7, 0x00fc }, /* turkish ,1100 */
+struct decoder_sys_t
+{
+ vbi_decoder * p_vbi_dec;
+ vbi_dvb_demux * p_dvb_demux;
+ unsigned int i_last_page;
+ bool b_update;
+ bool b_text; /* Subtitles as text */
+
+ vlc_mutex_t lock; /* Lock to protect the following variables */
+ /* Positioning of Teletext images */
+ int i_align;
+ /* */
+ unsigned int i_wanted_page;
+ unsigned int i_wanted_subpage;
+ /* */
+ bool b_opaque;
+ struct {
+ int pgno, subno;
+ } nav_link[6];
+ int i_key[3];
};
+static subpicture_t *Decode( decoder_t *, block_t ** );
+
+static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
+ bool b_text,
+ int i_columns, int i_rows,
+ 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,
+ const video_format_t fmt, bool b_opaque );
+
+/* Properties callbacks */
+static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int Opaque( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int Position( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data );
/*****************************************************************************
* Open: probe the decoder and return score
{
decoder_t *p_dec = (decoder_t *) p_this;
decoder_sys_t *p_sys = NULL;
- vlc_value_t val;
- int i;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x'))
- {
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
return VLC_EGENERIC;
- }
p_dec->pf_decode_sub = Decode;
p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
if( p_sys == NULL )
- {
- msg_Err( p_dec, "out of memory" );
return VLC_ENOMEM;
- }
-
-
memset( p_sys, 0, sizeof(decoder_sys_t) );
- p_sys->i_align = 0;
- for ( i = 0; i < 9; i++ )
- p_sys->pi_active_national_set[i] = ppi_national_subsets[1];
+ 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 );
- var_Create( p_dec, "telx-override-page",
- VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "telx-override-page", &val );
- if( val.i_int == -1 && p_dec->fmt_in.subs.dvb.i_id != -1 )
+ if( (p_sys->p_vbi_dec == NULL) || (p_sys->p_dvb_demux == NULL) )
{
- p_sys->i_wanted_magazine = p_dec->fmt_in.subs.dvb.i_id >> 16;
- if( p_sys->i_wanted_magazine == 0 )
- p_sys->i_wanted_magazine = 8;
- p_sys->i_wanted_page = p_dec->fmt_in.subs.dvb.i_id & 0xff;
-
- var_Create( p_dec, "telx-french-workaround",
- VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "telx-french-workaround", &val );
- if( p_sys->i_wanted_page < 100 &&
- (val.b_bool || (p_sys->i_wanted_page % 16) >= 10))
- {
- /* See http://www.nada.kth.se/~ragge/vdr/ttxtsubs/TROUBLESHOOTING.txt
- * paragraph about French channels - they mix up decimal and
- * hexadecimal */
- p_sys->i_wanted_page = (p_sys->i_wanted_page / 10) * 16 +
- (p_sys->i_wanted_page % 10);
- }
+ msg_Err( p_dec, "VBI decoder/demux could not be created." );
+ Close( p_this );
+ return VLC_ENOMEM;
}
- else if( val.i_int <= 0 )
+
+ /* Some broadcasters in countries with level 1 and level 1.5 still not send a G0 to do
+ * matches against table 32 of ETSI 300 706. We try to do some best effort guessing
+ * This is not perfect, but might handle some cases where we know the vbi language
+ * is known. It would be better if people started sending G0 */
+ for( int i = 0; ppsz_default_triplet[i] != NULL; i++ )
{
- p_sys->i_wanted_magazine = -1;
- p_sys->i_wanted_page = -1;
+ if( p_dec->fmt_in.psz_language && !strcasecmp( p_dec->fmt_in.psz_language, ppsz_default_triplet[i] ) )
+ {
+ vbi_teletext_set_default_region( p_sys->p_vbi_dec, pi_default_triplet[i]);
+ msg_Dbg( p_dec, "overwriting default zvbi region: %d", pi_default_triplet[i] );
+ }
}
- else
+
+ vbi_event_handler_register( p_sys->p_vbi_dec, VBI_EVENT_TTX_PAGE | VBI_EVENT_NETWORK |
+#ifdef ZVBI_DEBUG
+ VBI_EVENT_CAPTION | VBI_EVENT_TRIGGER |
+ VBI_EVENT_ASPECT | VBI_EVENT_PROG_INFO | VBI_EVENT_NETWORK_ID |
+#endif
+ 0 , EventHandler, p_dec );
+
+ /* Create the var on vlc_global. */
+ p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" );
+ var_AddCallback( p_dec, "vbi-page",
+ RequestPage, p_sys );
+
+ /* Check if the Teletext track has a known "initial page". */
+ if( p_sys->i_wanted_page == 100 && p_dec->fmt_in.subs.dvb.i_id != -1 )
{
- p_sys->i_wanted_magazine = val.i_int / 100;
- p_sys->i_wanted_page = (((val.i_int % 100) / 10) << 4)
- | ((val.i_int % 100) % 10);
+ int i_wanted_magazine = p_dec->fmt_in.subs.dvb.i_id >> 16;
+ if( i_wanted_magazine == 0 )
+ i_wanted_magazine = 8;
+ p_sys->i_wanted_page = vbi_bcd2dec(p_dec->fmt_in.subs.dvb.i_id & 0xff);
+ p_sys->i_wanted_page += 100*i_wanted_magazine;
}
- var_Create( p_dec, "telx-ignore-subtitle-flag",
- VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "telx-ignore-subtitle-flag", &val );
- p_sys->b_ignore_sub_flag = val.b_bool;
+ p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
- msg_Dbg( p_dec, "starting telx on magazine %d page %x flag %d",
- p_sys->i_wanted_magazine, p_sys->i_wanted_page,
- p_sys->b_ignore_sub_flag );
+ p_sys->b_opaque = var_CreateGetBool( p_dec, "vbi-opaque" );
+ var_AddCallback( p_dec, "vbi-opaque", Opaque, p_sys );
- return VLC_SUCCESS;
+ p_sys->i_align = var_CreateGetInteger( p_dec, "vbi-position" );
+ var_AddCallback( p_dec, "vbi-position", Position, p_sys );
+
+ p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" );
+// var_AddCallback( p_dec, "vbi-text", Text, p_sys );
+
+ /* Listen for keys */
+ var_AddCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_sys );
-/* error: */
-/* if (p_sys) { */
-/* free(p_sys); */
-/* p_sys = NULL; */
-/* } */
-/* return VLC_EGENERIC; */
+ es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
+ if( p_sys->b_text )
+ p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
+ else
+ p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A');
+ return VLC_SUCCESS;
}
/*****************************************************************************
decoder_t *p_dec = (decoder_t*) p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
+ var_DelCallback( p_dec, "vbi-position", Position, p_sys );
+ var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
+ var_DelCallback( p_dec, "vbi-page", RequestPage, p_sys );
+ var_DelCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_sys );
+
+ vlc_mutex_destroy( &p_sys->lock );
+
+ 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 );
}
-/**************************
- * change bits endianness *
- **************************/
-static uint8_t bytereverse( int n )
-{
- n = (((n >> 1) & 0x55) | ((n << 1) & 0xaa));
- n = (((n >> 2) & 0x33) | ((n << 2) & 0xcc));
- n = (((n >> 4) & 0x0f) | ((n << 4) & 0xf0));
- return n;
-}
+#define MAX_SLICES 32
-static int hamming_8_4( int a )
-{
- switch (a) {
- case 0xA8:
- return 0;
- case 0x0B:
- return 1;
- case 0x26:
- return 2;
- case 0x85:
- return 3;
- case 0x92:
- return 4;
- case 0x31:
- return 5;
- case 0x1C:
- return 6;
- case 0xBF:
- return 7;
- case 0x40:
- return 8;
- case 0xE3:
- return 9;
- case 0xCE:
- return 10;
- case 0x6D:
- return 11;
- case 0x7A:
- return 12;
- case 0xD9:
- return 13;
- case 0xF4:
- return 14;
- case 0x57:
- return 15;
- default:
- return -1; // decoding error , not yet corrected
- }
-}
+#ifdef WORDS_BIGENDIAN
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_BE
+#else
+# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_LE
+#endif
-// utc-2 --> utf-8
-// this is not a general function, but it's enough for what we do here
-// the result buffer need to be at least 4 bytes long
-static void to_utf8( char * res, uint16_t ch )
-{
- if( ch >= 0x80 )
- {
- if( ch >= 0x800 )
- {
- res[0] = (ch >> 12) | 0xE0;
- res[1] = ((ch >> 6) & 0x3F) | 0x80;
- res[2] = (ch & 0x3F) | 0x80;
- res[3] = 0;
- }
- else
- {
- res[0] = (ch >> 6) | 0xC0;
- res[1] = (ch & 0x3F) | 0x80;
- res[2] = 0;
- }
- }
- else
- {
- res[0] = ch;
- res[1] = 0;
- }
-}
-static void decode_string( char * res, int res_len,
- decoder_sys_t *p_sys, int magazine,
- uint8_t * packet, int len )
+/*****************************************************************************
+ * Decode:
+ *****************************************************************************/
+static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
{
- char utf8[7];
- char * pt = res;
- int i;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
+ subpicture_t *p_spu = NULL;
+ 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;
- for ( i = 0; i < len; i++ )
- {
- int in = bytereverse( packet[i] ) & 0x7f;
- uint16_t out = 32;
- size_t l;
+ p_block = *pp_block;
+ *pp_block = NULL;
- switch ( in )
- {
- /* special national characters */
- case 0x23:
- out = p_sys->pi_active_national_set[magazine][0];
- break;
- case 0x24:
- out = p_sys->pi_active_national_set[magazine][1];
- break;
- case 0x40:
- out = p_sys->pi_active_national_set[magazine][2];
- break;
- case 0x5b:
- out = p_sys->pi_active_national_set[magazine][3];
- break;
- case 0x5c:
- out = p_sys->pi_active_national_set[magazine][4];
- break;
- case 0x5d:
- out = p_sys->pi_active_national_set[magazine][5];
- break;
- case 0x5e:
- out = p_sys->pi_active_national_set[magazine][6];
- break;
- case 0x5f:
- out = p_sys->pi_active_national_set[magazine][7];
- break;
- case 0x60:
- out = p_sys->pi_active_national_set[magazine][8];
- break;
- case 0x7b:
- out = p_sys->pi_active_national_set[magazine][9];
- break;
- case 0x7c:
- out = p_sys->pi_active_national_set[magazine][10];
- break;
- case 0x7d:
- out = p_sys->pi_active_national_set[magazine][11];
- break;
- case 0x7e:
- out = p_sys->pi_active_national_set[magazine][12];
- break;
+ p_pos = p_block->p_buffer;
+ i_left = p_block->i_buffer;
- /* some special control characters (empirical) */
- case 0x0d:
- /* apparently this starts a sequence that ends with 0xb 0xb */
- while ( i + 1 < len && (bytereverse( packet[i+1] ) & 0x7f) != 0x0b )
- i++;
- i += 2;
- break;
- /* goto skip; */
+ while( i_left > 0 )
+ {
+ vbi_sliced p_sliced[MAX_SLICES];
+ unsigned int i_lines = 0;
+ int64_t i_pts;
- default:
- /* non documented national range 0x08 - 0x0f */
- if ( in >= 0x08 && in <= 0x0f )
- {
- out = p_sys->pi_active_national_set[magazine][13 + in - 8];
- break;
- }
+ i_lines = vbi_dvb_demux_cor( p_sys->p_dvb_demux, p_sliced,
+ MAX_SLICES, &i_pts, &p_pos, &i_left );
- /* normal ascii */
- if ( in > 32 && in < 0x7f )
- out = in;
- }
+ if( i_lines > 0 )
+ vbi_decode( p_sys->p_vbi_dec, p_sliced, i_lines, i_pts / 90000.0 );
+ }
- /* handle undefined national characters */
- if ( out == 0 )
- out = 32;
+ /* */
+ vlc_mutex_lock( &p_sys->lock );
+ const int i_align = p_sys->i_align;
+ const unsigned int i_wanted_page = p_sys->i_wanted_page;
+ const unsigned int i_wanted_subpage = p_sys->i_wanted_subpage;
+ const bool b_opaque = p_sys->b_opaque;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ /* Try to see if the page we want is in the cache yet */
+ b_cached = vbi_fetch_vt_page( p_sys->p_vbi_dec, &p_page,
+ vbi_dec2bcd( i_wanted_page ),
+ i_wanted_subpage, VBI_WST_LEVEL_3p5,
+ 25, true );
+
+ if( i_wanted_page == p_sys->i_last_page && !p_sys->b_update )
+ goto error;
- /* convert to utf-8 */
- to_utf8( utf8, out );
- l = strlen( utf8 );
- if ( pt + l < res + res_len - 1 )
+ if( !b_cached )
+ {
+ if( p_sys->i_last_page != i_wanted_page )
{
- strcpy(pt, utf8);
- pt += l;
+ /* We need to reset the subtitle */
+ p_spu = Subpicture( p_dec, &fmt, true,
+ p_page.columns, p_page.rows,
+ i_align, p_block->i_pts );
+ if( !p_spu )
+ goto error;
+ p_spu->p_region->psz_text = strdup("");
+
+ p_sys->b_update = true;
+ p_sys->i_last_page = i_wanted_page;
+ goto exit;
}
-
- /* skip: ; */
+ goto error;
}
- /* end: */
- *pt++ = 0;
-}
-/*****************************************************************************
- * Decode:
- *****************************************************************************/
-static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
- subpicture_t *p_spu = NULL;
- video_format_t fmt;
- /* int erase = 0; */
- int len, offset;
-#if 0
- int i_wanted_magazine = i_conf_wanted_page / 100;
- int i_wanted_page = 0x10 * ((i_conf_wanted_page % 100) / 10)
- | (i_conf_wanted_page % 10);
+ p_sys->b_update = false;
+ p_sys->i_last_page = i_wanted_page;
+#ifdef ZVBI_DEBUG
+ msg_Dbg( p_dec, "we now have page: %d ready for display",
+ i_wanted_page );
#endif
- vlc_bool_t b_update = VLC_FALSE;
- char psz_text[512], *pt = psz_text;
- char psz_line[256];
- int i, total;
-
- if( pp_block == NULL || *pp_block == NULL ) return NULL;
- p_block = *pp_block;
- *pp_block = NULL;
+ /* If there is a page or sub to render, then we do that here */
+ /* Create the subpicture unit */
+ p_spu = Subpicture( p_dec, &fmt, p_sys->b_text,
+ p_page.columns, p_page.rows,
+ i_align, p_block->i_pts );
+ if( !p_spu )
+ goto error;
- dbg((p_dec, "start of telx packet with header %2x\n",
- * (uint8_t *) p_block->p_buffer));
- len = p_block->i_buffer;
- for ( offset = 1; offset + 46 <= len; offset += 46 )
+ if( p_sys->b_text )
{
- uint8_t * packet = (uint8_t *) p_block->p_buffer+offset;
-// int vbi = ((0x20 & packet[2]) != 0 ? 0 : 313) + (0x1F & packet[2]);
+ unsigned int i_textsize = 7000;
+ int i_total;
+ char p_text[i_textsize+1];
+
+ i_total = vbi_print_page_region( &p_page, p_text, i_textsize,
+ "UTF-8", 0, 0, 0, 0, p_page.columns, p_page.rows );
+ p_text[i_total] = '\0';
+ /* Strip off the pagenumber */
+ if( i_total <= 40 )
+ goto error;
+ p_spu->p_region->psz_text = strdup( &p_text[8] );
+
+#ifdef ZVBI_DEBUG
+ msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
+#endif
+ }
+ else
+ {
+ picture_t *p_pic = p_spu->p_region->p_picture;
-// dbg((p_dec, "vbi %d header %02x %02x %02x\n", vbi, packet[0], packet[1], packet[2]));
- if ( packet[0] == 0xFF ) continue;
+ /* ZVBI is stupid enough to assume pitch == width */
+ p_pic->p->i_pitch = 4 * fmt.i_width;
+ vbi_draw_vt_page( &p_page, ZVBI_PIXFMT_RGBA32,
+ p_spu->p_region->p_picture->p->p_pixels, 1, 1 );
-/* if (packet[1] != 0x2C) { */
-/* printf("wrong header\n"); */
-/* //goto error; */
-/* continue; */
-/* } */
+ vlc_mutex_lock( &p_sys->lock );
+ memcpy( p_sys->nav_link, &p_page.nav_link, sizeof( p_sys->nav_link )) ;
+ vlc_mutex_unlock( &p_sys->lock );
- int mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] );
- int row, magazine;
- if ( mpag < 0 )
- {
- /* decode error */
- dbg((p_dec, "mpag hamming error\n"));
- continue;
- }
+ OpaquePage( p_pic, p_page, fmt, b_opaque );
+ }
- row = 0xFF & bytereverse(mpag);
- magazine = (7 & row) == 0 ? 8 : (7 & row);
- row >>= 3;
+exit:
+ vbi_unref_page( &p_page );
+ block_Release( p_block );
+ return p_spu;
- if ( p_sys->i_wanted_page != -1
- && magazine != p_sys->i_wanted_magazine )
- continue;
+error:
+ vbi_unref_page( &p_page );
+ if( p_spu != NULL )
+ {
+ decoder_DeleteSubpicture( p_dec, p_spu );
+ p_spu = NULL;
+ }
- if ( row == 0 )
- {
- /* row 0 : flags and header line */
- int flag = 0;
- int a;
+ block_Release( p_block );
+ return NULL;
+}
- for ( a = 0; a < 6; a++ )
- {
- flag |= (0xF & (bytereverse( hamming_8_4(packet[8 + a]) ) >> 4))
- << (a * 4);
- }
+static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
+ bool b_text,
+ int i_columns, int i_rows, int i_align,
+ mtime_t i_pts )
+{
+ video_format_t fmt;
+ subpicture_t *p_spu;
- /* if (!p_sys->b_ignore_sub_flag && !(1 & flag>>15)) */
- /* continue; */
-
- p_sys->i_page[magazine] = (0xF0 & bytereverse( hamming_8_4(packet[7]) )) |
- (0xF & (bytereverse( hamming_8_4(packet[6]) ) >> 4) );
-
- decode_string( psz_line, sizeof(psz_line), p_sys, magazine,
- packet + 14, 40 - 14 );
-
- dbg((p_dec, "mag %d flags %x page %x character set %d subtitles %d", magazine, flag,
- p_sys->i_page[magazine],
- 7 & flag>>21, 1 & flag>>15, psz_line));
-
- p_sys->pi_active_national_set[magazine] =
- ppi_national_subsets[7 & (flag >> 21)];
-
- p_sys->b_is_subtitle[magazine] = p_sys->b_ignore_sub_flag
- || ( (1 & (flag >> 15))
- && (1 & (flag>>16)) );
-
- dbg(( p_dec, "FLAGS%s%s%s%s%s%s%s mag_ser %d",
- (1 & (flag>>14))? " news" : "",
- (1 & (flag>>15))? " subtitle" : "",
- (1 & (flag>>7))? " erase" : "",
- (1 & (flag>>16))? " suppressed_head" : "",
- (1 & (flag>>17))? " update" : "",
- (1 & (flag>>18))? " interrupt" : "",
- (1 & (flag>>19))? " inhibit" : "",
- (1 & (flag>>20)) ));
-
- if ( (p_sys->i_wanted_page != -1
- && p_sys->i_page[magazine] != p_sys->i_wanted_page)
- || !p_sys->b_is_subtitle[magazine] )
- continue;
-
- p_sys->b_erase[magazine] = (1 & (flag >> 7));
-
- dbg((p_dec, "%ld --> %ld\n", (long int) p_block->i_pts, (long int)(p_sys->prev_pts+1500000)));
- /* kludge here :
- * we ignore the erase flag if it happens less than 1.5 seconds
- * before last caption
- * TODO make this time configurable
- * UPDATE the kludge seems to be no more necessary
- * so it's commented out*/
- if ( /*p_block->i_pts > p_sys->prev_pts + 1500000 && */
- p_sys->b_erase[magazine] )
- {
- int i;
+ /* If there is a page or sub to render, then we do that here */
+ /* Create the subpicture unit */
+ p_spu = decoder_NewSubpicture( p_dec );
+ if( !p_spu )
+ {
+ msg_Warn( p_dec, "can't get spu buffer" );
+ return NULL;
+ }
- dbg((p_dec, "ERASE !\n"));
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = b_text ? VLC_FOURCC('T','E','X','T') :
+ VLC_FOURCC('R','G','B','A');
+ fmt.i_aspect = b_text ? 0 : VOUT_ASPECT_FACTOR;
+ if( b_text )
+ {
+ fmt.i_bits_per_pixel = 0;
+ }
+ else
+ {
+ fmt.i_sar_num = 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;
+ }
+ fmt.i_x_offset = fmt.i_y_offset = 0;
- p_sys->b_erase[magazine] = 0;
- for ( i = 1; i < 32; i++ )
- {
- if ( !p_sys->ppsz_lines[i][0] ) continue;
- /* b_update = VLC_TRUE; */
- p_sys->ppsz_lines[i][0] = 0;
- }
- }
+ p_spu->p_region = subpicture_region_New( &fmt );
+ if( p_spu->p_region == NULL )
+ {
+ msg_Err( p_dec, "cannot allocate SPU region" );
+ decoder_DeleteSubpicture( p_dec, p_spu );
+ return NULL;
+ }
- /* replace the row if it's different */
- if ( strcmp(psz_line, p_sys->ppsz_lines[row]) )
- {
- strncpy( p_sys->ppsz_lines[row], psz_line,
- sizeof(p_sys->ppsz_lines[row]) - 1);
- }
- b_update = VLC_TRUE;
+ p_spu->p_region->i_x = 0;
+ p_spu->p_region->i_y = 0;
+ p_spu->p_region->i_align = i_align;
- }
- else if ( row < 24 )
- {
- char * t;
- int i;
- /* row 1-23 : normal lines */
-
- if ( (p_sys->i_wanted_page != -1
- && p_sys->i_page[magazine] != p_sys->i_wanted_page)
- || !p_sys->b_is_subtitle[magazine]
- || (p_sys->i_wanted_page == -1
- && p_sys->i_page[magazine] > 0x99) )
- continue;
-
- decode_string( psz_line, sizeof(psz_line), p_sys, magazine,
- packet + 6, 40 );
- t = psz_line;
-
- /* remove starting spaces */
- while ( *t == 32 ) t++;
-
- /* remove trailing spaces */
- for ( i = strlen(t) - 1; i >= 0 && t[i] == 32; i-- );
- t[i + 1] = 0;
-
- /* replace the row if it's different */
- if ( strcmp( t, p_sys->ppsz_lines[row] ) )
- {
- strncpy( p_sys->ppsz_lines[row], t,
- sizeof(p_sys->ppsz_lines[row]) - 1 );
- b_update = VLC_TRUE;
- }
+ p_spu->i_start = i_pts;
+ p_spu->i_stop = 0;
+ p_spu->b_ephemer = true;
+ p_spu->b_absolute = false;
- if (t[0])
- p_sys->prev_pts = p_block->i_pts;
+ if( !b_text )
+ {
+ p_spu->i_original_picture_width = fmt.i_width;
+ p_spu->i_original_picture_height = fmt.i_height;
+ }
- dbg((p_dec, "%d %d : ", magazine, row));
- dbg((p_dec, "%s\n", t));
+ /* */
+ *p_fmt = fmt;
+ return p_spu;
+}
-#ifdef TELX_DEBUG
- {
- char dbg[256];
- dbg[0] = 0;
- for ( i = 0; i < 40; i++ )
- {
- int in = bytereverse(packet[6 + i]) & 0x7f;
- sprintf(dbg + strlen(dbg), "%02x ", in);
- }
- dbg((p_dec, "%s\n", dbg));
- dbg[0] = 0;
- for ( i = 0; i < 40; i++ )
- {
- decode_string( psz_line, sizeof(psz_line), p_sys, magazine,
- packet + 6 + i, 1 );
- sprintf( dbg + strlen(dbg), "%s ", psz_line );
- }
- dbg((p_dec, "%s\n", dbg));
- }
+static void EventHandler( vbi_event *ev, void *user_data )
+{
+ decoder_t *p_dec = (decoder_t *)user_data;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( ev->type == VBI_EVENT_TTX_PAGE )
+ {
+#ifdef ZVBI_DEBUG
+ msg_Info( p_dec, "Page %03x.%02x ",
+ ev->ev.ttx_page.pgno,
+ ev->ev.ttx_page.subno & 0xFF);
#endif
+ if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) )
+ p_sys->b_update = true;
+#ifdef ZVBI_DEBUG
+ if( ev->ev.ttx_page.clock_update )
+ msg_Dbg( p_dec, "clock" );
+ if( ev->ev.ttx_page.header_update )
+ msg_Dbg( p_dec, "header" );
+#endif
+ }
+ else if( ev->type == VBI_EVENT_CLOSE )
+ msg_Dbg( p_dec, "Close event" );
+ else if( ev->type == VBI_EVENT_CAPTION )
+ msg_Dbg( p_dec, "Caption line: %x", ev->ev.caption.pgno );
+ else if( ev->type == VBI_EVENT_NETWORK )
+ {
+ msg_Dbg( p_dec, "Network change");
+ vbi_network n = ev->ev.network;
+ msg_Dbg( p_dec, "Network id:%d name: %s, call: %s ", n.nuid, n.name, n.call );
+ }
+ else if( ev->type == VBI_EVENT_TRIGGER )
+ msg_Dbg( p_dec, "Trigger event" );
+ else if( ev->type == VBI_EVENT_ASPECT )
+ msg_Dbg( p_dec, "Aspect update" );
+ else if( ev->type == VBI_EVENT_PROG_INFO )
+ msg_Dbg( p_dec, "Program info received" );
+ else if( ev->type == VBI_EVENT_NETWORK_ID )
+ msg_Dbg( p_dec, "Network ID changed" );
+}
- }
- else if ( row == 25 )
- {
- /* row 25 : alternate header line */
- if ( (p_sys->i_wanted_page != -1
- && p_sys->i_page[magazine] != p_sys->i_wanted_page)
- || !p_sys->b_is_subtitle[magazine] )
- continue;
+static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+ const video_format_t fmt, bool b_opaque )
+{
+ unsigned int x, y;
+
+ assert( fmt.i_chroma == VLC_FOURCC('R','G','B','A' ) );
- decode_string( psz_line, sizeof(psz_line), p_sys, magazine,
- packet + 6, 40 );
+ /* Kludge since zvbi doesn't provide an option to specify opacity. */
+ for( y = 0; y < fmt.i_height; y++ )
+ {
+ for( x = 0; x < fmt.i_width; x++ )
+ {
+ const vbi_opacity opacity = p_page.text[ y/10 * p_page.columns + x/12 ].opacity;
+ const int background = p_page.text[ 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];
- /* replace the row if it's different */
- if ( strcmp( psz_line, p_sys->ppsz_lines[0] ) )
+ switch( opacity )
{
- strncpy( p_sys->ppsz_lines[0], psz_line,
- sizeof(p_sys->ppsz_lines[0]) - 1 );
- /* b_update = VLC_TRUE; */
+ /* Show video instead of this character */
+ case VBI_TRANSPARENT_SPACE:
+ *p_pixel = 0;
+ break;
+ /* Display foreground and background color */
+ /* To make the boxed text "closed captioning" transparent
+ * change true to false.
+ */
+ case VBI_OPAQUE:
+ /* alpha blend video into background color */
+ case VBI_SEMI_TRANSPARENT:
+ if( b_opaque )
+ break;
+ /* Full text transparency. only foreground color is show */
+ case VBI_TRANSPARENT_FULL:
+ if( (*p_pixel) == (0xff000000 | p_page.color_map[background] ) )
+ *p_pixel = 0;
+ break;
}
}
-/* else if (row == 26) { */
-/* // row 26 : TV listings */
-/* } else */
-/* dbg((p_dec, "%d %d : %s\n", magazine, row, decode_string(p_sys, magazine, packet+6, 40))); */
}
+ /* end of kludge */
+ return VLC_SUCCESS;
+}
- if ( !b_update )
- goto error;
+/* Callbacks */
+static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- total = 0;
- for ( i = 1; i < 24; i++ )
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ break;
+ }
+ if( newval.i_int > 0 && newval.i_int < 999 )
{
- size_t l = strlen( p_sys->ppsz_lines[i] );
+ p_sys->i_wanted_page = newval.i_int;
+ p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
+ }
+ vlc_mutex_unlock( &p_sys->lock );
- if ( l > sizeof(psz_text) - total - 1 )
- l = sizeof(psz_text) - total - 1;
+ return VLC_SUCCESS;
+}
- if ( l > 0 )
- {
- memcpy( pt, p_sys->ppsz_lines[i], l );
- total += l;
- pt += l;
- if ( sizeof(psz_text) - total - 1 > 0 )
- {
- *pt++ = '\n';
- total++;
- }
- }
- }
- *pt = 0;
+static int Opaque( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- if ( !strcmp(psz_text, p_sys->psz_prev_text) )
- goto error;
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->b_opaque = newval.b_bool;
+ p_sys->b_update = true;
+ vlc_mutex_unlock( &p_sys->lock );
- dbg((p_dec, "UPDATE TELETEXT PICTURE\n"));
+ return VLC_SUCCESS;
+}
- assert( sizeof(p_sys->psz_prev_text) >= sizeof(psz_text) );
- strcpy( p_sys->psz_prev_text, psz_text );
+static int Position( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- /* Create the subpicture unit */
- p_spu = p_dec->pf_spu_buffer_new( p_dec );
- if( !p_spu )
- {
- msg_Warn( p_dec, "can't get spu buffer" );
- goto error;
- }
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->i_align = newval.i_int;
+ vlc_mutex_unlock( &p_sys->lock );
- /* 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 == NULL )
+ return VLC_SUCCESS;
+}
+
+static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ decoder_sys_t *p_sys = p_data;
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+
+ /* FIXME: Capture + and - key for subpage browsing */
+ if( newval.i_int == '-' || newval.i_int == '+' )
{
- msg_Err( p_dec, "cannot allocate SPU region" );
- goto error;
- }
+ vlc_mutex_lock( &p_sys->lock );
+ if( p_sys->i_wanted_subpage == VBI_ANY_SUBNO && newval.i_int == '+' )
+ p_sys->i_wanted_subpage = vbi_dec2bcd(1);
+ else if ( newval.i_int == '+' )
+ p_sys->i_wanted_subpage = vbi_add_bcd( p_sys->i_wanted_subpage, 1);
+ else if( newval.i_int == '-')
+ p_sys->i_wanted_subpage = vbi_add_bcd( p_sys->i_wanted_subpage, 0xF9999999); /* BCD complement - 1 */
+
+ 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
+ vout_OSDMessage( p_this, DEFAULT_CHAN, "%s: %d", _("Subpage"), vbi_bcd2dec( p_sys->i_wanted_subpage) );
- /* Normal text subs, easy markup */
- p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM | p_sys->i_align;
- p_spu->i_x = p_sys->i_align ? 20 : 0;
- p_spu->i_y = 10;
+ p_sys->b_update = true;
+ vlc_mutex_unlock( &p_sys->lock );
+ }
- p_spu->p_region->psz_text = strdup(psz_text);
- p_spu->i_start = p_block->i_pts;
- p_spu->i_stop = p_block->i_pts + p_block->i_length;
- p_spu->b_ephemer = (p_block->i_length == 0);
- p_spu->b_absolute = VLC_FALSE;
- p_spu->b_pausable = VLC_TRUE;
- dbg((p_dec, "%ld --> %ld\n", (long int) p_block->i_pts/100000, (long int)p_block->i_length/100000));
+ /* Capture 0-9 for page selection */
+ if( newval.i_int < '0' || newval.i_int > '9' )
+ return VLC_SUCCESS;
- block_Release( p_block );
- return p_spu;
+ vlc_mutex_lock( &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');
+ vout_OSDMessage( p_this, DEFAULT_CHAN, "%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') );
-error:
- if ( p_spu != NULL )
+ if( p_sys->i_key[0] > 0 && p_sys->i_key[0] <= 8 &&
+ p_sys->i_key[1] >= 0 && p_sys->i_key[1] <= 9 &&
+ p_sys->i_key[2] >= 0 && p_sys->i_key[2] <= 9 )
{
- p_dec->pf_spu_buffer_del( p_dec, p_spu );
- p_spu = NULL;
+ p_sys->i_wanted_page = p_sys->i_key[0]*100 + p_sys->i_key[1]*10 + p_sys->i_key[2];
+ p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
+ p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0';
}
+ vlc_mutex_unlock( &p_sys->lock );
- block_Release( p_block );
- return NULL;
+ return VLC_SUCCESS;
}
-
projects / vlc / blobdiff