October 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r29721 - trunk/libvo/gl_common.c
by reimar 24 May '10

24 May '10

Author: reimar Date: Sun Sep 27 16:24:15 2009 New Revision: 29721 Log: Also check GLX client and server strings for extensions Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat Sep 26 23:22:01 2009 (r29720) +++ trunk/libvo/gl_common.c Sun Sep 27 16:24:15 2009 (r29721) @@ -1563,6 +1563,21 @@ static XVisualInfo *getWindowVisualInfo( return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp); } +static void appendstr(char **dst, const char *str) +{ + int newsize; + char *newstr; + if (!str) + return; + newsize = strlen(*dst) + 1 + strlen(str) + 1; + newstr = realloc(*dst, newsize); + if (!newstr) + return; + *dst = newstr; + strcat(*dst, " "); + strcat(*dst, str); +} + /** * \brief Changes the window in which video is displayed. * If possible only transfers the context to the new window, otherwise @@ -1619,6 +1634,7 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!keep_context) { void *(*getProcAddress)(const GLubyte *); const char *(*glXExtStr)(Display *, int); + char *glxstr = strdup(""); if (*context) glXDestroyContext(mDisplay, *context); *context = new_context; @@ -1631,8 +1647,17 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!getProcAddress) getProcAddress = (void *)getdladdr; glXExtStr = getdladdr("glXQueryExtensionsString"); - getFunctions(getProcAddress, !glXExtStr ? NULL : - glXExtStr(mDisplay, DefaultScreen(mDisplay))); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, DefaultScreen(mDisplay))); + glXExtStr = getdladdr("glXGetClientString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + glXExtStr = getdladdr("glXGetServerString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + + getFunctions(getProcAddress, glxstr); + free(glxstr); // and inform that reinit is neccessary return SET_WINDOW_REINIT;

4 6

r29809 - trunk/libmpcodecs/dec_teletext.c
by cehoyos 31 Oct '09

31 Oct '09

Author: cehoyos Date: Sat Oct 31 16:34:18 2009 New Revision: 29809 Log: Teletext display does support font scaling via OSD font scaling. Patch by Francesco Lavra, francescolavra interfree it Modified: trunk/libmpcodecs/dec_teletext.c Modified: trunk/libmpcodecs/dec_teletext.c ============================================================================== --- trunk/libmpcodecs/dec_teletext.c Sat Oct 31 16:30:56 2009 (r29808) +++ trunk/libmpcodecs/dec_teletext.c Sat Oct 31 16:34:18 2009 (r29809) @@ -70,7 +70,6 @@ * spu rendering * is better quality on poor signal possible ? * link support - * font autoscale * greyscale osd * slave command for dumping pages * fix bcd<->dec as suggested my Michael

2 1

r29808 - in trunk: libmpcodecs/dec_teletext.c stream/tv.h
by cehoyos 31 Oct '09

31 Oct '09

Author: cehoyos Date: Sat Oct 31 16:30:56 2009 New Revision: 29808 Log: Replace two more occurences of tvi_vbi with dec_teletext. Patch by Francesco Lavra, francescolavra interfree it Modified: trunk/libmpcodecs/dec_teletext.c trunk/stream/tv.h Modified: trunk/libmpcodecs/dec_teletext.c ============================================================================== --- trunk/libmpcodecs/dec_teletext.c Sat Oct 31 16:28:28 2009 (r29807) +++ trunk/libmpcodecs/dec_teletext.c Sat Oct 31 16:30:56 2009 (r29808) @@ -799,13 +799,13 @@ static void prepare_visible_page(priv_vb int i; pthread_mutex_lock(&(priv->buffer_mutex)); - mp_msg(MSGT_TELETEXT,MSGL_DBG3,"tvi_vbi: prepare_visible_page pg:0x%x, sub:0x%x\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"dec_teletext: prepare_visible_page pg:0x%x, sub:0x%x\n", priv->pagenum,priv->subpagenum); if(priv->subpagenum==0x3f7f) //no page yet priv->subpagenum=get_subpagenum_from_cache(priv,priv->pagenum); pg=get_from_cache(priv,priv->pagenum,priv->subpagenum); - mp_dbg(MSGT_TELETEXT,MSGL_DBG3,"tvi_vbi: prepare_vibible_page2 pg:0x%x, sub:0x%x\n", + mp_dbg(MSGT_TELETEXT,MSGL_DBG3,"dec_teletext: prepare_vibible_page2 pg:0x%x, sub:0x%x\n", priv->pagenum,priv->subpagenum); curr_pg=get_from_cache(priv,priv->curr_pagenum, Modified: trunk/stream/tv.h ============================================================================== --- trunk/stream/tv.h Sat Oct 31 16:28:28 2009 (r29807) +++ trunk/stream/tv.h Sat Oct 31 16:30:56 2009 (r29808) @@ -218,7 +218,7 @@ typedef struct { #define TVI_CONTROL_SPC_SET_INPUT 0x402 /* set input channel (tv,s-video,composite..) */ #define TVI_CONTROL_SPC_GET_NORMID 0x403 /* get normid from norm name */ -//tvi_* ioctl (not tvi_vbi.c !!!) +//tvi_* ioctl (not dec_teletext.c !!!) #define TVI_CONTROL_VBI_INIT 0x501 ///< vbi init int tv_set_color_options(tvi_handle_t *tvh, int opt, int val);

1 0

r29807 - trunk/libmpcodecs/dec_teletext.c
by cehoyos 31 Oct '09

31 Oct '09

Author: cehoyos Date: Sat Oct 31 16:28:28 2009 New Revision: 29807 Log: Remove incorrect comment. Original patch by Francesco Lavra, francescolavra interfree it Modified: trunk/libmpcodecs/dec_teletext.c Modified: trunk/libmpcodecs/dec_teletext.c ============================================================================== --- trunk/libmpcodecs/dec_teletext.c Sat Oct 31 03:00:00 2009 (r29806) +++ trunk/libmpcodecs/dec_teletext.c Sat Oct 31 16:28:28 2009 (r29807) @@ -983,8 +983,6 @@ static void dump_page(tt_page* pt) * \brief checks whether page is ready and copies it into cache array if so * \param priv private data structure * \param magAddr page's magazine address (0-7) - * - * Routine also calls decode_page to perform 1st stage of rendering */ static void store_in_cache(priv_vbi_t* priv, int magAddr, int line){ mp_msg(MSGT_TELETEXT,MSGL_DBG2,"store_in_cache(%d): pagenum:%x\n",

1 0

r29805 - in trunk: DOCS/man/en/mplayer.1 libvo/x11_common.c
by corey 30 Oct '09

30 Oct '09

