summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/mplayer.rst9
-rw-r--r--DOCS/man/en/options.rst22
-rw-r--r--Makefile1
-rw-r--r--cfg-mplayer.h4
-rw-r--r--command.c107
-rw-r--r--etc/input.conf3
-rw-r--r--input/input.c2
-rw-r--r--input/input.h2
-rw-r--r--libmpcodecs/dec_teletext.c1888
-rw-r--r--libmpcodecs/dec_teletext.h148
-rw-r--r--libmpdemux/demuxer.c3
-rw-r--r--libmpdemux/demuxer.h3
-rw-r--r--mplayer.c60
-rw-r--r--stream/stream_tv.c6
-rw-r--r--stream/tv.c17
-rw-r--r--stream/tv.h6
-rw-r--r--stream/tvi_dshow.c39
-rw-r--r--stream/tvi_v4l2.c78
-rw-r--r--sub/osd_dummy.c4
-rw-r--r--sub/osd_libass.c10
-rw-r--r--sub/sub.c10
-rw-r--r--sub/sub.h7
22 files changed, 19 insertions, 2410 deletions
diff --git a/DOCS/man/en/mplayer.rst b/DOCS/man/en/mplayer.rst
index 66e82379f2..01625fd032 100644
--- a/DOCS/man/en/mplayer.rst
+++ b/DOCS/man/en/mplayer.rst
@@ -263,15 +263,6 @@ keypad 7
keypad ENTER
Confirm choice.
-(The following keys are used for controlling TV teletext. The data may come
-from either an analog TV source or an MPEG transport stream.)
-
-X
- Switch teletext on/off.
-
-Q and W
- Go to next/prev teletext page.
-
mouse control
-------------
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index be4bd2ecdd..323f498f5e 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2186,28 +2186,6 @@
Choose the quality of the JPEG compression (< 60 recommended for full
size).
- tdevice=<value>
- Specify TV teletext device (example: ``/dev/vbi0``) (default: none).
-
- tformat=<format>
- Specify TV teletext display format (default: 0):
-
- :0: opaque
- :1: transparent
- :2: opaque with inverted colors
- :3: transparent with inverted colors
-
- tpage=<100-899>
- Specify initial TV teletext page number (default: 100).
-
- tlang=<-1-127>
- Specify default teletext language code (default: 0), which will be
- used as primary language until a type 28 packet is received. Useful
- when the teletext system uses a non-latin character set, but language
- codes are not transmitted via teletext type 28 packets for some
- reason. To see a list of supported language codes set this option to
- -1.
-
hidden_video_renderer (dshow only)
Terminate stream with video renderer instead of Null renderer
(default: off). Will help if video freezes but audio does not.
diff --git a/Makefile b/Makefile
index b094f4e3b6..00eceda2a7 100644
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,6 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/ad_msadpcm.c \
libmpcodecs/ad_pcm.c \
libmpcodecs/dec_audio.c \
- libmpcodecs/dec_teletext.c \
libmpcodecs/dec_video.c \
libmpcodecs/img_format.c \
libmpcodecs/mp_image.c \
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 716eb9aca9..29bdaaef53 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -141,10 +141,6 @@ const m_option_t tvopts_conf[]={
#endif /* CONFIG_ALSA */
#endif /* defined(CONFIG_TV_V4L2) */
{"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"tdevice", &stream_tv_defaults.teletext.device, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"tpage", &stream_tv_defaults.teletext.page, CONF_TYPE_INT, CONF_RANGE, 100, 899, NULL},
- {"tformat", &stream_tv_defaults.teletext.format, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
- {"tlang", &stream_tv_defaults.teletext.lang, CONF_TYPE_INT, CONF_RANGE, -1, 0x7f, NULL},
{"audioid", &stream_tv_defaults.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
#ifdef CONFIG_TV_DSHOW
{"hidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
diff --git a/command.c b/command.c
index fb40a0b60f..842a9359e0 100644
--- a/command.c
+++ b/command.c
@@ -51,7 +51,6 @@
#include "mixer.h"
#include "libmpcodecs/dec_video.h"
#include "libmpcodecs/dec_audio.h"
-#include "libmpcodecs/dec_teletext.h"
#include "osdep/strsep.h"
#include "sub/vobsub.h"
#include "sub/spudec.h"
@@ -2110,91 +2109,6 @@ static int mp_property_tv_color(m_option_t *prop, int action, void *arg,
#endif
-static int mp_property_teletext_common(m_option_t *prop, int action, void *arg,
- MPContext *mpctx)
-{
- int val, result;
- int base_ioctl = prop->offset;
- /*
- for teletext's GET,SET,STEP ioctls this is not 0
- SET is GET+1
- STEP is GET+2
- */
- if (!mpctx->demuxer || !mpctx->demuxer->teletext)
- return M_PROPERTY_UNAVAILABLE;
- if (!base_ioctl)
- return M_PROPERTY_ERROR;
-
- switch (action) {
- case M_PROPERTY_GET:
- if (!arg)
- return M_PROPERTY_ERROR;
- result = teletext_control(mpctx->demuxer->teletext, base_ioctl, arg);
- break;
- case M_PROPERTY_SET:
- if (!arg)
- return M_PROPERTY_ERROR;
- M_PROPERTY_CLAMP(prop, *(int *) arg);
- result = teletext_control(mpctx->demuxer->teletext, base_ioctl + 1,
- arg);
- break;
- case M_PROPERTY_STEP_UP:
- case M_PROPERTY_STEP_DOWN:
- result = teletext_control(mpctx->demuxer->teletext, base_ioctl, &val);
- val += (arg ? *(int *) arg : 1) * (action == M_PROPERTY_STEP_DOWN ?
- -1 : 1);
- result = teletext_control(mpctx->demuxer->teletext, base_ioctl + 1,
- &val);
- break;
- default:
- return M_PROPERTY_NOT_IMPLEMENTED;
- }
-
- return result == VBI_CONTROL_TRUE ? M_PROPERTY_OK : M_PROPERTY_ERROR;
-}
-
-static int mp_property_teletext_mode(m_option_t *prop, int action, void *arg,
- MPContext *mpctx)
-{
- int result;
- int val;
-
- //with tvh==NULL will fail too
- result = mp_property_teletext_common(prop, action, arg, mpctx);
- if (result != M_PROPERTY_OK)
- return result;
-
- if (teletext_control(mpctx->demuxer->teletext,
- prop->offset, &val) == VBI_CONTROL_TRUE && val)
- mp_input_set_section(mpctx->input, "teletext");
- else
- mp_input_set_section(mpctx->input, "tv");
- return M_PROPERTY_OK;
-}
-
-static int mp_property_teletext_page(m_option_t *prop, int action, void *arg,
- MPContext *mpctx)
-{
- int result;
- int val;
- if (!mpctx->demuxer->teletext)
- return M_PROPERTY_UNAVAILABLE;
- switch (action) {
- case M_PROPERTY_STEP_UP:
- case M_PROPERTY_STEP_DOWN:
- //This should be handled separately
- val = (arg ? *(int *) arg : 1) * (action == M_PROPERTY_STEP_DOWN ?
- -1 : 1);
- result = teletext_control(mpctx->demuxer->teletext,
- TV_VBI_CONTROL_STEP_PAGE, &val);
- break;
- default:
- result = mp_property_teletext_common(prop, action, arg, mpctx);
- }
- return result;
-}
-
-
/// All properties available in MPlayer.
/** \ingroup Properties
*/
@@ -2357,17 +2271,6 @@ static const m_option_t mp_properties[] = {
{ "tv_hue", mp_property_tv_color, CONF_TYPE_INT,
M_OPT_RANGE, -100, 100, .offset = TV_COLOR_HUE },
#endif
- { "teletext_page", mp_property_teletext_page, CONF_TYPE_INT,
- M_OPT_RANGE, 100, 899, .offset = TV_VBI_CONTROL_GET_PAGE },
- { "teletext_subpage", mp_property_teletext_common, CONF_TYPE_INT,
- M_OPT_RANGE, 0, 64, .offset = TV_VBI_CONTROL_GET_SUBPAGE },
- { "teletext_mode", mp_property_teletext_mode, CONF_TYPE_FLAG,
- M_OPT_RANGE, 0, 1, .offset = TV_VBI_CONTROL_GET_MODE },
- { "teletext_format", mp_property_teletext_common, CONF_TYPE_INT,
- M_OPT_RANGE, 0, 3, .offset = TV_VBI_CONTROL_GET_FORMAT },
- { "teletext_half_page", mp_property_teletext_common, CONF_TYPE_INT,
- M_OPT_RANGE, 0, 2, .offset = TV_VBI_CONTROL_GET_HALF_PAGE },
- { NULL, NULL, NULL, 0, 0, 0, NULL }
};
@@ -3356,16 +3259,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
tv_step_chanlist((tvi_handle_t *) (mpctx->demuxer->priv));
break;
#endif /* CONFIG_TV */
- case MP_CMD_TV_TELETEXT_ADD_DEC:
- if (mpctx->demuxer->teletext)
- teletext_control(mpctx->demuxer->teletext, TV_VBI_CONTROL_ADD_DEC,
- &(cmd->args[0].v.s));
- break;
- case MP_CMD_TV_TELETEXT_GO_LINK:
- if (mpctx->demuxer->teletext)
- teletext_control(mpctx->demuxer->teletext, TV_VBI_CONTROL_GO_LINK,
- &(cmd->args[0].v.i));
- break;
case MP_CMD_SUB_LOAD:
if (sh_video) {
diff --git a/etc/input.conf b/etc/input.conf
index 0bfc5ca607..f59948f4fb 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -133,9 +133,6 @@ h tv_step_channel 1
k tv_step_channel -1
n tv_step_norm
u tv_step_chanlist
-X step_property teletext_mode 1
-W step_property teletext_page 1
-Q step_property teletext_page -1
#
# DVDNAV
diff --git a/input/input.c b/input/input.c
index ed33c83c34..496c5ca46e 100644
--- a/input/input.c
+++ b/input/input.c
@@ -196,8 +196,6 @@ static const mp_cmd_t mp_cmds[] = {
{ MP_CMD_PLAYLIST_CLEAR, "playlist_clear", },
{ MP_CMD_RUN, "run", { ARG_STRING } },
{ MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", { ARG_INT, ARG_INT } },
- { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", { ARG_STRING } },
- { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", { ARG_INT } },
#ifdef CONFIG_DVDNAV
{ MP_CMD_DVDNAV, "dvdnav", { ARG_STRING } },
diff --git a/input/input.h b/input/input.h
index 5b1bb37209..0fccbb5233 100644
--- a/input/input.h
+++ b/input/input.h
@@ -120,8 +120,6 @@ enum mp_command_type {
MP_CMD_LOOP,
MP_CMD_BALANCE,
MP_CMD_SUB_SCALE,
- MP_CMD_TV_TELETEXT_ADD_DEC,
- MP_CMD_TV_TELETEXT_GO_LINK,
MP_CMD_TV_START_SCAN,
MP_CMD_SUB_SOURCE,
MP_CMD_SUB_FILE,
diff --git a/libmpcodecs/dec_teletext.c b/libmpcodecs/dec_teletext.c
deleted file mode 100644
index 4ae94ec0d1..0000000000
--- a/libmpcodecs/dec_teletext.c
+++ /dev/null
@@ -1,1888 +0,0 @@
-/*
- * Teletext support
- *
- * Copyright (C) 2007 Vladimir Voroshilov <voroshil@gmail.com>
- *
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
- * Based on Attila Otvos' teletext patch, Michael Niedermayer's
- * proof-of-concept teletext capture utility and some parts
- * (decode_raw_line_runin,pll_add,pll_reset) of MythTV project.
- * Code for calculating [soc:eoc] is based on aletv of Edgar Toernig.
- *
- * Teletext system is described in
- * ETS 300 706 "Enhanced Teletext specification" : May 1997
- * http://www.themm.net/~mihu/linux/saa7146/specs/ets_300706e01p.pdf
- *
- * Some implementation details:
- * How to port teletext to another tvi_* driver (see tvi_v4l2.c for example):
- *
- * 1. Implement TVI_CONTROL_VBI_INIT (initialize driver-related vbi subsystem,
- * start grabbing thread)
- * input data: vbi device name.
- * (driver should also call TV_VBI_CONTROL_START for common vbi subsystem initialization
- * with pointer to initialized tt_stream_properties structure.
- * After ioctl call variable will contain pointer to initialized priv_vbi_t structure.
- *
- * 2. After receiving next chunk of raw vbi data call TV_VBI_CONTROL_DECODE_PAGE
- * ioctl with pointer to data buffer
- * 3. pass all other VBI related ioctl cmds to teletext_control routine
- *
- * Page displaying process consist of following stages:
- *
- * ---grabbing stage---
- * 0. stream/tvi_*.c: vbi_grabber(...)
- * getting vbi data from video device
- * ---decoding stage---
- * 1. libmpcodecs/dec_teletext.c: decode_raw_line_runin(...) or decode_raw_line_sine(...)
- * decode raw vbi data into sliced 45(?) bytes long packets
- * 2. libmpcodecs/dec_teletext.c: decode_pkt0(...), decode_pkt_page(...)
- * packets processing (header analyzing, storing complete page in cache,
- * only raw member of tt_char is filled at this stage)
- * 3. libmpcodecs/dec_teletext.c: decode_page(...)
- * page decoding. filling unicode,gfx,ctl,etc members of tt_char structure
- * with appropriate values according to teletext control chars, converting
- * text to utf8.
- * ---rendering stage---
- * 4. libmpcodecs/dec_teletext.c: prepare_visible_page(...)
- * processing page. adding number of just received by background process
- * teletext page, adding current time,etc.
- * 5. libvo/sub.c: vo_update_text_teletext(...)
- * rendering displayable osd with text and graphics
- *
- * TODO:
- * v4lv1,bktr support
- * spu rendering
- * is better quality on poor signal possible ?
- * link support
- * greyscale osd
- * slave command for dumping pages
- * fix bcd<->dec as suggested my Michael
- *
- * BUGS:
- * wrong colors in debug dump
- * blinking when visible page was just updated
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <math.h>
-#include <stdio.h>
-
-#ifdef HAVE_PTHREADS
-// pthreads are needed for async updates from v4l(2)
-// FIXME: try to avoid using pthread calls when running only a single
-// thread as e.g. with DVB teletext
-#include <pthread.h>
-#else
-#define pthread_mutex_init(m, p)
-#define pthread_mutex_destroy(m)
-#define pthread_mutex_lock(m)
-#define pthread_mutex_unlock(m)
-#endif
-
-#include "dec_teletext.h"
-#include "mp_msg.h"
-#include "libmpcodecs/img_format.h"
-#include "libavutil/common.h"
-#include "input/input.h"
-#include "osdep/timer.h"
-
-//#define DEBUG_DUMP 1
-
-/// page magazine entry structure
-typedef struct mag_s{
- tt_page* pt;
- int order;
-} mag_t;
-
-typedef struct {
- int on; ///< teletext on/off
- int pagenum; ///< seek page number
- int subpagenum; ///< seek subpage
- int curr_pagenum; ///< current page number
- int pagenumdec; ///< set page num with dec
-
- teletext_format tformat; ///< see teletext_format enum
- teletext_zoom zoom; ///< see teletext_zoom enum
- mag_t* mag; ///< pages magazine (has 8 entities)
- int primary_language; ///< primary character set
- int secondary_language; ///< secondary character set
- /// Currently displayed page (with additional info, e.g current time)
- tt_char display_page[VBI_ROWS*VBI_COLUMNS];
- /// number of raw bytes between two subsequent encoded bits
- int bpb;
- /// clock run-in sequence will be searched in buffer in [soc:eoc] bytes range
- int soc;
- int eoc;
- /// minimum number of raw vbi bytes wich can be decoded into 8 data bits
- int bp8bl;
- /// maximum number of raw vbi bytes wich can be decoded into 8 data bits
- int bp8bh;
-
- int pll_adj;
- int pll_dir;
- int pll_cnt;
- int pll_err;
- int pll_lerr;
- int pll_fixed;
- /// vbi stream properties (buffer size,bytes per line, etc)
- tt_stream_props* ptsp;
-#ifdef HAVE_PTHREADS
- pthread_mutex_t buffer_mutex;
-#endif
-
- tt_page** ptt_cache;
- unsigned char* ptt_cache_first_subpage;
- /// network info
- unsigned char initialpage;
- unsigned int initialsubpage;
- unsigned int networkid;
- int timeoffset; // timeoffset=realoffset*2
- unsigned int juliandate;
- unsigned int universaltime;
- unsigned char networkname[21];
- int cache_reset;
- /// "page changed" flag: 0-unchanged, 1-entire page, 3-only header
- int page_changed;
- int last_rendered;
-} priv_vbi_t;
-
-static unsigned char fixParity[256];
-
-static const tt_char tt_space={0x20,7,0,0,0,0,0,0,0x20};
-static const tt_char tt_error={'?',1,0,0,0,0,0,0,'?'}; // Red '?' on black background
-static double si[12];
-static double co[12];
-
-#define VBI_FORMAT(priv) (*(priv->ptsp))
-
-#define FIXP_SH 16
-#define ONE_FIXP (1<<FIXP_SH)
-#define FIXP2INT(a) ((a)>>FIXP_SH)
-#define ANY2FIXP(a) ((int)((a)*ONE_FIXP))
-
-static const unsigned char corrHamm48[256]={
- 0x01, 0xff, 0x01, 0x01, 0xff, 0x00, 0x01, 0xff,
- 0xff, 0x02, 0x01, 0xff, 0x0a, 0xff, 0xff, 0x07,
- 0xff, 0x00, 0x01, 0xff, 0x00, 0x00, 0xff, 0x00,
- 0x06, 0xff, 0xff, 0x0b, 0xff, 0x00, 0x03, 0xff,
- 0xff, 0x0c, 0x01, 0xff, 0x04, 0xff, 0xff, 0x07,
- 0x06, 0xff, 0xff, 0x07, 0xff, 0x07, 0x07, 0x07,
- 0x06, 0xff, 0xff, 0x05, 0xff, 0x00, 0x0d, 0xff,
- 0x06, 0x06, 0x06, 0xff, 0x06, 0xff, 0xff, 0x07,
- 0xff, 0x02, 0x01, 0xff, 0x04, 0xff, 0xff, 0x09,
- 0x02, 0x02, 0xff, 0x02, 0xff, 0x02, 0x03, 0xff,
- 0x08, 0xff, 0xff, 0x05, 0xff, 0x00, 0x03, 0xff,
- 0xff, 0x02, 0x03, 0xff, 0x03, 0xff, 0x03, 0x03,
- 0x04, 0xff, 0xff, 0x05, 0x04, 0x04, 0x04, 0xff,
- 0xff, 0x02, 0x0f, 0xff, 0x04, 0xff, 0xff, 0x07,
- 0xff, 0x05, 0x05, 0x05, 0x04, 0xff, 0xff, 0x05,
- 0x06, 0xff, 0xff, 0x05, 0xff, 0x0e, 0x03, 0xff,
- 0xff, 0x0c, 0x01, 0xff, 0x0a, 0xff, 0xff, 0x09,
- 0x0a, 0xff, 0xff, 0x0b, 0x0a, 0x0a, 0x0a, 0xff,
- 0x08, 0xff, 0xff, 0x0b, 0xff, 0x00, 0x0d, 0xff,
- 0xff, 0x0b, 0x0b, 0x0b, 0x0a, 0xff, 0xff, 0x0b,
- 0x0c, 0x0c, 0xff, 0x0c, 0xff, 0x0c, 0x0d, 0xff,
- 0xff, 0x0c, 0x0f, 0xff, 0x0a, 0xff, 0xff, 0x07,
- 0xff, 0x0c, 0x0d, 0xff, 0x0d, 0xff, 0x0d, 0x0d,
- 0x06, 0xff, 0xff, 0x0b, 0xff, 0x0e, 0x0d, 0xff,
- 0x08, 0xff, 0xff, 0x09, 0xff, 0x09, 0x09, 0x09,
- 0xff, 0x02, 0x0f, 0xff, 0x0a, 0xff, 0xff, 0x09,
- 0x08, 0x08, 0x08, 0xff, 0x08, 0xff, 0xff, 0x09,
- 0x08, 0xff, 0xff, 0x0b, 0xff, 0x0e, 0x03, 0xff,
- 0xff, 0x0c, 0x0f, 0xff, 0x04, 0xff, 0xff, 0x09,
- 0x0f, 0xff, 0x0f, 0x0f, 0xff, 0x0e, 0x0f, 0xff,
- 0x08, 0xff, 0xff, 0x05, 0xff, 0x0e, 0x0d, 0xff,
- 0xff, 0x0e, 0x0f, 0xff, 0x0e, 0x0e, 0xff, 0x0e };
-
-
-enum {
- LATIN=0,
- CYRILLIC1,
- CYRILLIC2,
- CYRILLIC3,
- GREEK,
- LANGS
-};
-
-// conversion table for chars 0x20-0x7F (UTF8)
-// TODO: add another languages
-static const unsigned int lang_chars[LANGS][0x60]={
- {
- //Latin
- 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
- 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
- 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
- 0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
- 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
- 0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
- 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
- 0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
- 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
- 0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f
- },
- {
- //Cyrillic-1 (Serbian/Croatian)
- 0x20,0x21,0x22,0x23,0x24,0x25,0x044b,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
- 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
- 0x0427,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
- 0x0425,0x0418,0x0408,0x041a,0x041b,0x041c,0x041d,0x041e,
- 0x041f,0x040c,0x0420,0x0421,0x0422,0x0423,0x0412,0x0403,
- 0x0409,0x040a,0x0417,0x040b,0x0416,0x0402,0x0428,0x040f,
- 0x0447,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
- 0x0445,0x0438,0x0428,0x043a,0x043b,0x043c,0x043d,0x043e,
- 0x043f,0x042c,0x0440,0x0441,0x0442,0x0443,0x0432,0x0423,
- 0x0429,0x042a,0x0437,0x042b,0x0436,0x0422,0x0448,0x042f
- },
- {
- //Cyrillic-2 (Russian/Bulgarian)
- 0x20,0x21,0x22,0x23,0x24,0x25,0x044b,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
- 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
- 0x042e,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
- 0x0425,0x0418,0x0419,0x041a,0x041b,0x041c,0x041d,0x041e,
- 0x041f,0x042f,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
- 0x042c,0x042a,0x0417,0x0428,0x042d,0x0429,0x0427,0x042b,
- 0x044e,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
- 0x0445,0x0438,0x0439,0x043a,0x043b,0x043c,0x043d,0x043e,
- 0x043f,0x044f,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
- 0x044c,0x044a,0x0437,0x0448,0x044d,0x0449,0x0447,0x044b
- },
- {
- //Cyrillic-3 (Ukrainian)
- 0x20,0x21,0x22,0x23,0x24,0x25,0xef,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
- 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
- 0x042e,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
- 0x0425,0x0418,0x0419,0x041a,0x041b,0x041c,0x041d,0x041e,
- 0x041f,0x042f,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
- 0x042c,0x49,0x0417,0x0428,0x042d,0x0429,0x0427,0xcf,
- 0x044e,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
- 0x0445,0x0438,0x0439,0x043a,0x043b,0x043c,0x043d,0x043e,
- 0x043f,0x044f,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
- 0x044c,0x69,0x0437,0x0448,0x044d,0x0449,0x0447,0xFF
- },
- {
- //Greek
- 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
- 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
- 0x0390,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,
- 0x0398,0x0399,0x039a,0x039b,0x039c,0x039d,0x039e,0x039f,
- 0x03a0,0x03a1,0x03a2,0x03a3,0x03a4,0x03a5,0x03a6,0x03a7,
- 0x03a8,0x03a9,0x03aa,0x03ab,0x03ac,0x03ad,0x03ae,0x03af,
- 0x03b0,0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,0x03b6,0x03b7,
- 0x03b8,0x03b9,0x03ba,0x03bb,0x03bc,0x03bd,0x03be,0x03bf,
- 0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,0x03c5,0x03c6,0x03c7,
- 0x03c8,0x03c9,0x03ca,0x03cb,0x03cc,0x03cd,0x03ce,0x03cf
- }
-};
-
-/**
- * Latin National Option Sub-Sets
- * see Table 36 of ETS specification for details.
- *
- * 00: £ $ @ « ½ » ¬ # ­ ¼ ¦ ¾ ÷ English
- * 01: é ï à ë ê ù î # è â ô û ç French
- * 02: # ¤ É Ä Ö Å Ü _ é ä ö å ü Swedish/Finnish/Hungarian
- * 03: # ů č ť ž ý í ř é á ě ú š Czech/Slovak
- * 04: # $ § Ä Ö Ü ^ _ ° ä ö ü ß German
- * 05: ç $ ¡ á é í ó ú ¿ ü ñ è à Portuguese/Spanish
- * 06: £ $ é ° ç » ¬ # ù à ò è ì Italian
- *
- */
-static const unsigned int latin_subchars[8][13]={
- // English
- {0xa3,0x24,0x40,0xab,0xbd,0xbb,0xac,0x23,0xad,0xbc,0xa6,0xbe,0xf7},
- // French
- {0xe9,0xef,0xe0,0xeb,0xea,0xf9,0xee,0x23,0xe8,0xe2,0xf4,0xfb,0xe7},
- // Swedish/Finnish/Hungarian
- {0x23,0xa4,0xc9,0xc4,0xd6,0xc5,0xdc,0x5f,0xe9,0xe4,0xf6,0xe5,0xfc},
- // Czech/Slovak
- {0x23,0x16f,0x10d,0x165,0x17e,0xfd,0xed,0x159,0xe9,0xe1,0x11b,0xfa,0x161},
- // German
- {0x23,0x24,0xa7,0xc4,0xd6,0xdc,0x5e,0x5f,0xb0,0xe4,0xf6,0xfc,0xdf},
- // Portuguese/Spanish
- {0xe7,0x24,0xa1,0xe1,0xe9,0xed,0xf3,0xfa,0xbf,0xfc,0xf1,0xe8,0xe0},
- // Italian
- {0xa3,0x24,0xe9,0xb0,0xe7,0xbb,0xac,0x23,0xf9,0xe0,0xf2,0xe8,0xec},
- // Reserved
- {0x23,0x24,0x40,0x5b,0x5c,0x5d,0x5e,0x5f,0x60,0x7b,0x7c,0x7d,0x7e}
-};
-
-/**
- * List of supported languages.
- *
- * lang_code bits for primary Language:
- * bits 7-4 corresponds to bits 14-11 of 28 packet's first triplet
- * bits 3-1 corresponds to bits C12-C14 of packet 0 (lang)
- *
- * lang_code bits for secondary Language:
- * bits 7-5 corresponds to bits 3-1 of 28 packet's second triplet
- * bits 4,2 corresponds to bits 18,16 of 28 packet's first triplet
- * bits 3,1 corresponds to bits 15,17 of 28 packet's first triplet
- *
- * For details see Tables 32 and 33 of specification (subclause 15.2)
- */
-struct {
- unsigned char lang_code;
- unsigned char charset;
- const char* lang_name;
-} const tt_languages[]=
-{
- { 0x01, LATIN, "French"},
- { 0x02, LATIN, "Swedish/Finnish/Hungarian"},
- { 0x03, LATIN, "Czech/Slovak"},
- { 0x04, LATIN, "German"},
- { 0x05, LATIN, "Portuguese/Spanish"},
- { 0x06, LATIN, "Italian"},
-
- { 0x08, LATIN, "Polish"},
- { 0x09, LATIN, "French"},
- { 0x0a, LATIN, "Swedish/Finnish/Hungarian"},
- { 0x0b, LATIN, "Czech/Slovak"},
- { 0x0c, LATIN, "German"},
- { 0x0e, LATIN, "Italian"},
-
- { 0x10, LATIN, "English"},
- { 0x11, LATIN, "French"},
- { 0x12, LATIN, "Swedish/Finnish/Hungarian"},
- { 0x13, LATIN, "Turkish"},
- { 0x14, LATIN, "German"},
- { 0x15, LATIN, "Portuguese/Spanish"},
- { 0x16, LATIN, "Italian"},
-
- { 0x1d, LATIN, "Serbian/Croatian/Slovenian (Latin)"},
-
- { 0x20, CYRILLIC1, "Serbian/Croatian (Cyrillic)"},
- { 0x21, CYRILLIC2, "Russian, Bulgarian"},
- { 0x22, LATIN, "Estonian"},
- { 0x23, LATIN, "Czech/Slovak"},
- { 0x24, LATIN, "German"},
- { 0x25, CYRILLIC3, "Ukrainian"},
- { 0x26, LATIN, "Lettish/Lithuanian"},
-
- { 0x33, LATIN, "Turkish"},
- { 0x37, GREEK, "Greek"},
-
- { 0x40, LATIN, "English"},
- { 0x41, LATIN, "French"},
-// { 0x47, ARABIC, "Arabic"},
-
-// { 0x55, HEBREW, "Hebrew"},
-// { 0x57, ARABIC, "Arabic"},
-
- { 0x00, LATIN, "English"},
-};
-
-/**
- * \brief 24/18 Hamming code decoding
- * \param data bytes with hamming code (array must be at least 3 bytes long)
- * \return -1 if multiple bit error occured, D1-DI data bits - otherwise
- *
- * \note Bits must be correctly ordered, that is for 24/18 (lowest bit first)
- * P1 P2 D1 P3 D2 D3 D4 P4 D5 D6 D7 D8 D9 DA DB P5 DC DD DE DF DG DH DI P6
- */
-static int corrHamm24(unsigned char *data){
- unsigned char syndrom=0;
- int cw=data[0] | (data[1]<<8) | (data[2]<<16);
- int i;
-
- for(i=0;i<23;i++)
- syndrom^=((cw>>i)&1)*(i+33);
-
- syndrom^=(cw>>11)&32;
-
- if(syndrom&31){
- if(syndrom < 32 || syndrom > 55)
- return -1;
- cw ^= 1<<((syndrom&31)-1);
- }
-
- return (cw&4)>>2 |
- (cw&0x70)>>3 |
- (cw&0x3f00)>>4 |
- (cw&0x3f0000)>>5;
-}
-
-/**
- * \brief converts language bits to charset index
- * \param lang language bits
- * \return charset index in lang_chars array
- */
-static int lang2charset (int lang){
- int i;
- for(i=0;tt_languages[i].lang_code;i++)
- if(tt_languages[i].lang_code==lang)
- break;
-
- return tt_languages[i].charset;
-}
-
-/**
- * \brief convert chars from curent teletext codepage into MPlayer charset
- * \param p raw teletext char to decode
- * \param charset index on lang_chars
- * \param lang index in substitution array (latin charset only)
- * \return UTF8 char
- *
- * \remarks
- * routine will analyze raw member of given tt_char structure and
- * fill unicode member of the same struct with appropriate utf8 code.
- */
-static unsigned int conv2uni(unsigned int p,int charset,int lang)
-{
-
- if(p<0x80 && p>=0x20){
- if(charset==LATIN){
- lang&=7;
- if (p>=0x23 && p<=0x24){
- return latin_subchars[lang][p-0x23];
- }else if (p==0x40){
- return latin_subchars[lang][2];
- }else if (p>=0x5b && p<=0x60){
- return latin_subchars[lang][p-0x5b+3];
- }else if (p>=0x7b && p<=0x7e){
- return latin_subchars[lang][p-0x7b+9];
- }
- }
- return lang_chars[charset][p-0x20];
- }else
- return 0x20;
-}
-
-static void init_vbi_consts(priv_vbi_t* priv){
- int i,j;
- double ang;
- for(i=0; i<256; i++){
- j=i&0x7F;
- j^= j+j;
- j^= j<<2;
- j^= j<<4;
- fixParity[i]= i ^ (j&0x80) ^ 0x80;
- }
-
- for(i=0,ang=0; i<12; i++,ang+=M_PI/priv->bpb){
- si[i]= sin(ang);
- co[i]= cos(ang);
- }
-
- priv->bpb=(priv->ptsp->sampling_rate/6937500.0)*ONE_FIXP+0.5;
- priv->soc=FFMAX(9.2e-6*priv->ptsp->sampling_rate-priv->ptsp->offset, 0);
- priv->eoc=FFMIN(12.9e-6*priv->ptsp->sampling_rate-priv->ptsp->offset,
- priv->ptsp->samples_per_line-43*8*priv->bpb/ONE_FIXP);
- if (priv->eoc - priv->soc<16*priv->bpb/ONE_FIXP){ // invalid [soc:eoc]
- priv->soc=0;
- priv->eoc=92;
- }
- priv->bp8bl=0.97*8*priv->bpb/ONE_FIXP; // -3% tolerance
- priv->bp8bh=1.03*8*priv->bpb/ONE_FIXP; // +3% tolerance
-}
-/**
- * \brief calculate increased/decreased by given value page number
- * \param curr current page number in hexadecimal for
- * \param direction decimal value (can be negative) to add to value
- * of curr parameter
- * \return new page number in hexadecimal form
- *
- * VBI page numbers are represented in special hexadecimal form, e.g.
- * page with number 123 (as seen by user) internally has number 0x123.
- * and equation 0x123+8 should be equal to 0x131 instead of regular 0x12b.
- *
- *
- * Page numbers 0xYYY (where Y is not belongs to (0..9).
- * Page number belongs to [0x000,0x799] or [0x100:0x899] (first 0 can be
- * treated as '8')
- */
-static int steppage(int p, int direction, int skip_hidden)
-{
- if(skip_hidden)
- p=(p&15)+((p>>4)&15)*10+(p>>8)*100;
- p+=direction;
- if(skip_hidden){
- p=(p+800)%800;
- p=(p%10)+((p/10)%10)*16+(p/100)*256;
- }
-
- return p&0x7ff;
-}
-
-/*
-------------------------------------------------------------------
- Cache stuff
-------------------------------------------------------------------
-*/
-
-/**
- * \brief add/update entry in cache
- * \param priv private data structure
- * \param pg page to store in cache
- * \param line line to update (value below 0 means update entire page)
- */
-static void put_to_cache(priv_vbi_t* priv,tt_page* pg,int line){
- tt_page* pgc; //page in cache
- int i,j,count;
-
- if(line<0){
- i=0;
- count=VBI_ROWS*VBI_COLUMNS;
- }else if(line<VBI_ROWS){
- i=line*VBI_COLUMNS;
- count=(line+1)*VBI_COLUMNS;
- }else
- return;
-
- pthread_mutex_lock(&(priv->buffer_mutex));
-
- if(!priv->ptt_cache[pg->pagenum]){
- priv->ptt_cache[pg->pagenum]=calloc(1,sizeof(tt_page));
- pgc=priv->ptt_cache[pg->pagenum];
- }else{
- pgc=priv->ptt_cache[pg->pagenum];
- while(pgc->next_subpage && pgc->subpagenum!=pg->subpagenum)
- pgc=pgc->next_subpage;
-
- if(pgc->subpagenum!=pg->subpagenum){
- pgc->next_subpage=calloc(1,sizeof(tt_page));
- pgc=pgc->next_subpage;
- }
- }
- pgc->pagenum=pg->pagenum;
- pgc->subpagenum=pg->subpagenum;
- pgc->primary_lang=pg->primary_lang;
- pgc->secondary_lang=pg->secondary_lang;
- pgc->flags=pg->flags;
- for(j=0;j<6;++j)
- pgc->links[j]=pg->links[j];
- //instead of copying entire page into cache, copy only undamaged
- //symbols into cache
- for(;i<count;i++){
- if(!(pg->raw[i]&0x80))
- pgc->raw[i]=pg->raw[i];
- else
- mp_msg(MSGT_TELETEXT,MSGL_DBG3,"char error. pg:%x, c[%d]=0x%x\n",
- pg->pagenum,i,pg->raw[i]);
- }
- pgc->active=1;