mplayer.hg: stream/tvi_vbi.c comparison

comparison stream/tvi_vbi.c @ 24342:8873c972c6aa

Decrease teletext page rendering frequency from 1/frame to about 4/sec.

author	voroshil
date	Sat, 08 Sep 2007 03:06:23 +0000
parents	31dbcf68a706
children	09d402672398

comparison

equal deleted inserted replaced

-:23e69a6846ee
+:8873c972c6aa
 #include "mp_msg.h"
 #include "help_mp.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{
 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;
 } priv_vbi_t;
 static unsigned char fixParity[256];
 static tt_char tt_space={0x20,7,0,0,0,0,0x20};
 priv_vbi_t* priv=(priv_vbi_t*)p;
 tt_page* pgc;
 if (!priv && cmd!=TV_VBI_CONTROL_START)
 return TVI_CONTROL_FALSE;
-if (!arg && cmd!=TV_VBI_CONTROL_STOP)
+if (!arg && cmd!=TV_VBI_CONTROL_STOP && cmd!=TV_VBI_CONTROL_MARK_UNCHANGED)
 return TVI_CONTROL_FALSE;
 switch (cmd) {
 case TV_VBI_CONTROL_RESET:
 {
 mp_msg(MSGT_TV,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;
 }
 case TV_VBI_CONTROL_START:
 {
 priv->mag=calloc(8,sizeof(mag_t));
 init_cache(priv);
 init_vbi_consts(priv);
 pll_reset(priv,fine_tune);
+priv->page_changed=1;
 return TVI_CONTROL_TRUE;
 }
 case TV_VBI_CONTROL_STOP:
 {
 if(priv->mag)
 free(priv->mag);
 if(priv->ptsp)
 free(priv->ptsp);
 destroy_cache(priv);
+priv->page_changed=1;
 free(priv);
 return TVI_CONTROL_TRUE;
 }
 case TV_VBI_CONTROL_SET_MODE:
 priv->on=(*(int*)arg%2);
+priv->page_changed=1;
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_GET_MODE:
 *(int*)arg=priv->on;
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_SET_FORMAT:
+priv->page_changed=1;
 return teletext_set_format(priv, *(int *) arg);
 case TV_VBI_CONTROL_GET_FORMAT:
 pthread_mutex_lock(&(priv->buffer_mutex));
 *(int*)arg=priv->tformat;
 pthread_mutex_unlock(&(priv->buffer_mutex));
 val%=3;
 if(val<0)
 val+=3;
 pthread_mutex_lock(&(priv->buffer_mutex));
 priv->zoom=val;
+priv->page_changed=1;
 pthread_mutex_unlock(&(priv->buffer_mutex));
 return TVI_CONTROL_TRUE;
 }
 case TV_VBI_CONTROL_GO_LINK:
 {
 priv->pagenum=pgc->links[val-1].pagenum;
 if(pgc->links[val-1].subpagenum!=0x3f7f)
 priv->subpagenum=pgc->links[val-1].subpagenum;
 else
 priv->subpagenum=get_subpagenum_from_cache(priv,priv->pagenum);
+priv->page_changed=1;
 pthread_mutex_unlock(&(priv->buffer_mutex));
 return TVI_CONTROL_TRUE;
 }
 case TV_VBI_CONTROL_SET_PAGE:
 {
 return TVI_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;
 }
 case TV_VBI_CONTROL_STEP_PAGE:
 {
 int direction=*(int *) arg;
 pthread_mutex_lock(&(priv->buffer_mutex));
 priv->pagenum=steppage(priv->pagenum, direction,1);
 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;
 }
 case TV_VBI_CONTROL_GET_PAGE:
 *(int*)arg=((priv->pagenum+0x700)&0x7ff)+0x100;
 priv->subpagenum=*(int*)arg;
 if(priv->subpagenum<0)
 priv->subpagenum=0x3f7f;
 if(priv->subpagenum>=VBI_MAX_SUBPAGES)
 priv->subpagenum=VBI_MAX_SUBPAGES-1;
+priv->page_changed=1;
 pthread_mutex_unlock(&(priv->buffer_mutex));
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_GET_SUBPAGE:
 *(int*)arg=priv->subpagenum;
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_ADD_DEC:
 vbi_add_dec(priv, *(char **) arg);
+priv->page_changed=1;
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_DECODE_PAGE:
 vbi_decode(priv,*(unsigned char**)arg);
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_GET_VBIPAGE:
 *(void **)arg=priv->display_page;
 return TVI_CONTROL_TRUE;
 case TV_VBI_CONTROL_GET_NETWORKNAME:
 *(void **)arg=priv->networkname;
 return TVI_CONTROL_TRUE;
+case TV_VBI_CONTROL_MARK_UNCHANGED:
+priv->page_changed=0;
+return TVI_CONTROL_TRUE;
+case TV_VBI_CONTROL_IS_CHANGED:
+if((GetTimerMS()/250)%2)  //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 TVI_CONTROL_UNKNOWN;
 }

Mercurial > mplayer.hg

comparison stream/tvi_vbi.c @ 24342:8873c972c6aa