Author: corey Date: Fri Oct 30 23:18:29 2009 New Revision: 29805 Log: Slightly change behavior of "none" if fstype specification. In a list of enabled fstypes, "none" now clears the list rather than disabling all fstypes and interrupting the parser. To enable only one (or more) fstypes, list the types to enable after "none". For example: "-fstype none" is the same as before: all disabled "-fstype none,fullscreen" enables only the fullscreen type Modified: trunk/libvo/x11_common.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Fri Oct 30 15:13:25 2009 (r29804) +++ trunk/libvo/x11_common.c Fri Oct 30 23:18:29 2009 (r29805) @@ -1316,7 +1316,7 @@ static int vo_x11_get_fs_type(int suppor else type |= vo_wm_NETWM; } else if (!strcmp(arg, "none")) - return 0; + type = 0; // clear; keep parsing } }

1 0

r29803 - trunk/stream/stream_dvb.c
by cehoyos 30 Oct '09

30 Oct '09

Author: cehoyos Date: Fri Oct 30 11:03:54 2009 New Revision: 29803 Log: Support ISDB-Tb tunning in Brazil Patch by Sérgio Fortier, sergiofortier A yahoo com br Modified: trunk/stream/stream_dvb.c Modified: trunk/stream/stream_dvb.c ============================================================================== --- trunk/stream/stream_dvb.c Thu Oct 29 23:39:00 2009 (r29802) +++ trunk/stream/stream_dvb.c Fri Oct 30 11:03:54 2009 (r29803) @@ -323,8 +323,9 @@ static dvb_channels_list *dvb_get_channe ptr->mod = VSB_8; else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB")) ptr->mod = VSB_16; + else if(! strcmp(mod, "QAM_AUTO")) + ptr->mod = QAM_AUTO; - ptr->inv = INVERSION_AUTO; #endif } @@ -342,7 +343,8 @@ static dvb_channels_list *dvb_get_channe ptr->trans = TRANSMISSION_MODE_2K; else if(! strcmp(transm, "TRANSMISSION_MODE_8K")) ptr->trans = TRANSMISSION_MODE_8K; - + else if(! strcmp(transm, "TRANSMISSION_MODE_AUTO")) + ptr->trans = TRANSMISSION_MODE_AUTO; if(! strcmp(gi, "GUARD_INTERVAL_1_32")) ptr->gi = GUARD_INTERVAL_1_32; @@ -350,7 +352,9 @@ static dvb_channels_list *dvb_get_channe ptr->gi = GUARD_INTERVAL_1_16; else if(! strcmp(gi, "GUARD_INTERVAL_1_8")) ptr->gi = GUARD_INTERVAL_1_8; - else ptr->gi = GUARD_INTERVAL_1_4; + else if(! strcmp(gi, "GUARD_INTERVAL_1_4")) + ptr->gi = GUARD_INTERVAL_1_4; + else ptr->gi = GUARD_INTERVAL_AUTO; if(! strcmp(tmp_lcr, "FEC_1_2")) ptr->cr_lp =FEC_1_2;

1 0

r29802 - in trunk: libmpcodecs/dec_teletext.c libmpcodecs/dec_teletext.h mp_msg.h mpcommon.c stream/tvi_dshow.c stream/tvi_v4l.c stream/tvi_v4l2.c
by cehoyos 29 Oct '09

29 Oct '09

