2007-07-06 23:32:13 +02:00
|
|
|
/*****************************************************************************
|
2007-07-06 23:32:20 +02:00
|
|
|
* zvbi.c : VBI and Teletext PES demux and decoder using libzvbi
|
2007-07-06 23:32:13 +02:00
|
|
|
*****************************************************************************
|
2007-07-06 23:32:31 +02:00
|
|
|
* Copyright (C) 2007, M2X
|
2007-12-16 20:34:07 +01:00
|
|
|
* $Id$
|
2007-07-06 23:32:13 +02:00
|
|
|
*
|
2007-10-19 00:10:11 +02:00
|
|
|
* Authors: Derk-Jan Hartman <djhartman at m2x dot nl>
|
|
|
|
* Jean-Paul Saman <jpsaman at m2x dot nl>
|
2007-07-06 23:32:20 +02:00
|
|
|
*
|
2007-07-06 23:32:13 +02:00
|
|
|
* 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
|
|
|
|
* (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.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*****************************************************************************/
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* information on teletext format can be found here :
|
|
|
|
* http://pdc.ro.nu/teletext.html
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
2007-07-06 23:32:20 +02:00
|
|
|
|
|
|
|
/* 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)
|
|
|
|
*/
|
|
|
|
|
2008-01-23 22:50:58 +01:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2008-05-31 20:49:57 +02:00
|
|
|
#include <vlc_common.h>
|
2008-05-08 17:30:33 +02:00
|
|
|
#include <vlc_plugin.h>
|
2007-07-06 23:32:13 +02:00
|
|
|
#include <assert.h>
|
2007-07-06 23:32:20 +02:00
|
|
|
#include <libzvbi.h>
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2008-09-11 20:26:28 +02:00
|
|
|
#include <vlc_vout.h>
|
|
|
|
#include <vlc_codec.h>
|
|
|
|
#include <vlc_osd.h>
|
2007-07-06 23:32:13 +02:00
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Module descriptor.
|
|
|
|
*****************************************************************************/
|
|
|
|
static int Open ( vlc_object_t * );
|
|
|
|
static void Close( vlc_object_t * );
|
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
#define PAGE_TEXT N_("Teletext page")
|
|
|
|
#define PAGE_LONGTEXT N_("Open the indicated Teletext page." \
|
|
|
|
"Default page is index 100")
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2007-07-06 23:32:38 +02:00
|
|
|
#define OPAQUE_TEXT N_("Text is always opaque")
|
|
|
|
#define OPAQUE_LONGTEXT N_("Setting vbi-opaque to false " \
|
|
|
|
"makes the boxed text transparent." )
|
|
|
|
|
2007-09-18 14:45:03 +02:00
|
|
|
#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).")
|
|
|
|
|
2007-09-19 23:01:01 +02:00
|
|
|
#define TELX_TEXT N_("Teletext text subtitles")
|
|
|
|
#define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
|
|
|
|
"instead of as RGBA" )
|
|
|
|
|
2008-05-27 21:16:52 +02:00
|
|
|
static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
|
|
|
|
static const char *const ppsz_pos_descriptions[] =
|
2007-09-18 14:45:03 +02:00
|
|
|
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
|
|
|
|
N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
|
|
|
|
|
2007-07-06 23:32:13 +02:00
|
|
|
vlc_module_begin();
|
2008-05-21 19:19:25 +02:00
|
|
|
set_description( N_("VBI and Teletext decoder") );
|
2008-05-27 21:16:52 +02:00
|
|
|
set_shortname( N_("VBI & Teletext") );
|
2007-07-06 23:32:20 +02:00
|
|
|
set_capability( "decoder", 51 );
|
2007-07-06 23:32:13 +02:00
|
|
|
set_category( CAT_INPUT );
|
|
|
|
set_subcategory( SUBCAT_INPUT_SCODEC );
|
|
|
|
set_callbacks( Open, Close );
|
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
add_integer( "vbi-page", 100, NULL,
|
2008-04-14 00:08:29 +02:00
|
|
|
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 );
|
2008-08-24 21:57:43 +02:00
|
|
|
change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
|
2008-04-14 00:08:29 +02:00
|
|
|
add_bool( "vbi-text", false, NULL,
|
|
|
|
TELX_TEXT, TELX_LONGTEXT, false );
|
2007-07-06 23:32:13 +02:00
|
|
|
vlc_module_end();
|
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
* Local structures
|
|
|
|
****************************************************************************/
|
|
|
|
|
2008-07-29 20:02:11 +02:00
|
|
|
// #define ZVBI_DEBUG
|
|
|
|
|
2008-09-11 13:34:09 +02:00
|
|
|
//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
|
|
|
|
};
|
|
|
|
|
2008-09-11 17:12:23 +02:00
|
|
|
typedef enum {
|
|
|
|
ZVBI_KEY_RED = 'r' << 0x16,
|
|
|
|
ZVBI_KEY_GREEN = 'g' << 0x16,
|
|
|
|
ZVBI_KEY_YELLOW = 'y' << 0x16,
|
|
|
|
ZVBI_KEY_BLUE = 'b' << 0x16,
|
|
|
|
ZVBI_KEY_INDEX = 'i' << 0x16,
|
|
|
|
} ttxt_key_id;
|
|
|
|
|
2008-07-29 20:02:11 +02:00
|
|
|
typedef enum {
|
|
|
|
DATA_UNIT_EBU_TELETEXT_NON_SUBTITLE = 0x02,
|
|
|
|
DATA_UNIT_EBU_TELETEXT_SUBTITLE = 0x03,
|
|
|
|
DATA_UNIT_EBU_TELETEXT_INVERTED = 0x0C,
|
|
|
|
|
|
|
|
DATA_UNIT_ZVBI_WSS_CPR1204 = 0xB4,
|
|
|
|
DATA_UNIT_ZVBI_CLOSED_CAPTION_525 = 0xB5,
|
|
|
|
DATA_UNIT_ZVBI_MONOCHROME_SAMPLES_525 = 0xB6,
|
|
|
|
|
|
|
|
DATA_UNIT_VPS = 0xC3,
|
|
|
|
DATA_UNIT_WSS = 0xC4,
|
|
|
|
DATA_UNIT_CLOSED_CAPTION = 0xC5,
|
|
|
|
DATA_UNIT_MONOCHROME_SAMPLES = 0xC6,
|
|
|
|
|
|
|
|
DATA_UNIT_STUFFING = 0xFF,
|
|
|
|
} data_unit_id;
|
|
|
|
|
2007-07-06 23:32:13 +02:00
|
|
|
struct decoder_sys_t
|
|
|
|
{
|
2008-04-22 11:36:25 +02:00
|
|
|
vbi_decoder * p_vbi_dec;
|
|
|
|
vbi_dvb_demux * p_dvb_demux;
|
|
|
|
unsigned int i_last_page;
|
2008-04-14 00:08:29 +02:00
|
|
|
bool b_update;
|
2008-07-29 20:45:58 +02:00
|
|
|
bool b_text; /* Subtitles as text */
|
2007-09-19 23:01:01 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_t lock; /* Lock to protect the following variables */
|
2007-09-18 14:45:03 +02:00
|
|
|
/* Positioning of Teletext images */
|
2008-04-22 11:36:25 +02:00
|
|
|
int i_align;
|
2008-07-29 20:45:58 +02:00
|
|
|
/* */
|
|
|
|
unsigned int i_wanted_page;
|
2008-09-11 23:52:21 +02:00
|
|
|
unsigned int i_wanted_subpage;
|
2008-07-29 20:45:58 +02:00
|
|
|
/* */
|
|
|
|
bool b_opaque;
|
2008-09-11 17:12:23 +02:00
|
|
|
struct {
|
|
|
|
int pgno, subno;
|
|
|
|
} nav_link[6];
|
2008-09-11 20:26:28 +02:00
|
|
|
int i_key[3];
|
2007-07-06 23:32:52 +02:00
|
|
|
};
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2008-07-29 20:02:11 +02:00
|
|
|
static subpicture_t *Decode( decoder_t *, block_t ** );
|
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
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 );
|
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
static void EventHandler( vbi_event *ev, void *user_data );
|
2008-07-29 21:10:16 +02:00
|
|
|
static int OpaquePage( picture_t *p_src, const vbi_page p_page,
|
|
|
|
const video_format_t fmt, bool b_opaque );
|
|
|
|
|
|
|
|
/* Properties callbacks */
|
2007-07-06 23:32:20 +02:00
|
|
|
static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
|
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data );
|
2007-07-06 23:32:38 +02:00
|
|
|
static int Opaque( vlc_object_t *p_this, char const *psz_cmd,
|
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data );
|
2007-09-18 14:45:03 +02:00
|
|
|
static int Position( vlc_object_t *p_this, char const *psz_cmd,
|
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data );
|
2008-09-11 20:26:28 +02:00
|
|
|
static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
|
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data );
|
2007-07-06 23:32:13 +02:00
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Open: probe the decoder and return score
|
|
|
|
*****************************************************************************
|
|
|
|
* Tries to launch a decoder and return score so that the interface is able
|
|
|
|
* to chose.
|
|
|
|
*****************************************************************************/
|
|
|
|
static int Open( vlc_object_t *p_this )
|
|
|
|
{
|
|
|
|
decoder_t *p_dec = (decoder_t *) p_this;
|
|
|
|
decoder_sys_t *p_sys = NULL;
|
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
|
2007-07-06 23:32:13 +02:00
|
|
|
return VLC_EGENERIC;
|
|
|
|
|
|
|
|
p_dec->pf_decode_sub = Decode;
|
|
|
|
p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
|
|
|
|
if( p_sys == NULL )
|
|
|
|
return VLC_ENOMEM;
|
|
|
|
memset( p_sys, 0, sizeof(decoder_sys_t) );
|
|
|
|
|
2008-09-11 20:26:28 +02:00
|
|
|
p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0';
|
2008-04-14 00:08:29 +02:00
|
|
|
p_sys->b_update = false;
|
2007-07-06 23:32:20 +02:00
|
|
|
p_sys->p_vbi_dec = vbi_decoder_new();
|
|
|
|
p_sys->p_dvb_demux = vbi_dvb_pes_demux_new( NULL, NULL );
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_init( &p_sys->lock );
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
if( (p_sys->p_vbi_dec == NULL) || (p_sys->p_dvb_demux == NULL) )
|
2007-07-06 23:32:13 +02:00
|
|
|
{
|
2007-07-06 23:32:20 +02:00
|
|
|
msg_Err( p_dec, "VBI decoder/demux could not be created." );
|
2007-07-06 23:32:56 +02:00
|
|
|
Close( p_this );
|
2007-07-06 23:32:20 +02:00
|
|
|
return VLC_ENOMEM;
|
2007-07-06 23:32:13 +02:00
|
|
|
}
|
|
|
|
|
2008-09-11 13:34:09 +02:00
|
|
|
/* 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++ )
|
|
|
|
{
|
2008-09-11 15:02:24 +02:00
|
|
|
if( p_dec->fmt_in.psz_language && !strcasecmp( p_dec->fmt_in.psz_language, ppsz_default_triplet[i] ) )
|
2008-09-11 13:34:09 +02:00
|
|
|
{
|
|
|
|
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] );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-11 17:12:23 +02:00
|
|
|
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 );
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
/* Create the var on vlc_global. */
|
2007-12-16 21:58:28 +01:00
|
|
|
p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" );
|
|
|
|
var_AddCallback( p_dec, "vbi-page",
|
2007-07-06 23:32:31 +02:00
|
|
|
RequestPage, p_sys );
|
2007-07-06 23:32:38 +02:00
|
|
|
|
2008-09-06 14:56:08 +02:00
|
|
|
/* 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 )
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
|
2008-09-06 14:56:08 +02:00
|
|
|
|
2007-12-16 21:58:28 +01:00
|
|
|
p_sys->b_opaque = var_CreateGetBool( p_dec, "vbi-opaque" );
|
|
|
|
var_AddCallback( p_dec, "vbi-opaque", Opaque, p_sys );
|
2007-09-18 14:45:03 +02:00
|
|
|
|
|
|
|
p_sys->i_align = var_CreateGetInteger( p_dec, "vbi-position" );
|
|
|
|
var_AddCallback( p_dec, "vbi-position", Position, p_sys );
|
|
|
|
|
2007-09-19 23:01:01 +02:00
|
|
|
p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" );
|
|
|
|
// var_AddCallback( p_dec, "vbi-text", Text, p_sys );
|
|
|
|
|
2008-09-11 20:26:28 +02:00
|
|
|
/* Listen for keys */
|
|
|
|
var_AddCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_sys );
|
|
|
|
|
2007-09-26 08:21:36 +02:00
|
|
|
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');
|
2007-07-06 23:32:13 +02:00
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Close:
|
|
|
|
*****************************************************************************/
|
|
|
|
static void Close( vlc_object_t *p_this )
|
|
|
|
{
|
|
|
|
decoder_t *p_dec = (decoder_t*) p_this;
|
|
|
|
decoder_sys_t *p_sys = p_dec->p_sys;
|
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
var_DelCallback( p_dec, "vbi-position", Position, p_sys );
|
2007-12-16 21:58:28 +01:00
|
|
|
var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
|
2008-07-29 20:45:58 +02:00
|
|
|
var_DelCallback( p_dec, "vbi-page", RequestPage, p_sys );
|
2008-09-11 20:26:28 +02:00
|
|
|
var_DelCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_sys );
|
2008-07-29 20:45:58 +02:00
|
|
|
|
|
|
|
vlc_mutex_destroy( &p_sys->lock );
|
2007-12-16 20:34:07 +01:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
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 );
|
2007-07-06 23:32:13 +02:00
|
|
|
free( p_sys );
|
|
|
|
}
|
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
#define MAX_SLICES 32
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_BE
|
|
|
|
#else
|
|
|
|
# define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_LE
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2007-07-06 23:32:13 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
* Decode:
|
|
|
|
*****************************************************************************/
|
|
|
|
static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
|
|
|
|
{
|
2008-07-29 21:10:16 +02:00
|
|
|
decoder_sys_t *p_sys = p_dec->p_sys;
|
2007-07-06 23:32:20 +02:00
|
|
|
block_t *p_block;
|
|
|
|
subpicture_t *p_spu = NULL;
|
|
|
|
video_format_t fmt;
|
2008-04-22 12:16:35 +02:00
|
|
|
bool b_cached = false;
|
2007-07-06 23:32:20 +02:00
|
|
|
vbi_page p_page;
|
2007-09-18 14:45:03 +02:00
|
|
|
const uint8_t *p_pos;
|
2007-07-06 23:32:20 +02:00
|
|
|
unsigned int i_left;
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2007-07-06 23:32:31 +02:00
|
|
|
if( (pp_block == NULL) || (*pp_block == NULL) )
|
|
|
|
return NULL;
|
2007-10-26 10:35:53 +02:00
|
|
|
|
2007-07-06 23:32:13 +02:00
|
|
|
p_block = *pp_block;
|
|
|
|
*pp_block = NULL;
|
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
p_pos = p_block->p_buffer;
|
|
|
|
i_left = p_block->i_buffer;
|
|
|
|
|
|
|
|
while( i_left > 0 )
|
2007-07-06 23:32:13 +02:00
|
|
|
{
|
2007-07-06 23:32:20 +02:00
|
|
|
vbi_sliced p_sliced[MAX_SLICES];
|
|
|
|
unsigned int i_lines = 0;
|
|
|
|
int64_t i_pts;
|
|
|
|
|
2007-07-06 23:32:31 +02:00
|
|
|
i_lines = vbi_dvb_demux_cor( p_sys->p_dvb_demux, p_sliced,
|
|
|
|
MAX_SLICES, &i_pts, &p_pos, &i_left );
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
if( i_lines > 0 )
|
|
|
|
vbi_decode( p_sys->p_vbi_dec, p_sliced, i_lines, i_pts / 90000.0 );
|
2007-07-06 23:32:13 +02:00
|
|
|
}
|
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
/* */
|
|
|
|
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;
|
2008-09-11 23:52:21 +02:00
|
|
|
const unsigned int i_wanted_subpage = p_sys->i_wanted_subpage;
|
2008-07-29 20:45:58 +02:00
|
|
|
const bool b_opaque = p_sys->b_opaque;
|
|
|
|
vlc_mutex_unlock( &p_sys->lock );
|
|
|
|
|
2007-07-06 23:32:20 +02:00
|
|
|
/* Try to see if the page we want is in the cache yet */
|
2007-07-06 23:32:31 +02:00
|
|
|
b_cached = vbi_fetch_vt_page( p_sys->p_vbi_dec, &p_page,
|
2008-07-29 20:45:58 +02:00
|
|
|
vbi_dec2bcd( i_wanted_page ),
|
2008-09-11 23:52:21 +02:00
|
|
|
i_wanted_subpage, VBI_WST_LEVEL_3p5,
|
2008-09-11 17:12:23 +02:00
|
|
|
25, true );
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
if( i_wanted_page == p_sys->i_last_page && !p_sys->b_update )
|
2007-07-06 23:32:31 +02:00
|
|
|
goto error;
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
if( !b_cached )
|
|
|
|
{
|
|
|
|
if( p_sys->i_last_page != i_wanted_page )
|
|
|
|
{
|
|
|
|
/* 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;
|
|
|
|
}
|
2007-07-06 23:32:13 +02:00
|
|
|
goto error;
|
2008-07-29 21:10:16 +02:00
|
|
|
}
|
2007-07-06 23:32:13 +02:00
|
|
|
|
2008-04-14 00:08:29 +02:00
|
|
|
p_sys->b_update = false;
|
2008-07-29 20:45:58 +02:00
|
|
|
p_sys->i_last_page = i_wanted_page;
|
2008-04-22 12:16:35 +02:00
|
|
|
#ifdef ZVBI_DEBUG
|
2007-12-16 22:07:11 +01:00
|
|
|
msg_Dbg( p_dec, "we now have page: %d ready for display",
|
2008-07-29 20:45:58 +02:00
|
|
|
i_wanted_page );
|
2007-10-19 00:10:11 +02:00
|
|
|
#endif
|
2007-07-06 23:32:20 +02:00
|
|
|
/* If there is a page or sub to render, then we do that here */
|
2007-07-06 23:32:13 +02:00
|
|
|
/* Create the subpicture unit */
|
2008-07-29 21:10:16 +02:00
|
|
|
p_spu = Subpicture( p_dec, &fmt, p_sys->b_text,
|
|
|
|
p_page.columns, p_page.rows,
|
|
|
|
i_align, p_block->i_pts );
|
2007-07-06 23:32:13 +02:00
|
|
|
if( !p_spu )
|
|
|
|
goto error;
|
2007-10-19 00:10:11 +02:00
|
|
|
|
2007-09-19 23:01:01 +02:00
|
|
|
if( p_sys->b_text )
|
|
|
|
{
|
2007-09-26 08:21:36 +02:00
|
|
|
unsigned int i_textsize = 7000;
|
|
|
|
int i_total;
|
2008-07-29 21:10:16 +02:00
|
|
|
char p_text[i_textsize+1];
|
2007-07-06 23:32:20 +02:00
|
|
|
|
2007-09-19 23:01:01 +02:00
|
|
|
i_total = vbi_print_page_region( &p_page, p_text, i_textsize,
|
2007-09-20 22:13:45 +02:00
|
|
|
"UTF-8", 0, 0, 0, 0, p_page.columns, p_page.rows );
|
2007-09-19 23:01:01 +02:00
|
|
|
p_text[i_total] = '\0';
|
|
|
|
/* Strip off the pagenumber */
|
2008-07-29 20:45:58 +02:00
|
|
|
if( i_total <= 40 )
|
|
|
|
goto error;
|
2007-09-19 23:01:01 +02:00
|
|
|
p_spu->p_region->psz_text = strdup( &p_text[8] );
|
|
|
|
|
2008-04-22 12:16:35 +02:00
|
|
|
#ifdef ZVBI_DEBUG
|
2007-12-16 20:34:07 +01:00
|
|
|
msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
|
2008-04-22 12:16:35 +02:00
|
|
|
#endif
|
2007-09-19 23:01:01 +02:00
|
|
|
}
|
2007-10-19 00:10:11 +02:00
|
|
|
else
|
2007-09-19 23:01:01 +02:00
|
|
|
{
|
2008-07-29 20:45:58 +02:00
|
|
|
picture_t *p_pic = &p_spu->p_region->picture;
|
2007-10-19 00:10:11 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
/* ZVBI is stupid enough to assume pitch == width */
|
|
|
|
p_pic->p->i_pitch = 4 * fmt.i_width;
|
2007-10-19 00:10:11 +02:00
|
|
|
vbi_draw_vt_page( &p_page, ZVBI_PIXFMT_RGBA32,
|
|
|
|
p_spu->p_region->picture.p->p_pixels, 1, 1 );
|
|
|
|
|
2008-09-11 17:12:23 +02:00
|
|
|
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 );
|
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
OpaquePage( p_pic, p_page, fmt, b_opaque );
|
2007-07-06 23:32:38 +02:00
|
|
|
}
|
2007-10-19 00:10:11 +02:00
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
exit:
|
2007-07-06 23:32:36 +02:00
|
|
|
vbi_unref_page( &p_page );
|
2007-07-06 23:32:13 +02:00
|
|
|
block_Release( p_block );
|
|
|
|
return p_spu;
|
|
|
|
|
|
|
|
error:
|
2007-07-06 23:32:36 +02:00
|
|
|
vbi_unref_page( &p_page );
|
|
|
|
if( p_spu != NULL )
|
2007-07-06 23:32:13 +02:00
|
|
|
{
|
|
|
|
p_dec->pf_spu_buffer_del( p_dec, p_spu );
|
|
|
|
p_spu = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
block_Release( p_block );
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
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 there is a page or sub to render, then we do that here */
|
|
|
|
/* 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" );
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
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_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
|
|
|
|
if( p_spu->p_region == NULL )
|
|
|
|
{
|
|
|
|
msg_Err( p_dec, "cannot allocate SPU region" );
|
|
|
|
p_dec->pf_spu_buffer_del( p_dec, p_spu );
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
p_spu->p_region->i_x = 0;
|
|
|
|
p_spu->p_region->i_y = 0;
|
|
|
|
p_spu->p_region->i_align = i_align;
|
|
|
|
|
|
|
|
/* Normal text subs, easy markup */
|
|
|
|
p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM;
|
|
|
|
|
|
|
|
p_spu->i_start = i_pts;
|
|
|
|
p_spu->i_stop = 0;
|
|
|
|
p_spu->b_ephemer = true;
|
|
|
|
p_spu->b_absolute = false;
|
|
|
|
p_spu->b_pausable = true;
|
|
|
|
|
|
|
|
if( !b_text )
|
|
|
|
{
|
|
|
|
p_spu->i_width =
|
|
|
|
p_spu->i_original_picture_width = fmt.i_width;
|
|
|
|
p_spu->i_height =
|
|
|
|
p_spu->i_original_picture_height = fmt.i_height;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* */
|
|
|
|
*p_fmt = fmt;
|
|
|
|
return p_spu;
|
|
|
|
}
|
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
static void EventHandler( vbi_event *ev, void *user_data )
|
2007-07-06 23:32:20 +02:00
|
|
|
{
|
|
|
|
decoder_t *p_dec = (decoder_t *)user_data;
|
|
|
|
decoder_sys_t *p_sys = p_dec->p_sys;
|
|
|
|
|
|
|
|
if( ev->type == VBI_EVENT_TTX_PAGE )
|
|
|
|
{
|
2008-04-22 12:16:35 +02:00
|
|
|
#ifdef ZVBI_DEBUG
|
|
|
|
msg_Info( p_dec, "Page %03x.%02x ",
|
2007-07-06 23:32:20 +02:00
|
|
|
ev->ev.ttx_page.pgno,
|
|
|
|
ev->ev.ttx_page.subno & 0xFF);
|
2008-04-22 12:16:35 +02:00
|
|
|
#endif
|
2007-07-06 23:32:20 +02:00
|
|
|
if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) )
|
2008-04-14 00:08:29 +02:00
|
|
|
p_sys->b_update = true;
|
2008-09-11 17:12:23 +02:00
|
|
|
#ifdef ZVBI_DEBUG
|
2007-07-06 23:32:20 +02:00
|
|
|
if( ev->ev.ttx_page.clock_update )
|
|
|
|
msg_Dbg( p_dec, "clock" );
|
2008-04-22 12:16:35 +02:00
|
|
|
if( ev->ev.ttx_page.header_update )
|
2007-07-06 23:32:20 +02:00
|
|
|
msg_Dbg( p_dec, "header" );
|
2008-04-22 12:16:35 +02:00
|
|
|
#endif
|
2007-07-06 23:32:20 +02:00
|
|
|
}
|
2008-09-11 17:12:23 +02:00
|
|
|
else if( ev->type == VBI_EVENT_CLOSE )
|
|
|
|
msg_Dbg( p_dec, "Close event" );
|
2007-07-06 23:32:20 +02:00
|
|
|
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 )
|
2008-09-11 17:12:23 +02:00
|
|
|
{
|
|
|
|
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" );
|
2007-07-06 23:32:20 +02:00
|
|
|
else if( ev->type == VBI_EVENT_ASPECT )
|
|
|
|
msg_Dbg( p_dec, "Aspect update" );
|
2008-09-11 17:12:23 +02:00
|
|
|
else if( ev->type == VBI_EVENT_PROG_INFO )
|
2007-07-06 23:32:20 +02:00
|
|
|
msg_Dbg( p_dec, "Program info received" );
|
2008-09-11 17:12:23 +02:00
|
|
|
else if( ev->type == VBI_EVENT_NETWORK_ID )
|
|
|
|
msg_Dbg( p_dec, "Network ID changed" );
|
2007-07-06 23:32:20 +02:00
|
|
|
}
|
|
|
|
|
2008-07-29 21:10:16 +02:00
|
|
|
static int OpaquePage( picture_t *p_src, const vbi_page p_page,
|
|
|
|
const video_format_t fmt, bool b_opaque )
|
2007-10-19 00:10:11 +02:00
|
|
|
{
|
2008-07-29 20:45:58 +02:00
|
|
|
unsigned int x, y;
|
2007-10-19 00:10:11 +02:00
|
|
|
|
2008-07-29 20:02:11 +02:00
|
|
|
assert( fmt.i_chroma == VLC_FOURCC('R','G','B','A' ) );
|
|
|
|
|
2007-10-19 00:10:11 +02:00
|
|
|
/* Kludge since zvbi doesn't provide an option to specify opacity. */
|
2008-07-29 20:45:58 +02:00
|
|
|
for( y = 0; y < fmt.i_height; y++ )
|
2007-10-19 00:10:11 +02:00
|
|
|
{
|
2008-07-29 20:45:58 +02:00
|
|
|
for( x = 0; x < fmt.i_width; x++ )
|
2007-10-31 21:30:56 +01:00
|
|
|
{
|
2008-07-29 20:45:58 +02:00
|
|
|
const vbi_opacity opacity = p_page.text[ y/10 * p_page.columns + x/12 ].opacity;
|
2008-09-12 01:56:50 +02:00
|
|
|
const int background = p_page.text[ y/10 * p_page.columns + x/12 ].background;
|
2008-07-29 20:45:58 +02:00
|
|
|
uint32_t *p_pixel = (uint32_t*)&p_src->p->p_pixels[y * p_src->p->i_pitch + 4*x];
|
2008-09-12 01:56:50 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
switch( opacity )
|
|
|
|
{
|
|
|
|
/* Show video instead of this character */
|
|
|
|
case VBI_TRANSPARENT_SPACE:
|
|
|
|
*p_pixel = 0;
|
2007-10-31 21:30:56 +01:00
|
|
|
break;
|
2008-09-12 01:56:50 +02:00
|
|
|
/* Display foreground and background color */
|
2008-07-29 20:45:58 +02:00
|
|
|
/* To make the boxed text "closed captioning" transparent
|
|
|
|
* change true to false.
|
|
|
|
*/
|
|
|
|
case VBI_OPAQUE:
|
2008-09-12 01:56:50 +02:00
|
|
|
/* alpha blend video into background color */
|
|
|
|
case VBI_SEMI_TRANSPARENT:
|
2008-07-29 20:45:58 +02:00
|
|
|
if( b_opaque )
|
|
|
|
break;
|
|
|
|
/* Full text transparency. only foreground color is show */
|
|
|
|
case VBI_TRANSPARENT_FULL:
|
2008-09-12 01:56:50 +02:00
|
|
|
if( (*p_pixel) == (0xff000000 | p_page.color_map[background] ) )
|
2008-07-29 20:45:58 +02:00
|
|
|
*p_pixel = 0;
|
|
|
|
break;
|
|
|
|
}
|
2007-10-31 21:30:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* end of kludge */
|
|
|
|
return VLC_SUCCESS;
|
2007-10-19 00:10:11 +02:00
|
|
|
}
|
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
/* Callbacks */
|
2007-07-06 23:32:20 +02:00
|
|
|
static int RequestPage( vlc_object_t *p_this, char const *psz_cmd,
|
|
|
|
vlc_value_t oldval, vlc_value_t newval, void *p_data )
|
|
|
|
{
|
2008-07-29 21:10:16 +02:00
|
|
|
decoder_sys_t *p_sys = p_data;
|
2008-04-22 11:27:37 +02:00
|
|
|
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
|
2007-07-06 23:32:20 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_lock( &p_sys->lock );
|
2008-09-11 17:12:23 +02:00
|
|
|
switch( newval.i_int )
|
|
|
|
{
|
|
|
|
case ZVBI_KEY_RED:
|
|
|
|
p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[0].pgno );
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = p_sys->nav_link[0].subno;
|
2008-09-11 17:12:23 +02:00
|
|
|
break;
|
|
|
|
case ZVBI_KEY_GREEN:
|
|
|
|
p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[1].pgno );
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = p_sys->nav_link[1].subno;
|
2008-09-11 17:12:23 +02:00
|
|
|
break;
|
|
|
|
case ZVBI_KEY_YELLOW:
|
|
|
|
p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[2].pgno );
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = p_sys->nav_link[2].subno;
|
2008-09-11 17:12:23 +02:00
|
|
|
break;
|
|
|
|
case ZVBI_KEY_BLUE:
|
|
|
|
p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[3].pgno );
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = p_sys->nav_link[3].subno;
|
2008-09-11 17:12:23 +02:00
|
|
|
break;
|
|
|
|
case ZVBI_KEY_INDEX:
|
|
|
|
p_sys->i_wanted_page = vbi_bcd2dec( p_sys->nav_link[5].pgno ); /* #4 is SKIPPED */
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = p_sys->nav_link[5].subno;
|
2008-09-11 17:12:23 +02:00
|
|
|
break;
|
|
|
|
}
|
2008-07-29 20:45:58 +02:00
|
|
|
if( newval.i_int > 0 && newval.i_int < 999 )
|
2008-09-11 23:52:21 +02:00
|
|
|
{
|
2007-07-06 23:32:20 +02:00
|
|
|
p_sys->i_wanted_page = newval.i_int;
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
|
|
|
|
}
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_unlock( &p_sys->lock );
|
2007-07-06 23:32:20 +02:00
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
2007-07-06 23:32:38 +02:00
|
|
|
|
|
|
|
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;
|
2008-04-22 11:27:37 +02:00
|
|
|
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
|
2007-07-06 23:32:38 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_lock( &p_sys->lock );
|
|
|
|
p_sys->b_opaque = newval.b_bool;
|
2008-09-12 00:51:32 +02:00
|
|
|
p_sys->b_update = true;
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_unlock( &p_sys->lock );
|
|
|
|
|
2007-07-06 23:32:38 +02:00
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
2007-09-18 14:45:03 +02:00
|
|
|
|
|
|
|
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;
|
2008-04-22 11:27:37 +02:00
|
|
|
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
|
2007-09-18 14:45:03 +02:00
|
|
|
|
2008-07-29 20:45:58 +02:00
|
|
|
vlc_mutex_lock( &p_sys->lock );
|
|
|
|
p_sys->i_align = newval.i_int;
|
|
|
|
vlc_mutex_unlock( &p_sys->lock );
|
|
|
|
|
2007-09-18 14:45:03 +02:00
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
2008-09-11 20:26:28 +02:00
|
|
|
|
|
|
|
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;
|
2008-09-11 23:52:21 +02:00
|
|
|
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
|
|
|
|
|
|
|
|
/* FIXME: Capture + and - key for subpage browsing */
|
|
|
|
if( newval.i_int == '-' || newval.i_int == '+' )
|
|
|
|
{
|
|
|
|
vlc_mutex_lock( &p_sys->lock );
|
|
|
|
if( p_sys->i_wanted_subpage == VBI_ANY_SUBNO )
|
|
|
|
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) );
|
|
|
|
|
|
|
|
p_sys->b_update = true;
|
|
|
|
vlc_mutex_unlock( &p_sys->lock );
|
|
|
|
}
|
2008-09-11 20:26:28 +02:00
|
|
|
|
2008-09-11 23:52:21 +02:00
|
|
|
/* Capture 0-9 for page selection */
|
2008-09-11 20:26:28 +02:00
|
|
|
if( newval.i_int < '0' || newval.i_int > '9' )
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
|
|
|
|
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') );
|
|
|
|
|
|
|
|
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_sys->i_wanted_page = p_sys->i_key[0]*100 + p_sys->i_key[1]*10 + p_sys->i_key[2];
|
2008-09-11 23:52:21 +02:00
|
|
|
p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
|
2008-09-11 20:26:28 +02:00
|
|
|
p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0';
|
|
|
|
}
|
|
|
|
vlc_mutex_unlock( &p_sys->lock );
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|