From a9474b0b39b999ef17163bec9337a96a72ddb458 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 29 Oct 2009 22:13:04 +0000 Subject: Move teletext specific code from stream into libmpcodecs. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l2.c | 1 + 1 file changed, 1 insertion(+) (limited to 'stream/tvi_v4l2.c') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 786d42529e..0de15d245f 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -53,6 +53,7 @@ known issues: #include #include "mp_msg.h" #include "libmpcodecs/img_format.h" +#include "libmpcodecs/dec_teletext.h" #include "libaf/af_format.h" #include "tv.h" #include "audio_in.h" -- cgit v1.2.3 From 9df11ee8bf234aebcea76ef8c919fb68229c7308 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 29 Oct 2009 22:39:00 +0000 Subject: Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some paths in comments. Based on a patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream/tvi_v4l2.c') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 0de15d245f..a47ea11400 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -1050,7 +1050,7 @@ static int control(priv_t *priv, int cmd, void *arg) if(vbi_get_props(priv,&tsp)==TVI_CONTROL_TRUE) { ptr=&tsp; - if(teletext_control(NULL,TV_VBI_CONTROL_START,&ptr)==TVI_CONTROL_TRUE) + if(teletext_control(NULL,TV_VBI_CONTROL_START,&ptr)==VBI_CONTROL_TRUE) priv->priv_vbi=ptr; else priv->priv_vbi=NULL; -- cgit v1.2.3 From 423c415534f7393c07247b87ab4d95f6d0635474 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 7 Nov 2009 12:31:05 +0000 Subject: Separate teletext from tv support. Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'stream/tvi_v4l2.c') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index a47ea11400..fe2789e24d 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -1057,8 +1057,9 @@ static int control(priv_t *priv, int cmd, void *arg) } return TVI_CONTROL_TRUE; } - default: - return teletext_control(priv->priv_vbi,cmd,arg); + 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); -- cgit v1.2.3 From 2a5611473cb3696597240be15b0e1e662c1c79b8 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 7 Nov 2009 16:40:42 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l2.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'stream/tvi_v4l2.c') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index fe2789e24d..1472d7b6d9 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -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, struct v4l2_control *control, int val_signe 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, void *arg) 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, void *arg) 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; -- cgit v1.2.3