Author: cehoyos Date: Thu Oct 29 23:39:00 2009 New Revision: 29802 Log: 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 Modified: trunk/libmpcodecs/dec_teletext.c trunk/libmpcodecs/dec_teletext.h trunk/mp_msg.h trunk/mpcommon.c trunk/stream/tvi_dshow.c trunk/stream/tvi_v4l.c trunk/stream/tvi_v4l2.c Modified: trunk/libmpcodecs/dec_teletext.c ============================================================================== --- trunk/libmpcodecs/dec_teletext.c Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/libmpcodecs/dec_teletext.c Thu Oct 29 23:39:00 2009 (r29802) @@ -49,17 +49,17 @@ * 0. stream/tvi_*.c: vbi_grabber(...) * getting vbi data from video device * ---decoding stage--- - * 1. stream/tvi_vbi.c: decode_raw_line_runin(...) or decode_raw_line_sine(...) + * 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. stream/tvi_vbi.c: decode_pkt0(...), decode_pkt_page(...) + * 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. stream/tvi_vbi.c: decode_page(...) + * 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. stream/tvi_vbi.c: prepare_visible_page(...) + * 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(...) @@ -578,7 +578,7 @@ static void put_to_cache(priv_vbi_t* pri if(!(pg->raw[i]&0x80)) pgc->raw[i]=pg->raw[i]; else - mp_msg(MSGT_TV,MSGL_DBG3,"char error. pg:%x, c[%d]=0x%x\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"char error. pg:%x, c[%d]=0x%x\n", pg->pagenum,i,pg->raw[i]); } pgc->active=1; @@ -799,13 +799,13 @@ static void prepare_visible_page(priv_vb int i; pthread_mutex_lock(&(priv->buffer_mutex)); - mp_msg(MSGT_TV,MSGL_DBG3,"tvi_vbi: prepare_visible_page pg:0x%x, sub:0x%x\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"tvi_vbi: prepare_visible_page pg:0x%x, sub:0x%x\n", priv->pagenum,priv->subpagenum); if(priv->subpagenum==0x3f7f) //no page yet priv->subpagenum=get_subpagenum_from_cache(priv,priv->pagenum); pg=get_from_cache(priv,priv->pagenum,priv->subpagenum); - mp_dbg(MSGT_TV,MSGL_DBG3,"tvi_vbi: prepare_vibible_page2 pg:0x%x, sub:0x%x\n", + mp_dbg(MSGT_TELETEXT,MSGL_DBG3,"tvi_vbi: prepare_vibible_page2 pg:0x%x, sub:0x%x\n", priv->pagenum,priv->subpagenum); curr_pg=get_from_cache(priv,priv->curr_pagenum, @@ -827,7 +827,7 @@ static void prepare_visible_page(priv_vb } }else{ decode_page(priv->display_page,pg->raw,pg->primary_lang,pg->secondary_lang,pg->flags); - mp_msg(MSGT_TV,MSGL_DBG3,"page #%x was decoded!\n",pg->pagenum); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"page #%x was decoded!\n",pg->pagenum); } PRINT_HEX(priv->display_page,0,(priv->curr_pagenum&0x700)?priv->curr_pagenum>>8:8); @@ -987,7 +987,7 @@ static void dump_page(tt_page* pt) * Routine also calls decode_page to perform 1st stage of rendering */ static void store_in_cache(priv_vbi_t* priv, int magAddr, int line){ - mp_msg(MSGT_TV,MSGL_DBG2,"store_in_cache(%d): pagenum:%x\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG2,"store_in_cache(%d): pagenum:%x\n", priv->mag[magAddr].order, priv->mag[magAddr].pt->pagenum); @@ -1039,7 +1039,7 @@ static void pll_add(priv_vbi_t* priv,int priv->pll_dir=-1; priv->pll_lerr=0; } - mp_msg(MSGT_TV,MSGL_DBG3,"vbi: pll_adj=%2d\n",priv->pll_adj); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"vbi: pll_adj=%2d\n",priv->pll_adj); } priv->pll_cnt=0; priv->pll_err=0; @@ -1063,9 +1063,9 @@ static void pll_reset(priv_vbi_t* priv,i if(priv->pll_fixed) priv->pll_adj=fine_tune; if(priv->pll_fixed) - mp_msg(MSGT_TV,MSGL_DBG3,"pll_reset (fixed@%2d)\n",priv->pll_adj); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"pll_reset (fixed@%2d)\n",priv->pll_adj); else - mp_msg(MSGT_TV,MSGL_DBG3,"pll_reset (auto)\n"); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"pll_reset (auto)\n"); } /** @@ -1303,7 +1303,7 @@ static void decode_pkt28(priv_vbi_t* pri (priv->secondary_language&4)>>2 | (priv->secondary_language&1)<<2; - mp_msg(MSGT_TV,MSGL_DBG2,"pkt28: language: primary=%02x secondary=0x%02x\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG2,"pkt28: language: primary=%02x secondary=0x%02x\n", priv->primary_language,priv->secondary_language); } @@ -1352,7 +1352,7 @@ static int decode_raw_line_runin(priv_vb i=hi[5]-hi[1]; // length of 4 periods (8 bits) if (i<priv->bp8bl || i>priv->bp8bh) { - mp_msg(MSGT_TV,MSGL_DBG3,"vbi: wrong freq %d (%d,%d)\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"vbi: wrong freq %d (%d,%d)\n", i,priv->bp8bl,priv->bp8bh); return 0; // bad frequency } @@ -1388,7 +1388,7 @@ static int decode_raw_line_runin(priv_vb for(i=0;i<43;i++){ data[i]=data[i+1]; } - mp_msg(MSGT_TV,MSGL_DBG3,"thr:%d sync:%d ",thr,sync); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"thr:%d sync:%d ",thr,sync); return 1; } @@ -1471,7 +1471,7 @@ static void vbi_decode(priv_vbi_t* priv, unsigned char* linep; int d0,d1; int i=0; - mp_msg(MSGT_TV,MSGL_DBG3,"vbi: vbi_decode\n"); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"vbi: vbi_decode\n"); for(linep=buf; !priv->cache_reset && linep<buf+priv->ptsp->bufsize; linep+=priv->ptsp->samples_per_line,i++){ #if 0 /* @@ -1489,13 +1489,13 @@ static void vbi_decode(priv_vbi_t* priv, if(d0&0x80 || d1&0x80){ pll_add(priv,2,4); - mp_msg(MSGT_TV,MSGL_V,"vbi_decode(%d):HammErr after decode_raw_line\n",i); + mp_msg(MSGT_TELETEXT,MSGL_V,"vbi_decode(%d):HammErr after decode_raw_line\n",i); continue; //hamError } magAddr=d0 & 0x7; pkt=(d0>>3)|(d1<<1); - mp_msg(MSGT_TV,MSGL_DBG3,"vbi_decode(%d):%x %x (mag:%x, pkt:%d)\n", + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"vbi_decode(%d):%x %x (mag:%x, pkt:%d)\n", i,d0,d1,magAddr,pkt); if(!pkt){ decode_pkt0(priv,data+2,magAddr); //skip MRGA @@ -1509,7 +1509,7 @@ static void vbi_decode(priv_vbi_t* priv, }else if(pkt==30){ decode_pkt30(priv,data+2,magAddr); } else { - mp_msg(MSGT_TV,MSGL_DBG3,"unsupported packet:%d\n",pkt); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"unsupported packet:%d\n",pkt); } } if (priv->cache_reset){ @@ -1531,8 +1531,8 @@ static void vbi_decode(priv_vbi_t* priv, * \param priv_vbi private data structure * \param flag new format * \return - * TVI_CONTROL_TRUE is success, - * TVI_CONTROL_FALSE otherwise + * VBI_CONTROL_TRUE is success, + * VBI_CONTROL_FALSE otherwise * * flag: * 0 - opaque @@ -1544,7 +1544,7 @@ static int teletext_set_format(priv_vbi_ { flag&=3; - mp_msg(MSGT_TV,MSGL_DBG3,"teletext_set_format_is called. mode:%d\n",flag); + mp_msg(MSGT_TELETEXT,MSGL_DBG3,"teletext_set_format_is called. mode:%d\n",flag); pthread_mutex_lock(&(priv->buffer_mutex)); priv->tformat=flag; @@ -1552,7 +1552,7 @@ static int teletext_set_format(priv_vbi_ priv->pagenumdec=0; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } /** @@ -1648,9 +1648,9 @@ int teletext_control(void* p, int cmd, v tt_page* pgc; if (!priv && cmd!=TV_VBI_CONTROL_START) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; if (!arg && cmd!=TV_VBI_CONTROL_STOP && cmd!=TV_VBI_CONTROL_MARK_UNCHANGED) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; switch (cmd) { case TV_VBI_CONTROL_RESET: @@ -1665,12 +1665,12 @@ int teletext_control(void* p, int cmd, v priv->subpagenum=0x3f7f; pll_reset(priv,fine_tune); if(tv_param->tlang==-1){ - mp_msg(MSGT_TV,MSGL_INFO,MSGTR_TV_TTSupportedLanguages); + mp_msg(MSGT_TELETEXT,MSGL_INFO,MSGTR_TV_TTSupportedLanguages); for(i=0; tt_languages[i].lang_code; i++){ - mp_msg(MSGT_TV,MSGL_INFO," %3d %s\n", + mp_msg(MSGT_TELETEXT,MSGL_INFO," %3d %s\n", tt_languages[i].lang_code, tt_languages[i].lang_name); } - mp_msg(MSGT_TV,MSGL_INFO," %3d %s\n", + mp_msg(MSGT_TELETEXT,MSGL_INFO," %3d %s\n", tt_languages[i].lang_code, tt_languages[i].lang_name); }else{ for(i=0; tt_languages[i].lang_code; i++){ @@ -1678,14 +1678,14 @@ int teletext_control(void* p, int cmd, v break; } if (priv->primary_language!=tt_languages[i].lang_code){ - mp_msg(MSGT_TV,MSGL_INFO,MSGTR_TV_TTSelectedLanguage, + mp_msg(MSGT_TELETEXT,MSGL_INFO,MSGTR_TV_TTSelectedLanguage, tt_languages[i].lang_name); priv->primary_language=tt_languages[i].lang_code; } } priv->page_changed=1; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_START: { @@ -1693,7 +1693,7 @@ int teletext_control(void* p, int cmd, v tt_stream_props* ptsp=*(tt_stream_props**)arg; if(!ptsp) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; priv=calloc(1,sizeof(priv_vbi_t)); @@ -1712,7 +1712,7 @@ int teletext_control(void* p, int cmd, v init_vbi_consts(priv); pll_reset(priv,fine_tune); priv->page_changed=1; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_STOP: { @@ -1723,15 +1723,15 @@ int teletext_control(void* p, int cmd, v destroy_cache(priv); priv->page_changed=1; free(priv); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_SET_MODE: priv->on=(*(int*)arg%2); priv->page_changed=1; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_GET_MODE: *(int*)arg=priv->on; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_SET_FORMAT: priv->page_changed=1; return teletext_set_format(priv, *(int *) arg); @@ -1739,12 +1739,12 @@ int teletext_control(void* p, int cmd, v pthread_mutex_lock(&(priv->buffer_mutex)); *(int*)arg=priv->tformat; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_GET_HALF_PAGE: if(!priv->on) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; *(int *)arg=priv->zoom; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_SET_HALF_PAGE: { int val=*(int*)arg; @@ -1755,21 +1755,21 @@ int teletext_control(void* p, int cmd, v priv->zoom=val; priv->page_changed=1; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_GO_LINK: { int val=*(int *) arg; if(val<1 || val>6) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; pthread_mutex_lock(&(priv->buffer_mutex)); if (!(pgc = priv->ptt_cache[priv->pagenum])) { pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; } if (!pgc->links[val-1].pagenum || pgc->links[val-1].pagenum>0x7ff) { pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; } priv->pagenum=pgc->links[val-1].pagenum; if(pgc->links[val-1].subpagenum!=0x3f7f) @@ -1778,20 +1778,20 @@ int teletext_control(void* p, int cmd, v priv->subpagenum=get_subpagenum_from_cache(priv,priv->pagenum); priv->page_changed=1; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_SET_PAGE: { int val=*(int *) arg; if(val<100 || val>0x899) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; pthread_mutex_lock(&(priv->buffer_mutex)); priv->pagenum=val&0x7ff; priv->subpagenum=get_subpagenum_from_cache(priv,priv->pagenum); priv->pagenumdec=0; priv->page_changed=1; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_STEP_PAGE: { @@ -1802,11 +1802,11 @@ int teletext_control(void* p, int cmd, v priv->pagenumdec=0; priv->page_changed=1; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } case TV_VBI_CONTROL_GET_PAGE: *(int*)arg=((priv->pagenum+0x700)&0x7ff)+0x100; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_SET_SUBPAGE: pthread_mutex_lock(&(priv->buffer_mutex)); priv->pagenumdec=0; @@ -1817,35 +1817,35 @@ int teletext_control(void* p, int cmd, v priv->subpagenum=VBI_MAX_SUBPAGES-1; priv->page_changed=1; pthread_mutex_unlock(&(priv->buffer_mutex)); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_GET_SUBPAGE: *(int*)arg=priv->subpagenum; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_ADD_DEC: vbi_add_dec(priv, *(char **) arg); priv->page_changed=1; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_DECODE_PAGE: vbi_decode(priv,*(unsigned char**)arg); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_GET_VBIPAGE: if(!priv->on) - return TVI_CONTROL_FALSE; + return VBI_CONTROL_FALSE; prepare_visible_page(priv); *(void **)arg=priv->display_page; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_GET_NETWORKNAME: *(void **)arg=priv->networkname; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_MARK_UNCHANGED: priv->page_changed=0; priv->last_rendered=GetTimerMS(); - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; case TV_VBI_CONTROL_IS_CHANGED: if(GetTimerMS()-priv->last_rendered> 250) //forcing page update every 1/4 sec priv->page_changed=3; //mark that header update is enough *(int*)arg=priv->page_changed; - return TVI_CONTROL_TRUE; + return VBI_CONTROL_TRUE; } - return TVI_CONTROL_UNKNOWN; + return VBI_CONTROL_UNKNOWN; } Modified: trunk/libmpcodecs/dec_teletext.h ============================================================================== --- trunk/libmpcodecs/dec_teletext.h Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/libmpcodecs/dec_teletext.h Thu Oct 29 23:39:00 2009 (r29802) @@ -23,6 +23,10 @@ #ifndef MPLAYER_DEC_TELETEXT_H #define MPLAYER_DEC_TELETEXT_H +#define VBI_CONTROL_FALSE 0 +#define VBI_CONTROL_TRUE 1 +#define VBI_CONTROL_UNKNOWN -1 + int teletext_control(void* p, int cmd, void *arg); /* Modified: trunk/mp_msg.h ============================================================================== --- trunk/mp_msg.h Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/mp_msg.h Thu Oct 29 23:39:00 2009 (r29802) @@ -104,6 +104,8 @@ extern int verbose; #define MSGT_STATUSLINE 45 // playback/encoding status line +#define MSGT_TELETEXT 46 // Teletext decoder + #define MSGT_MAX 64 void mp_msg_init(void); Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/mpcommon.c Thu Oct 29 23:39:00 2009 (r29802) @@ -211,19 +211,19 @@ void update_teletext(sh_video_t *sh_vide if (demuxer->type != DEMUXER_TYPE_TV || !tvh) return; //Also forcing page update when such ioctl is not supported or call error occured - if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_IS_CHANGED,&page_changed)!=TVI_CONTROL_TRUE) + if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_IS_CHANGED,&page_changed)!=VBI_CONTROL_TRUE) page_changed=1; if(!page_changed) return; - if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=TVI_CONTROL_TRUE) + if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=VBI_CONTROL_TRUE) vo_osd_teletext_page=NULL; - if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=TVI_CONTROL_TRUE) + if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=VBI_CONTROL_TRUE) vo_osd_teletext_half=0; - if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=TVI_CONTROL_TRUE) + if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=VBI_CONTROL_TRUE) vo_osd_teletext_mode=0; - if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=TVI_CONTROL_TRUE) + if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=VBI_CONTROL_TRUE) vo_osd_teletext_format=0; vo_osd_changed(OSDTYPE_TELETEXT); Modified: trunk/stream/tvi_dshow.c ============================================================================== --- trunk/stream/tvi_dshow.c Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/stream/tvi_dshow.c Thu Oct 29 23:39:00 2009 (r29802) @@ -3487,7 +3487,7 @@ static int control(priv_t * priv, int cm { void* ptr; ptr=&(priv->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; Modified: trunk/stream/tvi_v4l.c ============================================================================== --- trunk/stream/tvi_v4l.c Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/stream/tvi_v4l.c Thu Oct 29 23:39:00 2009 (r29802) @@ -1523,7 +1523,7 @@ static int control(priv_t *priv, int cmd 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; Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c Thu Oct 29 23:13:04 2009 (r29801) +++ trunk/stream/tvi_v4l2.c Thu Oct 29 23:39:00 2009 (r29802) @@ -1050,7 +1050,7 @@ static int control(priv_t *priv, int cmd 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;

1 0

r29801 - in trunk: Makefile command.c libmpcodecs/dec_teletext.c libmpcodecs/dec_teletext.h libvo/sub.c mpcommon.c stream/tv.c stream/tv.h stream/tvi_def.h stream/tvi_dshow.c stream/tvi_v4l.c strea...
by cehoyos 29 Oct '09

29 Oct '09

Author: cehoyos Date: Thu Oct 29 23:13:04 2009 New Revision: 29801 Log: Move teletext specific code from stream into libmpcodecs. Patch by Francesco Lavra, francescolavra interfree it Added: trunk/libmpcodecs/dec_teletext.c - copied, changed from r29800, trunk/stream/tvi_vbi.c trunk/libmpcodecs/dec_teletext.h - copied, changed from r29800, trunk/stream/tv.h Deleted: trunk/stream/tvi_vbi.c Modified: trunk/Makefile trunk/command.c trunk/libvo/sub.c trunk/mpcommon.c trunk/stream/tv.c trunk/stream/tv.h trunk/stream/tvi_def.h trunk/stream/tvi_dshow.c trunk/stream/tvi_v4l.c trunk/stream/tvi_v4l2.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/Makefile Thu Oct 29 23:13:04 2009 (r29801) @@ -272,7 +272,7 @@ 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) += stream/tvi_vbi.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 Modified: trunk/command.c ============================================================================== --- trunk/command.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/command.c Thu Oct 29 23:13:04 2009 (r29801) @@ -25,6 +25,7 @@ #include "mpcommon.h" #include "mixer.h" #include "libmpcodecs/dec_video.h" +#include "libmpcodecs/dec_teletext.h" #include "vobsub.h" #include "spudec.h" #include "get_path.h" Copied and modified: trunk/libmpcodecs/dec_teletext.c (from r29800, trunk/stream/tvi_vbi.c) ============================================================================== --- trunk/stream/tvi_vbi.c Wed Oct 28 14:55:18 2009 (r29800, copy source) +++ trunk/libmpcodecs/dec_teletext.c Thu Oct 29 23:13:04 2009 (r29801) @@ -91,7 +91,8 @@ #include <pthread.h> -#include "tv.h" +#include "stream/tv.h" +#include "dec_teletext.h" #include "mp_msg.h" #include "help_mp.h" #include "libmpcodecs/img_format.h" Copied and modified: trunk/libmpcodecs/dec_teletext.h (from r29800, trunk/stream/tv.h) ============================================================================== --- trunk/stream/tv.h Wed Oct 28 14:55:18 2009 (r29800, copy source) +++ trunk/libmpcodecs/dec_teletext.h Thu Oct 29 23:13:04 2009 (r29801) @@ -1,8 +1,6 @@ /* - * TV interface + * Teletext support * - * Copyright (C) 2001 Alex Beregszászi - * Copyright (C) 2007 Attila Ötvös * Copyright (C) 2007 Vladimir Voroshilov <voroshil(a)gmail.com> * * This file is part of MPlayer. @@ -22,204 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPLAYER_TV_H -#define MPLAYER_TV_H - -typedef struct tv_param_s { - char *freq; - char *channel; - char *chanlist; - char *norm; - int automute; - int normid; - char *device; - char *driver; - int width; - int height; - int input; - int outfmt; - float fps; - char **channels; - int noaudio; - int immediate; - int audiorate; - int audio_id; - int amode; - int volume; - int bass; - int treble; - int balance; - int forcechan; - int force_audio; - int buffer_size; - int mjpeg; - int decimation; - int quality; - int alsa; - char* adevice; - int brightness; - int contrast; - int hue; - int saturation; - int gain; - char *tdevice; ///< teletext device - int tformat; ///< teletext display format - int tpage; ///< start teletext page - int tlang; ///< primary language code - - int scan; - int scan_threshold; - float scan_period; - /** - Terminate stream with video renderer instead of Null renderer - Will help if video freezes but audio does not. - May not work with -vo directx and -vf crop combination. - */ - int hidden_video_renderer; - /** - For VIVO cards VP pin have to be rendered too. - This tweak will cause VidePort pin stream to be terminated with video renderer - instead of removing it from graph. - Use if your card have vp pin and video is still choppy. - May not work with -vo directx and -vf crop combination. - */ - int hidden_vp_renderer; - /** - Use system clock as sync source instead of default graph clock (usually the clock - from one of live sources in graph. - */ - int system_clock; - /** - Some audio cards creates audio chunks with about 0.5 sec size. - This can cause choppy video when using mplayer with immediatemode=0 - Use followingtweak to decrease audio chunk sizes. - It will create audio chunks with time length equal to one video frame time. - */ - int normalize_audio_chunks; -} tv_param_t; - -extern tv_param_t stream_tv_defaults; - -typedef struct tvi_info_s -{ - struct tvi_handle_s * (*tvi_init)(tv_param_t* tv_param); - const char *name; - const char *short_name; - const char *author; - const char *comment; -} tvi_info_t; - -typedef struct tvi_functions_s -{ - int (*init)(); - int (*uninit)(); - int (*control)(); - int (*start)(); - double (*grab_video_frame)(); - int (*get_video_framesize)(); - double (*grab_audio_frame)(); - int (*get_audio_framesize)(); -} tvi_functions_t; - -typedef struct tvi_handle_s { - const tvi_functions_t *functions; - void *priv; - int seq; - - /* specific */ - int norm; - int chanlist; - const struct CHANLIST *chanlist_s; - int channel; - tv_param_t * tv_param; - void * scan; -} tvi_handle_t; - -typedef struct tv_channels_s { - int index; - char number[5]; - char name[20]; - int norm; - int freq; - struct tv_channels_s *next; - struct tv_channels_s *prev; -} tv_channels_t; - -extern tv_channels_t *tv_channel_list; -extern tv_channels_t *tv_channel_current, *tv_channel_last; -extern char *tv_channel_last_real; - -typedef struct { - unsigned int scan_timer; - int channel_num; - int new_channels; -} tv_scan_t; - -#define TVI_CONTROL_FALSE 0 -#define TVI_CONTROL_TRUE 1 -#define TVI_CONTROL_NA -1 -#define TVI_CONTROL_UNKNOWN -2 - -/* ======================== CONTROLS =========================== */ - -/* GENERIC controls */ -#define TVI_CONTROL_IS_AUDIO 0x1 -#define TVI_CONTROL_IS_VIDEO 0x2 -#define TVI_CONTROL_IS_TUNER 0x3 -#define TVI_CONTROL_IMMEDIATE 0x4 - -/* VIDEO controls */ -#define TVI_CONTROL_VID_GET_FPS 0x101 -#define TVI_CONTROL_VID_GET_PLANES 0x102 -#define TVI_CONTROL_VID_GET_BITS 0x103 -#define TVI_CONTROL_VID_CHK_BITS 0x104 -#define TVI_CONTROL_VID_SET_BITS 0x105 -#define TVI_CONTROL_VID_GET_FORMAT 0x106 -#define TVI_CONTROL_VID_CHK_FORMAT 0x107 -#define TVI_CONTROL_VID_SET_FORMAT 0x108 -#define TVI_CONTROL_VID_GET_WIDTH 0x109 -#define TVI_CONTROL_VID_CHK_WIDTH 0x110 -#define TVI_CONTROL_VID_SET_WIDTH 0x111 -#define TVI_CONTROL_VID_GET_HEIGHT 0x112 -#define TVI_CONTROL_VID_CHK_HEIGHT 0x113 -#define TVI_CONTROL_VID_SET_HEIGHT 0x114 -#define TVI_CONTROL_VID_GET_BRIGHTNESS 0x115 -#define TVI_CONTROL_VID_SET_BRIGHTNESS 0x116 -#define TVI_CONTROL_VID_GET_HUE 0x117 -#define TVI_CONTROL_VID_SET_HUE 0x118 -#define TVI_CONTROL_VID_GET_SATURATION 0x119 -#define TVI_CONTROL_VID_SET_SATURATION 0x11a -#define TVI_CONTROL_VID_GET_CONTRAST 0x11b -#define TVI_CONTROL_VID_SET_CONTRAST 0x11c -#define TVI_CONTROL_VID_GET_PICTURE 0x11d -#define TVI_CONTROL_VID_SET_PICTURE 0x11e -#define TVI_CONTROL_VID_SET_GAIN 0x11f -#define TVI_CONTROL_VID_GET_GAIN 0x120 -#define TVI_CONTROL_VID_SET_WIDTH_HEIGHT 0x121 - -/* TUNER controls */ -#define TVI_CONTROL_TUN_GET_FREQ 0x201 -#define TVI_CONTROL_TUN_SET_FREQ 0x202 -#define TVI_CONTROL_TUN_GET_TUNER 0x203 /* update priv->tuner struct for used input */ -#define TVI_CONTROL_TUN_SET_TUNER 0x204 /* update priv->tuner struct for used input */ -#define TVI_CONTROL_TUN_GET_NORM 0x205 -#define TVI_CONTROL_TUN_SET_NORM 0x206 -#define TVI_CONTROL_TUN_GET_SIGNAL 0x207 - -/* AUDIO controls */ -#define TVI_CONTROL_AUD_GET_FORMAT 0x301 -#define TVI_CONTROL_AUD_GET_SAMPLERATE 0x302 -#define TVI_CONTROL_AUD_GET_SAMPLESIZE 0x303 -#define TVI_CONTROL_AUD_GET_CHANNELS 0x304 -#define TVI_CONTROL_AUD_SET_SAMPLERATE 0x305 - -/* SPECIFIC controls */ -#define TVI_CONTROL_SPC_GET_INPUT 0x401 /* set input channel (tv,s-video,composite..) */ -#define TVI_CONTROL_SPC_SET_INPUT 0x402 /* set input channel (tv,s-video,composite..) */ -#define TVI_CONTROL_SPC_GET_NORMID 0x403 /* get normid from norm name */ +#ifndef MPLAYER_DEC_TELETEXT_H +#define MPLAYER_DEC_TELETEXT_H -//tvi_* ioctl (not tvi_vbi.c !!!) -#define TVI_CONTROL_VBI_INIT 0x501 ///< vbi init +int teletext_control(void* p, int cmd, void *arg); /* TELETEXT controls (through teletext_control() ) @@ -255,43 +59,6 @@ typedef struct { #define TV_VBI_CONTROL_DECODE_PAGE 0x556 ///< decode vbi page #define TV_VBI_CONTROL_GET_NETWORKNAME 0x557 ///< get current network name -int tv_set_color_options(tvi_handle_t *tvh, int opt, int val); -int tv_get_color_options(tvi_handle_t *tvh, int opt, int* val); -#define TV_COLOR_BRIGHTNESS 1 -#define TV_COLOR_HUE 2 -#define TV_COLOR_SATURATION 3 -#define TV_COLOR_CONTRAST 4 - -int tv_step_channel_real(tvi_handle_t *tvh, int direction); -int tv_step_channel(tvi_handle_t *tvh, int direction); -#define TV_CHANNEL_LOWER 1 -#define TV_CHANNEL_HIGHER 2 - -int tv_last_channel(tvi_handle_t *tvh); - -int tv_set_channel_real(tvi_handle_t *tvh, char *channel); -int tv_set_channel(tvi_handle_t *tvh, char *channel); - -int tv_step_norm(tvi_handle_t *tvh); -int tv_step_chanlist(tvi_handle_t *tvh); - -int tv_set_freq(tvi_handle_t *tvh, unsigned long freq); -int tv_get_freq(tvi_handle_t *tvh, unsigned long *freq); -int tv_get_signal(tvi_handle_t *tvh); -int tv_step_freq(tvi_handle_t *tvh, float step_interval); - -int tv_set_norm(tvi_handle_t *tvh, char* norm); - -void tv_start_scan(tvi_handle_t *tvh, int start); - -#define TV_NORM_PAL 1 -#define TV_NORM_NTSC 2 -#define TV_NORM_SECAM 3 -#define TV_NORM_PALNC 4 -#define TV_NORM_PALM 5 -#define TV_NORM_PALN 6 -#define TV_NORM_NTSCJP 7 - #define VBI_TFORMAT_TEXT 0 ///< text mode #define VBI_TFORMAT_BW 1 ///< black&white mode #define VBI_TFORMAT_GRAY 2 ///< grayscale mode @@ -366,4 +133,4 @@ typedef struct tt_stream_props_s{ int bufsize; ///< required buffer size } tt_stream_props; -#endif /* MPLAYER_TV_H */ +#endif /* MPLAYER_DEC_TELETEXT_H */ Modified: trunk/libvo/sub.c ============================================================================== --- trunk/libvo/sub.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/libvo/sub.c Thu Oct 29 23:13:04 2009 (r29801) @@ -29,7 +29,7 @@ #include "stream/stream_dvdnav.h" #define OSD_NAV_BOX_ALPHA 0x7f -#include "stream/tv.h" +#include "libmpcodecs/dec_teletext.h" #include "osdep/timer.h" #include "mplayer.h" Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/mpcommon.c Thu Oct 29 23:13:04 2009 (r29801) @@ -12,6 +12,7 @@ #include "version.h" #include "vobsub.h" #include "stream/tv.h" +#include "libmpcodecs/dec_teletext.h" #include "libavutil/intreadwrite.h" #include "m_option.h" #include "mpcommon.h" Modified: trunk/stream/tv.c ============================================================================== --- trunk/stream/tv.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/stream/tv.c Thu Oct 29 23:13:04 2009 (r29801) @@ -29,6 +29,7 @@ #include "libaf/af_format.h" #include "libmpcodecs/img_format.h" +#include "libmpcodecs/dec_teletext.h" #include "libavutil/avstring.h" #include "osdep/timer.h" Modified: trunk/stream/tv.h ============================================================================== --- trunk/stream/tv.h Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/stream/tv.h Thu Oct 29 23:13:04 2009 (r29801) @@ -221,40 +221,6 @@ typedef struct { //tvi_* ioctl (not tvi_vbi.c !!!) #define TVI_CONTROL_VBI_INIT 0x501 ///< vbi init -/* - TELETEXT controls (through teletext_control() ) - NOTE: - _SET_ should be _GET_ +1 - _STEP_ should be _GET_ +2 -*/ -#define TV_VBI_CONTROL_GET_MODE 0x510 ///< get current mode teletext -#define TV_VBI_CONTROL_SET_MODE 0x511 ///< on/off grab teletext - -#define TV_VBI_CONTROL_GET_PAGE 0x513 ///< get grabbed teletext page -#define TV_VBI_CONTROL_SET_PAGE 0x514 ///< set grab teletext page number -#define TV_VBI_CONTROL_STEP_PAGE 0x515 ///< step grab teletext page number - -#define TV_VBI_CONTROL_GET_SUBPAGE 0x516 ///< get grabbed teletext page -#define TV_VBI_CONTROL_SET_SUBPAGE 0x517 ///< set grab teletext page number - -#define TV_VBI_CONTROL_GET_FORMAT 0x519 ///< get teletext format -#define TV_VBI_CONTROL_SET_FORMAT 0x51a ///< set teletext format - -#define TV_VBI_CONTROL_GET_HALF_PAGE 0x51c ///< get current half page -#define TV_VBI_CONTROL_SET_HALF_PAGE 0x51d ///< switch half page - -#define TV_VBI_CONTROL_IS_CHANGED 0x540 ///< teletext page is changed -#define TV_VBI_CONTROL_MARK_UNCHANGED 0x541 ///< teletext page is changed - -#define TV_VBI_CONTROL_ADD_DEC 0x550 ///< add page number with dec -#define TV_VBI_CONTROL_GO_LINK 0x551 ///< go link (1..6) NYI -#define TV_VBI_CONTROL_GET_VBIPAGE 0x552 ///< get vbi_image for grabbed teletext page -#define TV_VBI_CONTROL_RESET 0x553 ///< vbi reset -#define TV_VBI_CONTROL_START 0x554 ///< vbi start -#define TV_VBI_CONTROL_STOP 0x555 ///< vbi stop -#define TV_VBI_CONTROL_DECODE_PAGE 0x556 ///< decode vbi page -#define TV_VBI_CONTROL_GET_NETWORKNAME 0x557 ///< get current network name - int tv_set_color_options(tvi_handle_t *tvh, int opt, int val); int tv_get_color_options(tvi_handle_t *tvh, int opt, int* val); #define TV_COLOR_BRIGHTNESS 1 @@ -292,78 +258,4 @@ void tv_start_scan(tvi_handle_t *tvh, in #define TV_NORM_PALN 6 #define TV_NORM_NTSCJP 7 -#define VBI_TFORMAT_TEXT 0 ///< text mode -#define VBI_TFORMAT_BW 1 ///< black&white mode -#define VBI_TFORMAT_GRAY 2 ///< grayscale mode -#define VBI_TFORMAT_COLOR 3 ///< color mode (require color_spu patch!) - -#define VBI_MAX_PAGES 0x800 ///< max sub pages number -#define VBI_MAX_SUBPAGES 64 ///< max sub pages number - -#define VBI_ROWS 25 ///< teletext page height in rows -#define VBI_COLUMNS 40 ///< teletext page width in chars -#define VBI_TIME_LINEPOS 26 ///< time line pos in page header - -typedef -enum{ - TT_FORMAT_OPAQUE=0, ///< opaque - TT_FORMAT_TRANSPARENT, ///< transparent - TT_FORMAT_OPAQUE_INV, ///< opaque with inverted colors - TT_FORMAT_TRANSPARENT_INV ///< transparent with inverted colors -} teletext_format; - -typedef -enum{ - TT_ZOOM_NORMAL=0, - TT_ZOOM_TOP_HALF, - TT_ZOOM_BOTTOM_HALF -} teletext_zoom; - -typedef struct tt_char_s{ - unsigned int unicode; ///< unicode (utf8) character - unsigned char fg; ///< foreground color - unsigned char bg; ///< background color - unsigned char gfx; ///< 0-no gfx, 1-solid gfx, 2-separated gfx - unsigned char flh; ///< 0-no flash, 1-flash - unsigned char hidden; ///< char is hidden (for subtitle pages) - unsigned char ctl; ///< control character - unsigned char lng; ///< lang: 0-secondary language,1-primary language - unsigned char raw; ///< raw character (as received from device) -} tt_char; - -typedef struct tt_link_s{ - int pagenum; ///< page number - int subpagenum; ///< subpage number -} tt_link_t; - -typedef struct tt_page_s{ - int pagenum; ///< page number - int subpagenum; ///< subpage number - unsigned char primary_lang; ///< primary language code - unsigned char secondary_lang; ///< secondary language code - unsigned char active; ///< page is complete and ready for rendering - unsigned char flags; ///< page flags - unsigned char raw[VBI_ROWS*VBI_COLUMNS]; ///< page data - struct tt_page_s* next_subpage; - struct tt_link_s links[6]; -} tt_page; - -#define TT_PGFL_SUPPRESS_HEADER 0x01 -#define TT_PGFL_UPDATE_INDICATOR 0x02 -#define TT_PGFL_INTERRUPTED_SEQ 0x04 -#define TT_PGFL_INHIBIT_DISPLAY 0x08 -#define TT_PGFL_NEWFLASH 0x10 -#define TT_PGFL_SUBTITLE 0x20 -#define TT_PGFL_ERASE_PAGE 0x40 -#define TT_PGFL_MAGAZINE_SERIAL 0x80 - -typedef struct tt_stream_props_s{ - int sampling_rate; - int samples_per_line; - int offset; - int count[2]; ///< number of lines in first and second fields - int interlaced; ///< vbi data are interlaced - int bufsize; ///< required buffer size -} tt_stream_props; - #endif /* MPLAYER_TV_H */ Modified: trunk/stream/tvi_def.h ============================================================================== --- trunk/stream/tvi_def.h Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/stream/tvi_def.h Thu Oct 29 23:13:04 2009 (r29801) @@ -15,8 +15,6 @@ static int get_video_framesize(priv_t *p static double grab_audio_frame(priv_t *priv, char *buffer, int len); static int get_audio_framesize(priv_t *priv); -int teletext_control(void* p, int cmd, void *arg); - static const tvi_functions_t functions = { init, Modified: trunk/stream/tvi_dshow.c ============================================================================== --- trunk/stream/tvi_dshow.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/stream/tvi_dshow.c Thu Oct 29 23:13:04 2009 (r29801) @@ -76,6 +76,7 @@ #include <stdio.h> #include "libmpcodecs/img_format.h" +#include "libmpcodecs/dec_teletext.h" #include "libaf/af_format.h" #include "help_mp.h" #include "osdep/timer.h" Modified: trunk/stream/tvi_v4l.c ============================================================================== --- trunk/stream/tvi_v4l.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/stream/tvi_v4l.c Thu Oct 29 23:13:04 2009 (r29801) @@ -40,6 +40,7 @@ #include "mp_msg.h" #include "libaf/af_format.h" #include "libmpcodecs/img_format.h" +#include "libmpcodecs/dec_teletext.h" #include "libvo/fastmemcpy.h" #include "libvo/videodev_mjpeg.h" Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c Wed Oct 28 14:55:18 2009 (r29800) +++ trunk/stream/tvi_v4l2.c Thu Oct 29 23:13:04 2009 (r29801) @@ -53,6 +53,7 @@ known issues: #include <linux/videodev2.h> #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"

