[MPlayer-cvslog] r29851 - in trunk: Makefile cfg-common.h command.c configure input/input.c libmpcodecs/dec_teletext.h libvo/sub.c mpcommon.c stream/tvi_dshow.c stream/tvi_v4l.c stream/tvi_v4l2.c
cehoyos
subversion at mplayerhq.hu
Sat Nov 7 17:40:43 CET 2009
Author: cehoyos
Date: Sat Nov 7 17:40:42 2009
New Revision: 29851
Log:
Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.
Modified:
trunk/Makefile
trunk/cfg-common.h
trunk/command.c
trunk/configure
trunk/input/input.c
trunk/libmpcodecs/dec_teletext.h
trunk/libvo/sub.c
trunk/mpcommon.c
trunk/stream/tvi_dshow.c
trunk/stream/tvi_v4l.c
trunk/stream/tvi_v4l2.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/Makefile Sat Nov 7 17:40:42 2009 (r29851)
@@ -272,7 +272,6 @@ SRCS_COMMON-$(TV) +=
stream/frequencies.c stream/tvi_dummy.c
SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c
SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c
-SRCS_COMMON-$(TV_TELETEXT) += libmpcodecs/dec_teletext.c
SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c
SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
@@ -378,6 +377,7 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/ad_msgsm.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 \
Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/cfg-common.h Sat Nov 7 17:40:42 2009 (r29851)
@@ -125,12 +125,10 @@ const m_option_t tvopts_conf[]={
#endif /* CONFIG_ALSA */
#endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */
{"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#ifdef CONFIG_TV_TELETEXT
{"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},
-#endif /* CONFIG_TV_TELETEXT */
{"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},
Modified: trunk/command.c
==============================================================================
--- trunk/command.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/command.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -1878,7 +1878,6 @@ static int mp_property_tv_color(m_option
#endif
-#ifdef CONFIG_TV_TELETEXT
static int mp_property_teletext_common(m_option_t * prop, int action, void *arg,
MPContext * mpctx)
{
@@ -1959,9 +1958,6 @@ static int mp_property_teletext_page(m_o
return result;
}
-
-#endif /* CONFIG_TV_TELETEXT */
-
///@}
/// All properties available in MPlayer.
@@ -2114,8 +2110,6 @@ static const m_option_t mp_properties[]
{ "tv_hue", mp_property_tv_color, CONF_TYPE_INT,
M_OPT_RANGE, -100, 100, (void *) TV_COLOR_HUE },
#endif
-
-#ifdef CONFIG_TV_TELETEXT
{ "teletext_page", mp_property_teletext_page, CONF_TYPE_INT,
M_OPT_RANGE, 100, 899, (void*)TV_VBI_CONTROL_GET_PAGE },
{ "teletext_subpage", mp_property_teletext_common, CONF_TYPE_INT,
@@ -2126,8 +2120,6 @@ static const m_option_t mp_properties[]
M_OPT_RANGE, 0, 3, (void*)TV_VBI_CONTROL_GET_FORMAT },
{ "teletext_half_page", mp_property_teletext_common, CONF_TYPE_INT,
M_OPT_RANGE, 0, 2, (void*)TV_VBI_CONTROL_GET_HALF_PAGE },
-#endif
-
{ NULL, NULL, NULL, 0, 0, 0, NULL }
};
@@ -2870,7 +2862,6 @@ int run_command(MPContext * mpctx, mp_cm
tv_step_chanlist((tvi_handle_t *) (mpctx->demuxer->priv));
break;
#endif /* CONFIG_TV */
-#ifdef CONFIG_TV_TELETEXT
case MP_CMD_TV_TELETEXT_ADD_DEC:
{
if (mpctx->demuxer->teletext)
@@ -2885,7 +2876,6 @@ int run_command(MPContext * mpctx, mp_cm
&(cmd->args[0].v.i));
break;
}
-#endif /* CONFIG_TV_TELETEXT */
case MP_CMD_SUB_LOAD:
if (sh_video) {
Modified: trunk/configure
==============================================================================
--- trunk/configure Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/configure Sat Nov 7 17:40:42 2009 (r29851)
@@ -248,7 +248,6 @@ Optional features:
--disable-tv-v4l1 disable Video4Linux TV interface [autodetect]
--disable-tv-v4l2 disable Video4Linux2 TV interface [autodetect]
--disable-tv-bsdbt848 disable BSD BT848 interface [autodetect]
- --disable-tv-teletext disable TV teletext interface [autodetect]
--disable-pvr disable Video4Linux2 MPEG PVR [autodetect]
--disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
--disable-network disable networking [enable]
@@ -668,7 +667,6 @@ _tv_v4l1=auto
_tv_v4l2=auto
_tv_bsdbt848=auto
_tv_dshow=auto
-_tv_teletext=auto
_pvr=auto
_network=yes
_winsock2_h=auto
@@ -1092,8 +1090,6 @@ for ac_option do
--disable-tv-v4l2) _tv_v4l2=no ;;
--enable-tv-dshow) _tv_dshow=yes ;;
--disable-tv-dshow) _tv_dshow=no ;;
- --enable-tv-teletext) _tv_teletext=yes ;;
- --disable-tv-teletext) _tv_teletext=no ;;
--enable-radio) _radio=yes ;;
--enable-radio-capture) _radio_capture=yes ;;
--disable-radio-capture) _radio_capture=no ;;
@@ -7616,25 +7612,6 @@ fi
echores "$_tv_v4l2"
-echocheck "TV teletext interface"
-if test "$_tv_teletext" = auto ; then
- _tv_teletext=no
- if test "$_freetype" = yes && test "$_pthreads" = yes; then
- if test "$_tv_v4l2" = yes || test "$_v4l" = yes || test "$_tv_dshow" = yes || test "$_dvbin" = yes; then
- _tv_teletext=yes
- fi
- fi
-fi
-if test "$_tv_teletext" = yes ; then
- def_tv_teletext='#define CONFIG_TV_TELETEXT 1'
- _inputmodules="tv-teletext $_inputmodules"
-else
- _noinputmodules="tv-teletext $_noinputmodules"
- def_tv_teletext='#undef CONFIG_TV_TELETEXT'
-fi
-echores "$_tv_teletext"
-
-
echocheck "Radio interface"
if test "$_radio" = yes ; then
def_radio='#define CONFIG_RADIO 1'
@@ -8352,7 +8329,6 @@ TREMOR_INTERNAL = $_tremor_internal
TV = $_tv
TV_BSDBT848 = $_tv_bsdbt848
TV_DSHOW = $_tv_dshow
-TV_TELETEXT = $_tv_teletext
TV_V4L = $_tv_v4l
TV_V4L1 = $_tv_v4l1
TV_V4L2 = $_tv_v4l2
@@ -8749,7 +8725,6 @@ $def_radio_v4l2
$def_tv
$def_tv_bsdbt848
$def_tv_dshow
-$def_tv_teletext
$def_tv_v4l
$def_tv_v4l1
$def_tv_v4l2
Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/input/input.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -172,10 +172,8 @@ static const mp_cmd_t mp_cmds[] = {
{ MP_CMD_LOADLIST, "loadlist", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_RUN, "run", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
{ MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
-#ifdef CONFIG_TV_TELETEXT
{ MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
{ MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
-#endif
#ifdef CONFIG_GUI
{ MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } },
@@ -439,11 +437,9 @@ static const mp_cmd_bind_t def_cmd_binds
{ { 'n', 0 }, "tv_step_norm" },
{ { 'u', 0 }, "tv_step_chanlist" },
#endif
-#ifdef CONFIG_TV_TELETEXT
{ { 'X', 0 }, "step_property teletext_mode 1" },
{ { 'W', 0 }, "step_property teletext_page 1" },
{ { 'Q', 0 }, "step_property teletext_page -1" },
-#endif
#ifdef CONFIG_JOYSTICK
{ { JOY_AXIS0_PLUS, 0 }, "seek 10" },
{ { JOY_AXIS0_MINUS, 0 }, "seek -10" },
Modified: trunk/libmpcodecs/dec_teletext.h
==============================================================================
--- trunk/libmpcodecs/dec_teletext.h Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/libmpcodecs/dec_teletext.h Sat Nov 7 17:40:42 2009 (r29851)
@@ -34,11 +34,7 @@ struct tt_param {
#define VBI_CONTROL_TRUE 1
#define VBI_CONTROL_UNKNOWN -1
-#ifdef CONFIG_TV_TELETEXT
int teletext_control(void* p, int cmd, void *arg);
-#else
-#define teletext_control(p, cmd, arg) VBI_CONTROL_FALSE
-#endif
/*
TELETEXT controls (through teletext_control() )
Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/libvo/sub.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -86,13 +86,11 @@ font_desc_t* vo_font=NULL;
font_desc_t* sub_font=NULL;
unsigned char* vo_osd_text=NULL;
-#ifdef CONFIG_TV_TELETEXT
void* vo_osd_teletext_page=NULL;
int vo_osd_teletext_half = 0;
int vo_osd_teletext_mode=0;
int vo_osd_teletext_format=0;
int vo_osd_teletext_scale=0;
-#endif
int sub_unicode=0;
int sub_utf8=0;
int sub_pos=100;
@@ -274,7 +272,6 @@ inline static void vo_update_nav (mp_osd
}
#endif
-#ifdef CONFIG_TV_TELETEXT
// renders char to a big per-object buffer where alpha and bitmap are separated
static void tt_draw_alpha_buf(mp_osd_obj_t* obj, int x0,int y0, int w,int h, unsigned char* src, int stride,int fg,int bg,int alpha)
{
@@ -516,7 +513,6 @@ TODO: support for separated graphics sym
for(i=0;i<9;i++)
free(buf[i]);
}
-#endif
int vo_osd_progbar_type=-1;
int vo_osd_progbar_value=100; // 0..256
@@ -1154,11 +1150,9 @@ int vo_update_osd_ext(int dxs,int dys, i
case OSDTYPE_SUBTITLE:
vo_update_text_sub(obj,dxs,dys);
break;
-#ifdef CONFIG_TV_TELETEXT
case OSDTYPE_TELETEXT:
vo_update_text_teletext(obj,dxs,dys);
break;
-#endif
case OSDTYPE_PROGBAR:
vo_update_text_progbar(obj,dxs,dys);
break;
@@ -1230,9 +1224,7 @@ void vo_init_osd(void){
#ifdef CONFIG_DVDNAV
new_osd_obj(OSDTYPE_DVDNAV);
#endif
-#ifdef CONFIG_TV_TELETEXT
new_osd_obj(OSDTYPE_TELETEXT);
-#endif
#ifdef CONFIG_FREETYPE
force_load_font = 1;
#endif
@@ -1273,9 +1265,7 @@ void vo_draw_text_ext(int dxs, int dys,
#ifdef CONFIG_DVDNAV
case OSDTYPE_DVDNAV:
#endif
-#ifdef CONFIG_TV_TELETEXT
case OSDTYPE_TELETEXT:
-#endif
case OSDTYPE_OSD:
case OSDTYPE_SUBTITLE:
case OSDTYPE_PROGBAR:
Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/mpcommon.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -207,7 +207,6 @@ void update_subtitles(sh_video_t *sh_vid
void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset)
{
-#ifdef CONFIG_TV_TELETEXT
int page_changed;
if (!demuxer->teletext)
@@ -231,7 +230,6 @@ void update_teletext(sh_video_t *sh_vide
vo_osd_changed(OSDTYPE_TELETEXT);
teletext_control(demuxer->teletext,TV_VBI_CONTROL_MARK_UNCHANGED,NULL);
-#endif
}
int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang)
Modified: trunk/stream/tvi_dshow.c
==============================================================================
--- trunk/stream/tvi_dshow.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/stream/tvi_dshow.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -2264,7 +2264,6 @@ static int get_audio_framesize(priv_t *
return priv->chains[1]->rbuf->blocksize;
}
-#ifdef CONFIG_TV_TELETEXT
static int vbi_get_props(priv_t* priv,tt_stream_props* ptsp)
{
if(!priv || !ptsp)
@@ -2310,7 +2309,6 @@ static void vbi_grabber(priv_t* priv)
}
free(buf);
}
-#endif /* CONFIG_TV_TELETEXT */
/**
* \brief fills given buffer with video data (usually one frame)
@@ -2355,9 +2353,7 @@ static double grab_video_frame(priv_t *
rb->count--;
LeaveCriticalSection(rb->pMutex);
-#ifdef CONFIG_TV_TELETEXT
vbi_grabber(priv);
-#endif
return pts;
}
@@ -2546,7 +2542,6 @@ static HRESULT build_audio_chain(priv_t
*/
static HRESULT build_vbi_chain(priv_t *priv)
{
-#ifdef CONFIG_TV_TELETEXT
HRESULT hr;
if(priv->chains[2]->rbuf)
@@ -2566,7 +2561,6 @@ static HRESULT build_vbi_chain(priv_t *p
return 0;
}
}
-#endif
return S_OK;
}
@@ -2902,10 +2896,8 @@ static int init(priv_t * priv)
OLE_QUERYINTERFACE(priv->pBuilder,IID_IBaseFilter,pBF);
OLE_CALL_ARGS(pBF,SetSyncSource,rc);
}
-#ifdef CONFIG_TV_TELETEXT
if(vbi_get_props(priv,&(priv->tsp))!=TVI_CONTROL_TRUE)
break;
-#endif
result = 1;
} while(0);
@@ -2975,9 +2967,7 @@ static int uninit(priv_t * priv)
if (priv->dwRegister) {
RemoveFromRot(priv->dwRegister);
}
-#ifdef CONFIG_TV_TELETEXT
teletext_control(priv->priv_vbi,TV_VBI_CONTROL_STOP,(void*)1);
-#endif
//stop audio grabber thread
if (priv->state && priv->pMediaControl) {
@@ -3482,7 +3472,6 @@ static int control(priv_t * priv, int cm
case TVI_CONTROL_IMMEDIATE:
priv->immediate_mode = 1;
return TVI_CONTROL_TRUE;
-#ifdef CONFIG_TV_TELETEXT
case TVI_CONTROL_VBI_INIT:
{
void* ptr;
@@ -3496,7 +3485,6 @@ static int control(priv_t * priv, int cm
case TVI_CONTROL_GET_VBI_PTR:
*(void **)arg=priv->priv_vbi;
return TVI_CONTROL_TRUE;
-#endif
}
return TVI_CONTROL_UNKNOWN;
}
Modified: trunk/stream/tvi_v4l.c
==============================================================================
--- trunk/stream/tvi_v4l.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/stream/tvi_v4l.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -142,14 +142,12 @@ typedef struct {
long audio_recv_blocks_total;
long audio_sent_blocks_total;
long mjpeg_bufsize;
-#ifdef CONFIG_TV_TELETEXT
char *vbi_dev;
int vbi_fd;
int vbi_bufsize;
int vbi_shutdown;
pthread_t vbi_grabber_thread;
void *priv_vbi;
-#endif
tv_param_t *tv_param;
} priv_t;
@@ -676,7 +674,6 @@ static int uninit(priv_t *priv)
{
unsigned long num;
-#ifdef CONFIG_TV_TELETEXT
priv->vbi_shutdown=1;
if(priv->vbi_grabber_thread)
pthread_join(priv->vbi_grabber_thread, NULL);
@@ -694,8 +691,6 @@ static int uninit(priv_t *priv)
priv->vbi_dev=0;
}
-#endif
-
priv->shutdown = 1;
mp_msg(MSGT_TV, MSGL_V, "Waiting for threads to finish... ");
@@ -782,7 +777,6 @@ static int get_capture_buffer_size(priv_
return cnt;
}
-#ifdef CONFIG_TV_TELETEXT
static int vbi_init(priv_t* priv,char* device)
{
int vbi_fd=0;
@@ -898,7 +892,6 @@ static void *vbi_grabber(void *data)
free(buf);
return NULL;
}
-#endif /* CONFIG_TV_TELETEXT */
static int start(priv_t *priv)
{
@@ -1112,13 +1105,11 @@ static int start(priv_t *priv)
ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]);
}
-#ifdef CONFIG_TV_TELETEXT
/* start vbi thread */
if(priv->priv_vbi){
priv->vbi_shutdown = 0;
pthread_create(&priv->vbi_grabber_thread, NULL, vbi_grabber, priv);
}
-#endif
/* launch capture threads */
priv->shutdown = 0;
@@ -1512,7 +1503,6 @@ static int control(priv_t *priv, int cmd
priv->immediate_mode = 1;
return TVI_CONTROL_TRUE;
}
-#ifdef CONFIG_TV_TELETEXT
case TVI_CONTROL_VBI_INIT:
{
void* ptr;
@@ -1533,7 +1523,6 @@ static int control(priv_t *priv, int cmd
case TVI_CONTROL_GET_VBI_PTR:
*(void **)arg=priv->priv_vbi;
return TVI_CONTROL_TRUE;
-#endif
}
return TVI_CONTROL_UNKNOWN;
Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c Sat Nov 7 14:09:24 2009 (r29850)
+++ trunk/stream/tvi_v4l2.c Sat Nov 7 17:40:42 2009 (r29851)
@@ -89,14 +89,12 @@ typedef struct {
/* video */
char *video_dev;
int video_fd;
-#ifdef CONFIG_TV_TELETEXT
char *vbi_dev;
int vbi_fd;
int vbi_bufsize;
int vbi_shutdown;
pthread_t vbi_grabber_thread;
void *priv_vbi;
-#endif
int mp_format;
struct v4l2_capability capability;
struct v4l2_input input;
@@ -592,7 +590,6 @@ static int get_control(priv_t *priv, str
return TVI_CONTROL_TRUE;
}
-#ifdef CONFIG_TV_TELETEXT
static int vbi_init(priv_t* priv,char* device)
{
int vbi_fd=0;
@@ -715,7 +712,6 @@ static void *vbi_grabber(void *data)
free(buf);
return NULL;
}
-#endif /* CONFIG_TV_TELETEXT */
static int control(priv_t *priv, int cmd, void *arg)
{
@@ -1039,7 +1035,6 @@ static int control(priv_t *priv, int cmd
if (audio_in_set_samplerate(&priv->audio_in, *(int*)arg) < 0) return TVI_CONTROL_FALSE;
// setup_audio_buffer_sizes(priv);
return TVI_CONTROL_TRUE;
-#ifdef CONFIG_TV_TELETEXT
case TVI_CONTROL_VBI_INIT:
{
void* ptr;
@@ -1060,7 +1055,6 @@ static int control(priv_t *priv, int cmd
case TVI_CONTROL_GET_VBI_PTR:
*(void **)arg=priv->priv_vbi;
return TVI_CONTROL_TRUE;
-#endif
}
mp_msg(MSGT_TV, MSGL_V, "%s: unknown control: %d\n", info.short_name, cmd);
return TVI_CONTROL_UNKNOWN;
@@ -1107,7 +1101,6 @@ static int uninit(priv_t *priv)
{
int i, frames, dropped = 0;
-#ifdef CONFIG_TV_TELETEXT
priv->vbi_shutdown=1;
if(priv->vbi_grabber_thread)
pthread_join(priv->vbi_grabber_thread, NULL);
@@ -1124,9 +1117,6 @@ static int uninit(priv_t *priv)
free(priv->vbi_dev);
priv->vbi_dev=0;
}
-
-#endif
-
priv->shutdown = 1;
if(priv->video_grabber_thread)
pthread_join(priv->video_grabber_thread, NULL);
@@ -1562,13 +1552,11 @@ static int start(priv_t *priv)
}
}
-#ifdef CONFIG_TV_TELETEXT
/* start vbi thread */
if(priv->priv_vbi){
priv->vbi_shutdown = 0;
pthread_create(&priv->vbi_grabber_thread, NULL, vbi_grabber, priv);
}
-#endif
/* start audio thread */
priv->shutdown = 0;
priv->audio_skew_measure_time = 0;
More information about the MPlayer-cvslog
mailing list