1 0

r29800 - trunk/configure
by diego 28 Oct '09

28 Oct '09

Author: diego Date: Wed Oct 28 14:55:18 2009 New Revision: 29800 Log: consistency fix: Give all CONFIG_ definitions the value 1. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Oct 27 09:29:07 2009 (r29799) +++ trunk/configure Wed Oct 28 14:55:18 2009 (r29800) @@ -3982,7 +3982,7 @@ EOF fi if test "$_smb" = yes; then - def_smb="#define CONFIG_LIBSMBCLIENT" + def_smb="#define CONFIG_LIBSMBCLIENT 1" _inputmodules="smb $_inputmodules" else def_smb="#undef CONFIG_LIBSMBCLIENT" @@ -4075,7 +4075,7 @@ echores "$_tga" echocheck "md5sum support" if test "$_md5sum" = yes; then - def_md5sum="#define CONFIG_MD5SUM" + def_md5sum="#define CONFIG_MD5SUM 1" _vomodules="md5sum $_vomodules" else def_md5sum="#undef CONFIG_MD5SUM" @@ -4086,7 +4086,7 @@ echores "$_md5sum" echocheck "yuv4mpeg support" if test "$_yuv4mpeg" = yes; then - def_yuv4mpeg="#define CONFIG_YUV4MPEG" + def_yuv4mpeg="#define CONFIG_YUV4MPEG 1" _vomodules="yuv4mpeg $_vomodules" else def_yuv4mpeg="#undef CONFIG_YUV4MPEG" @@ -5490,7 +5490,7 @@ if test "$_esd" = yes ; then #include <esd.h> int main(void) { return esd_get_latency(0); } EOF - cc_check $(esd-config --libs) $(esd-config --cflags) && _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY' + cc_check $(esd-config --libs) $(esd-config --cflags) && _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY 1' echores "$_esd_latency" else def_esd='#undef CONFIG_ESD' @@ -6004,7 +6004,7 @@ EOF fi if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then _cdda='yes' - def_libcdio='#define CONFIG_LIBCDIO' + def_libcdio='#define CONFIG_LIBCDIO 1' def_havelibcdio='yes' else if test "$_cdparanoia" = yes ; then @@ -6017,7 +6017,7 @@ echores "$_libcdio" if test "$_cdda" = yes ; then test $_cddb = auto && test $_network = yes && _cddb=yes - def_cdparanoia='#define CONFIG_CDDA' + def_cdparanoia='#define CONFIG_CDDA 1' _inputmodules="cdda $_inputmodules" else def_cdparanoia='#undef CONFIG_CDDA' @@ -6025,7 +6025,7 @@ else fi if test "$_cddb" = yes ; then - def_cddb='#define CONFIG_CDDB' + def_cddb='#define CONFIG_CDDB 1' _inputmodules="cddb $_inputmodules" else _cddb=no @@ -6073,7 +6073,7 @@ EOF fi fi if test "$_freetype" = yes ; then - def_freetype='#define CONFIG_FREETYPE' + def_freetype='#define CONFIG_FREETYPE 1' extra_cflags="$extra_cflags $($_freetypeconfig --cflags)" extra_ldflags="$extra_ldflags $($_freetypeconfig --libs)" else @@ -6113,7 +6113,7 @@ EOF fi fi if test "$_fontconfig" = yes ; then - def_fontconfig='#define CONFIG_FONTCONFIG' + def_fontconfig='#define CONFIG_FONTCONFIG 1' else def_fontconfig='#undef CONFIG_FONTCONFIG' fi @@ -6143,7 +6143,7 @@ EOF fi fi if test "$_ass" = yes ; then - def_ass='#define CONFIG_ASS' + def_ass='#define CONFIG_ASS 1' else def_ass='#undef CONFIG_ASS' fi @@ -6173,7 +6173,7 @@ EOF fi fi if test "$_fribidi" = yes ; then - def_fribidi='#define CONFIG_FRIBIDI' + def_fribidi='#define CONFIG_FRIBIDI 1' extra_cflags="$extra_cflags $($_fribidiconfig --cflags)" extra_ldflags="$extra_ldflags $($_fribidiconfig --libs)" else @@ -6696,7 +6696,7 @@ EOF cc_check && _ladspa=yes fi if test "$_ladspa" = yes; then - def_ladspa="#define CONFIG_LADSPA" + def_ladspa="#define CONFIG_LADSPA 1" else def_ladspa="#undef CONFIG_LADSPA" fi @@ -6736,7 +6736,7 @@ EOF fi fi def_libbs2b="#undef CONFIG_LIBBS2B" -test "$_libbs2b" = yes && def_libbs2b="#define CONFIG_LIBBS2B" +test "$_libbs2b" = yes && def_libbs2b="#define CONFIG_LIBBS2B 1" echores "$_libbs2b" @@ -7389,19 +7389,19 @@ EOF cc_check -lmp3lame $_ld_lm && _mp3lame=yes fi if test "$_mp3lame" = yes ; then - def_mp3lame="#define CONFIG_MP3LAME" + def_mp3lame="#define CONFIG_MP3LAME 1" _ld_mp3lame=-lmp3lame libs_mencoder="$libs_mencoder $_ld_mp3lame" cat > $TMPC << EOF #include <lame/lame.h> int main(void) { lame_set_preset(NULL, STANDARD_FAST); return 0; } EOF - cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET" + cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1" cat > $TMPC << EOF #include <lame/lame.h> int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } EOF - cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM" + cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1" test "$_mp3lame_lavc" = auto && _mp3lame_lavc=yes if test "$_mp3lame_lavc" = yes ; then def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"

1 0