May 2007 - MPlayer-cvslog - lists.mplayerhq.hu

r23335 - in trunk: configure vidix/Makefile
by diego 04 Feb '09

04 Feb '09

Author: diego Date: Thu May 17 23:48:56 2007 New Revision: 23335 Log: Remove awk test. awk is a basic Unix tool, any implementation is sufficient. Modified: trunk/configure trunk/vidix/Makefile Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu May 17 23:48:56 2007 @@ -7179,28 +7179,7 @@ if test "$_vidix_internal" = auto ; then beos && _vidix_internal=no darwin && _vidix_internal=no fi - -# checking for a working awk, I'm using mawk first, because it's fastest - atmos -_awk=awk if test "$_vidix_internal" = yes ; then -_awk_verc_fail=yes -echocheck "awk" -for _awk in mawk gawk nawk; do - if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then - _awk_verc_fail=no - break - fi -done -test "$_awk_verc_fail" = yes && _awk=no -echores "$_awk" -if test "$_awk_verc_fail" = yes; then -echo "VIDIX needs awk, but no working implementation was found!" -echo "Try the GNU version, which can be downloaded from:" -echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "If you don't need VIDIX, you can use configure --disable-vidix instead." -die "no awk" -fi -fi if test "$_vidix_internal" = yes; then _res_comment="internal" @@ -7544,7 +7523,6 @@ libdir = \$(LIBDIR) #AR = ar CC = $_cc HOST_CC = $_host_cc -AWK = $_awk RANLIB = $_ranlib LDCONFIG = $_ldconfig INSTALL = $_install Modified: trunk/vidix/Makefile ============================================================================== --- trunk/vidix/Makefile (original) +++ trunk/vidix/Makefile Thu May 17 23:48:56 2007 @@ -47,7 +47,7 @@ rage128_vid.o: radeon_vid.c $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< pci_names.c pci_dev_ids.c: pci.db - LC_ALL=C $(AWK) -f pci_db2c.awk $< + LC_ALL=C awk -f pci_db2c.awk $< clean:: rm -f pci_*.c pci_*.h

5 8

r21474 - in trunk/libass: ass.c ass.h ass_cache.c ass_font.c ass_fontconfig.c ass_fontconfig.h ass_library.c ass_library.h ass_render.c
by eugeni 06 Jan '08

06 Jan '08

Author: eugeni Date: Sun Dec 3 18:59:13 2006 New Revision: 21474 Modified: trunk/libass/ass.c trunk/libass/ass.h trunk/libass/ass_cache.c trunk/libass/ass_font.c trunk/libass/ass_fontconfig.c trunk/libass/ass_fontconfig.h trunk/libass/ass_library.c trunk/libass/ass_library.h trunk/libass/ass_render.c Log: Keep embedded fonts in ass_library_t and perform actual disk write in fontconfig initialization. This is required for some fontconfig-related improvements. Modified: trunk/libass/ass.c ============================================================================== --- trunk/libass/ass.c (original) +++ trunk/libass/ass.c Sun Dec 3 18:59:13 2006 @@ -1046,86 +1046,6 @@ return 0; } -static char* validate_fname(char* name) -{ - char* fname; - char* p; - char* q; - unsigned code; - int sz = strlen(name); - - q = fname = malloc(sz + 1); - p = name; - while (*p) { - code = utf8_get_char(&p); - if (code == 0) - break; - if ( (code > 0x7F) || - (code == '\\') || - (code == '/') || - (code == ':') || - (code == '*') || - (code == '?') || - (code == '<') || - (code == '>') || - (code == '|') || - (code == 0)) - { - *q++ = '_'; - } else { - *q++ = code; - } - if (p - name > sz) - break; - } - *q = 0; - return fname; -} - -/** - * \brief Add a memory font. - * \param name attachment name - * \param data binary font data - * \param data_size data size -*/ -void ass_add_font(ass_library_t* library, const char* name, char* data, int data_size) -{ - char buf[1000]; - FILE* fp = 0; - int rc; - struct stat st; - char* fname; - const char* fonts_dir = library->fonts_dir; - - if (!fonts_dir) - return; - rc = stat(fonts_dir, &st); - if (rc) { - int res; -#ifndef __MINGW32__ - res = mkdir(fonts_dir, 0700); -#else - res = mkdir(fonts_dir); -#endif - if (res) { - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir); - } - } else if (!S_ISDIR(st.st_mode)) { - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir); - } - - fname = validate_fname((char*)name); - - snprintf(buf, 1000, "%s/%s", fonts_dir, fname); - free(fname); - - fp = fopen(buf, "wb"); - if (!fp) return; - - fwrite(data, data_size, 1, fp); - fclose(fp); -} - long long ass_step_sub(ass_track_t* track, long long now, int movement) { int i; Modified: trunk/libass/ass.h ============================================================================== --- trunk/libass/ass.h (original) +++ trunk/libass/ass.h Sun Dec 3 18:59:13 2006 @@ -182,7 +182,7 @@ * \param data binary font data * \param data_size data size */ -void ass_add_font(ass_library_t* library, const char* name, char* data, int data_size); +void ass_add_font(ass_library_t* library, char* name, char* data, int data_size); /** * \brief Calculates timeshift from now to the start of some other subtitle event, depending on movement parameter Modified: trunk/libass/ass_cache.c ============================================================================== --- trunk/libass/ass_cache.c (original) +++ trunk/libass/ass_cache.c Sun Dec 3 18:59:13 2006 @@ -27,6 +27,7 @@ #include <assert.h> #include "mputils.h" +#include "ass.h" #include "ass_fontconfig.h" #include "ass_font.h" #include "ass_bitmap.h" Modified: trunk/libass/ass_font.c ============================================================================== --- trunk/libass/ass_font.c (original) +++ trunk/libass/ass_font.c Sun Dec 3 18:59:13 2006 @@ -26,6 +26,8 @@ #include FT_SYNTHESIS_H #include FT_GLYPH_H +#include "ass.h" +#include "ass_library.h" #include "ass_font.h" #include "ass_bitmap.h" #include "ass_cache.h" Modified: trunk/libass/ass_fontconfig.c ============================================================================== --- trunk/libass/ass_fontconfig.c (original) +++ trunk/libass/ass_fontconfig.c Sun Dec 3 18:59:13 2006 @@ -28,6 +28,8 @@ #include <sys/stat.h> #include "mputils.h" +#include "ass.h" +#include "ass_library.h" #include "ass_fontconfig.h" #ifdef HAVE_FONTCONFIG @@ -184,6 +186,89 @@ return fontconfig_select_with_charset(priv, family, bold, italic, index, 0); } +static char* validate_fname(char* name) +{ + char* fname; + char* p; + char* q; + unsigned code; + int sz = strlen(name); + + q = fname = malloc(sz + 1); + p = name; + while (*p) { + code = utf8_get_char(&p); + if (code == 0) + break; + if ( (code > 0x7F) || + (code == '\\') || + (code == '/') || + (code == ':') || + (code == '*') || + (code == '?') || + (code == '<') || + (code == '>') || + (code == '|') || + (code == 0)) + { + *q++ = '_'; + } else { + *q++ = code; + } + if (p - name > sz) + break; + } + *q = 0; + return fname; +} + +/** + * \brief Process embedded matroska font. Saves it to ~/.mplayer/fonts. + * \param name attachment name + * \param data binary font data + * \param data_size data size +*/ +static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int idx) +{ + char buf[1000]; + FILE* fp = 0; + int rc; + struct stat st; + char* fname; + const char* name = library->fontdata[idx].name; + const char* data = library->fontdata[idx].data; + int data_size = library->fontdata[idx].size; + const char* fonts_dir = library->fonts_dir; + + if (!fonts_dir) + return; + rc = stat(fonts_dir, &st); + if (rc) { + int res; +#ifndef __MINGW32__ + res = mkdir(fonts_dir, 0700); +#else + res = mkdir(fonts_dir); +#endif + if (res) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir); + } + } else if (!S_ISDIR(st.st_mode)) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir); + } + + fname = validate_fname((char*)name); + + snprintf(buf, 1000, "%s/%s", fonts_dir, fname); + free(fname); + + fp = fopen(buf, "wb"); + if (!fp) return; + + fwrite(data, data_size, 1, fp); + fclose(fp); +} + /** * \brief Init fontconfig. * \param dir additional directoryu for fonts @@ -191,11 +276,13 @@ * \param path default font path * \return pointer to fontconfig private data */ -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) { int rc; struct stat st; fc_instance_t* priv = calloc(1, sizeof(fc_instance_t)); + const char* dir = library->fonts_dir; + int i; rc = FcInit(); assert(rc); @@ -206,6 +293,9 @@ return 0; } + for (i = 0; i < library->num_fontdata; ++i) + process_fontdata(priv, library, i); + if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse) { mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache); @@ -265,7 +355,7 @@ return priv->path_default; } -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) { fc_instance_t* priv; Modified: trunk/libass/ass_fontconfig.h ============================================================================== --- trunk/libass/ass_fontconfig.h (original) +++ trunk/libass/ass_fontconfig.h Sun Dec 3 18:59:13 2006 @@ -27,7 +27,7 @@ typedef struct fc_instance_s fc_instance_t; -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path); +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path); char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index); void fontconfig_done(fc_instance_t* priv); Modified: trunk/libass/ass_library.c ============================================================================== --- trunk/libass/ass_library.c (original) +++ trunk/libass/ass_library.c Sun Dec 3 18:59:13 2006 @@ -71,3 +71,19 @@ *q = strdup(*p); priv->style_overrides[cnt] = NULL; } + +static void grow_array(void **array, int nelem, size_t elsize) +{ + if (!(nelem & 31)) + *array = realloc(*array, (nelem + 32) * elsize); +} + +void ass_add_font(ass_library_t* priv, char* name, char* data, int size) +{ + grow_array((void**)&priv->fontdata, priv->num_fontdata, sizeof(*priv->fontdata)); + priv->fontdata[priv->num_fontdata].name = name; + priv->fontdata[priv->num_fontdata].data = data; + priv->fontdata[priv->num_fontdata].size = size; + priv->num_fontdata ++; +} + Modified: trunk/libass/ass_library.h ============================================================================== --- trunk/libass/ass_library.h (original) +++ trunk/libass/ass_library.h Sun Dec 3 18:59:13 2006 @@ -21,10 +21,19 @@ #ifndef __ASS_LIBRARY_H__ #define __ASS_LIBRARY_H__ +typedef struct ass_fontdata_s { + char* name; + char* data; + int size; +} ass_fontdata_t; + struct ass_library_s { char* fonts_dir; int extract_fonts; char** style_overrides; + + ass_fontdata_t* fontdata; + int num_fontdata; }; #endif Modified: trunk/libass/ass_render.c ============================================================================== --- trunk/libass/ass_render.c (original) +++ trunk/libass/ass_render.c Sun Dec 3 18:59:13 2006 @@ -1928,7 +1928,7 @@ if (priv->fontconfig_priv) fontconfig_done(priv->fontconfig_priv); - priv->fontconfig_priv = fontconfig_init(priv->library->fonts_dir, default_family, default_font); + priv->fontconfig_priv = fontconfig_init(priv->library, default_family, default_font); return !!priv->fontconfig_priv; }

2 1

r23154 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 cfg-mplayer.h libvo/aspect.c
by cehoyos 07 Oct '07

07 Oct '07

Author: cehoyos Date: Sat Apr 28 01:16:45 2007 New Revision: 23154 Log: Make -monitorpixelaspect 0 the default. Patch by Onur Küçük <onur.--.-.delipenguen.net> Modified: trunk/cfg-mplayer.h trunk/libvo/aspect.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h (original) +++ trunk/cfg-mplayer.h Sat Apr 28 01:16:45 2007 @@ -206,8 +206,8 @@ m_option_t mplayer_opts[]={ // Geometry string {"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL}, // set aspect ratio of monitor - useful for 16:9 TVout - {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL}, - {"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL}, + {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL}, + {"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL}, // video mode switching: (x11,xv,dga) {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, Modified: trunk/libvo/aspect.c ============================================================================== --- trunk/libvo/aspect.c (original) +++ trunk/libvo/aspect.c Sat Apr 28 01:16:45 2007 @@ -19,8 +19,8 @@ float vo_panscanrange = 1.0; #include "video_out.h" -float monitor_aspect=4.0/3.0; -float monitor_pixel_aspect=0; +float monitor_aspect=0; +float monitor_pixel_aspect=1; extern float movie_aspect; static struct { @@ -55,7 +55,7 @@ void aspect_save_screenres(int scrw, int #endif aspdat.scrw = scrw; aspdat.scrh = scrh; - if (monitor_pixel_aspect) + if (!monitor_aspect) monitor_aspect = monitor_pixel_aspect * scrw / scrh; }

6 7

r23356 - in trunk: cfg-common.h libmenu/vf_menu.c libvo/font_load.h libvo/font_load_ft.c libvo/sub.c mencoder.c mplayer.c mplayer.h
by ben 25 Jul '07

25 Jul '07

Author: ben Date: Sun May 20 18:10:45 2007 New Revision: 23356 Log: add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles Modified: trunk/cfg-common.h trunk/libmenu/vf_menu.c trunk/libvo/font_load.h trunk/libvo/font_load_ft.c trunk/libvo/sub.c trunk/mencoder.c trunk/mplayer.c trunk/mplayer.h Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h (original) +++ trunk/cfg-common.h Sun May 20 18:10:45 2007 @@ -292,6 +292,7 @@ {"sub-no-text-pp", &sub_no_text_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"sub-fuzziness", &sub_match_fuzziness, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"subfont", &sub_font_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL}, {"subpos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, {"subalign", &sub_alignment, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, Modified: trunk/libmenu/vf_menu.c ============================================================================== --- trunk/libmenu/vf_menu.c (original) +++ trunk/libmenu/vf_menu.c Sun May 20 18:10:45 2007 @@ -11,6 +11,7 @@ #include <malloc.h> #endif +#include "mplayer.h" #include "mp_msg.h" #include "libmpcodecs/img_format.h" @@ -267,7 +268,7 @@ static int config(struct vf_instance_s* // here is the right place to get screen dimensions if (force_load_font) { force_load_font = 0; - load_font_ft(width,height); + load_font_ft(width,height,&vo_font,font_name); } #endif if(outfmt == IMGFMT_MPEGPES) Modified: trunk/libvo/font_load.h ============================================================================== --- trunk/libvo/font_load.h (original) +++ trunk/libvo/font_load.h Sun May 20 18:10:45 2007 @@ -62,6 +62,7 @@ typedef struct { } font_desc_t; extern font_desc_t* vo_font; +extern font_desc_t* sub_font; #ifdef HAVE_FREETYPE @@ -86,7 +87,7 @@ void free_font_desc(font_desc_t *desc); void render_one_glyph(font_desc_t *desc, int c); int kerning(font_desc_t *desc, int prevc, int c); -void load_font_ft(int width, int height); +void load_font_ft(int width, int height, font_desc_t **desc, const char *name); void blur(unsigned char *buffer, unsigned short *tmp2, int width, int height, int stride, int *m2, int r, int mwidth); Modified: trunk/libvo/font_load_ft.c ============================================================================== --- trunk/libvo/font_load_ft.c (original) +++ trunk/libvo/font_load_ft.c Sun May 20 18:10:45 2007 @@ -942,7 +942,7 @@ int kerning(font_desc_t *desc, int prevc { FT_Vector kern; - if (!vo_font->dynamic) return 0; + if (!desc->dynamic) return 0; if (prevc < 0 || c < 0) return 0; if (desc->font[prevc] != desc->font[c]) return 0; if (desc->font[prevc] == -1 || desc->font[c] == -1) return 0; @@ -1137,7 +1137,7 @@ int done_freetype(void) return 0; } -void load_font_ft(int width, int height) +void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_name) { #ifdef HAVE_FONTCONFIG FcPattern *fc_pattern; @@ -1145,6 +1145,7 @@ void load_font_ft(int width, int height) FcChar8 *s; FcBool scalable; #endif + font_desc_t *vo_font = *fontp; vo_image_width = width; vo_image_height = height; @@ -1177,10 +1178,10 @@ void load_font_ft(int width, int height) } // s doesn't need to be freed according to fontconfig docs FcPatternGetString(fc_pattern, FC_FILE, 0, &s); - vo_font=read_font_desc_ft(s, width, height); + *fontp=read_font_desc_ft(s, width, height); FcPatternDestroy(fc_pattern); } else #endif - vo_font=read_font_desc_ft(font_name, width, height); + *fontp=read_font_desc_ft(font_name, width, height); } Modified: trunk/libvo/sub.c ============================================================================== --- trunk/libvo/sub.c (original) +++ trunk/libvo/sub.c Sun May 20 18:10:45 2007 @@ -14,6 +14,7 @@ #define OSD_NAV_BOX_ALPHA 0x7f #endif +#include "mplayer.h" #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" @@ -63,6 +64,7 @@ char * __sub_osd_names_short[] ={ "", "| //static int vo_font_loaded=-1; font_desc_t* vo_font=NULL; +font_desc_t* sub_font=NULL; unsigned char* vo_osd_text=NULL; int sub_unicode=0; @@ -392,7 +394,7 @@ inline static void vo_update_text_sub(mp obj->flags|=OSDFLAG_CHANGED|OSDFLAG_VISIBLE; - if(!vo_sub || !vo_font || !sub_visibility || (vo_font->font[40]<0)){ + if(!vo_sub || !sub_font || !sub_visibility || (sub_font->font[40]<0)){ obj->flags&=~OSDFLAG_VISIBLE; return; } @@ -402,7 +404,7 @@ inline static void vo_update_text_sub(mp // too long lines divide into a smaller ones i=k=lasth=0; - h=vo_font->height; + h=sub_font->height; lastStripPosition=-1; l=vo_sub->lines; @@ -413,7 +415,7 @@ inline static void vo_update_text_sub(mp int *char_seq, char_position, xlimit = dxs * sub_width_p / 100, counter; while (l) { - xsize = -vo_font->charspace; + xsize = -sub_font->charspace; l--; t=vo_sub->text[i++]; char_position = 0; @@ -436,7 +438,7 @@ inline static void vo_update_text_sub(mp mp_msg(MSGT_OSD,MSGL_WARN,"\nMAX_UCS exceeded!\n"); } if (!c) c++; // avoid UCS 0 - render_one_glyph(vo_font, c); + render_one_glyph(sub_font, c); if (c == ' ') { struct osd_text_t *tmp_ott = (struct osd_text_t *) calloc(1, sizeof(struct osd_text_t)); @@ -447,7 +449,7 @@ inline static void vo_update_text_sub(mp tmp_ott->prev = cp_ott; cp_ott->next = tmp_ott; tmp_ott->osd_kerning = - vo_font->charspace + vo_font->width[' ']; + sub_font->charspace + sub_font->width[' ']; cp_ott = tmp_ott; } tmp_ott->osd_length = xsize; @@ -459,16 +461,16 @@ inline static void vo_update_text_sub(mp xsize = 0; prevc = c; } else { - int delta_xsize = vo_font->width[c] + vo_font->charspace + kerning(vo_font, prevc, c); + int delta_xsize = sub_font->width[c] + sub_font->charspace + kerning(sub_font, prevc, c); if (xsize + delta_xsize <= dxs) { if (!x) x = 1; prevc = c; char_seq[char_position++] = c; xsize += delta_xsize; - if ((!suboverlap_enabled) && ((font = vo_font->font[c]) >= 0)) { - if (vo_font->pic_a[font]->h > h) { - h = vo_font->pic_a[font]->h; + if ((!suboverlap_enabled) && ((font = sub_font->font[c]) >= 0)) { + if (sub_font->pic_a[font]->h > h) { + h = sub_font->pic_a[font]->h; } } } else { @@ -490,7 +492,7 @@ inline static void vo_update_text_sub(mp tmp_ott->prev = cp_ott; cp_ott->next = tmp_ott; tmp_ott->osd_kerning = - vo_font->charspace + vo_font->width[' ']; + sub_font->charspace + sub_font->width[' ']; cp_ott = tmp_ott; } tmp_ott->osd_length = xsize; @@ -499,7 +501,7 @@ inline static void vo_update_text_sub(mp for (counter = 0; counter < char_position; ++counter) tmp_ott->text[counter] = char_seq[counter]; char_position = 0; - xsize = -vo_font->charspace; + xsize = -sub_font->charspace; } free(char_seq); @@ -522,7 +524,7 @@ inline static void vo_update_text_sub(mp tmp->prev = tmp_otp; tmp_otp = tmp; tmp_otp->ott = tmp_ott; - value = -2 * vo_font->charspace - vo_font->width[' ']; + value = -2 * sub_font->charspace - sub_font->width[' ']; } else { tmp_otp->value = value; exit = 1; @@ -623,7 +625,7 @@ inline static void vo_update_text_sub(mp break; if (h > obj->y) { // out of the screen so end parsing - obj->y -= lasth - vo_font->height; // correct the y position + obj->y -= lasth - sub_font->height; // correct the y position break; } xsize = tmp_otp->value; @@ -640,17 +642,17 @@ inline static void vo_update_text_sub(mp break; } c = tmp_ott->text[counter]; - render_one_glyph(vo_font, c); + render_one_glyph(sub_font, c); obj->params.subtitle.utbl[utblc++] = c; k++; } obj->params.subtitle.utbl[utblc++] = ' '; } obj->params.subtitle.utbl[utblc - 1] = 0; - obj->y -= vo_font->height; + obj->y -= sub_font->height; } if(obj->params.subtitle.lines) - obj->y = dys - ((obj->params.subtitle.lines - 1) * vo_font->height + vo_font->pic_a[vo_font->font[40]]->h); + obj->y = dys - ((obj->params.subtitle.lines - 1) * sub_font->height + sub_font->pic_a[sub_font->font[40]]->h); // free memory if (otp_sub != NULL) { @@ -689,7 +691,7 @@ inline static void vo_update_text_sub(mp obj->bbox.x1=xmin; obj->bbox.x2=xmax; obj->bbox.y1=obj->y; -// obj->bbox.y2=obj->y+obj->params.subtitle.lines*vo_font->height; +// obj->bbox.y2=obj->y+obj->params.subtitle.lines*sub_font->height; obj->flags|=OSDFLAG_BBOX; alloc_buf(obj); @@ -735,18 +737,18 @@ inline static void vo_update_text_sub(mp } prevc = -1; while ((c=obj->params.subtitle.utbl[j++])){ - x += kerning(vo_font,prevc,c); - if ((font=vo_font->font[c])>=0) + x += kerning(sub_font,prevc,c); + if ((font=sub_font->font[c])>=0) draw_alpha_buf(obj,x,y, - vo_font->width[c], - vo_font->pic_a[font]->h+y<obj->dys ? vo_font->pic_a[font]->h : obj->dys-y, - vo_font->pic_b[font]->bmp+vo_font->start[c], - vo_font->pic_a[font]->bmp+vo_font->start[c], - vo_font->pic_a[font]->w); - x+=vo_font->width[c]+vo_font->charspace; + sub_font->width[c], + sub_font->pic_a[font]->h+y<obj->dys ? sub_font->pic_a[font]->h : obj->dys-y, + sub_font->pic_b[font]->bmp+sub_font->start[c], + sub_font->pic_a[font]->bmp+sub_font->start[c], + sub_font->pic_a[font]->w); + x+=sub_font->width[c]+sub_font->charspace; prevc = c; } - y+=vo_font->height; + y+=sub_font->height; } } @@ -829,12 +831,18 @@ int vo_update_osd(int dxs,int dys){ if (defer_counter >= FONT_LOAD_DEFER) force_load_font = 1; } - if (!vo_font || force_load_font) { + if (force_load_font) { force_load_font = 0; - load_font_ft(dxs, dys); + load_font_ft(dxs, dys, &vo_font, font_name); + load_font_ft(dxs, dys, &sub_font, sub_font_name); prev_dxs = dxs; prev_dys = dys; defer_counter = 0; + } else { + if (!vo_font) + load_font_ft(dxs, dys, &vo_font, font_name); + if (!sub_font) + load_font_ft(dxs, dys, &sub_font, sub_font_name); } #endif Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c (original) +++ trunk/mencoder.c Sun May 20 18:10:45 2007 @@ -186,6 +186,7 @@ static int play_n_frames_mf=-1; // sub: char *font_name=NULL; +char *sub_font_name=NULL; #ifdef HAVE_FONTCONFIG extern int font_fontconfig; #endif Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Sun May 20 18:10:45 2007 @@ -322,6 +322,7 @@ extern int vo_flags; // sub: char *font_name=NULL; +char *sub_font_name=NULL; #ifdef HAVE_FONTCONFIG extern int font_fontconfig; #endif @@ -2533,6 +2534,10 @@ if(!codecs_file || !parse_codec_cfg(code if(!vo_font) vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); } + if (sub_font_name) + sub_font = read_font_desc(sub_font_name, font_factor, verbose>1); + else + sub_font = vo_font; #endif #ifdef HAVE_FONTCONFIG } Modified: trunk/mplayer.h ============================================================================== --- trunk/mplayer.h (original) +++ trunk/mplayer.h Sun May 20 18:10:45 2007 @@ -19,6 +19,7 @@ extern int osd_level; extern unsigned int osd_visible; extern char * font_name; +extern char * sub_font_name; extern float font_factor; extern float movie_aspect; extern float force_fps;

6 7

r23409 - in trunk: cfg-mplayer.h libmenu/menu_filesel.c
by ben 05 Jul '07

05 Jul '07

Author: ben Date: Tue May 29 20:49:38 2007 New Revision: 23409 Log: new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-)) Modified: trunk/cfg-mplayer.h trunk/libmenu/menu_filesel.c Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h (original) +++ trunk/cfg-mplayer.h Tue May 29 20:49:38 2007 @@ -71,6 +71,7 @@ extern int WinID; #ifdef HAVE_MENU extern int menu_startup; extern int menu_keepdir; +extern char *menu_chroot; #ifdef USE_FRIBIDI extern char *menu_fribidi_charset; extern int menu_flip_hebrew; @@ -298,6 +299,7 @@ m_option_t mplayer_opts[]={ {"menu-cfg", &menu_cfg, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, {"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL}, #ifdef USE_FRIBIDI {"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, Modified: trunk/libmenu/menu_filesel.c ============================================================================== --- trunk/libmenu/menu_filesel.c (original) +++ trunk/libmenu/menu_filesel.c Tue May 29 20:49:38 2007 @@ -30,6 +30,7 @@ #define MENU_KEEP_PATH "/tmp/mp_current_path" int menu_keepdir = 0; +char *menu_chroot = NULL; struct list_entry_s { struct list_entry p; @@ -222,6 +223,12 @@ static int open_dir(menu_t* menu,char* a while ((dp = readdir(dirp)) != NULL) { if(dp->d_name[0] == '.' && strcmp(dp->d_name,"..") != 0) continue; + if (menu_chroot && !strcmp (dp->d_name,"..")) { + int len = strlen (menu_chroot); + if ((strlen (mpriv->dir) == len || strlen (mpriv->dir) == len + 1) + && !strncmp (mpriv->dir, menu_chroot, len)) + continue; + } mylstat(args,dp->d_name,&st); if (file_filter && extensions && !S_ISDIR(st.st_mode)) { if((ext = strrchr(dp->d_name,'.')) == NULL)

3 3

r23440 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h stream/tv.c stream/tv.h stream/tvi_def.h stream/tvi_v4l.c stream/tvi_v4l2.c
by voroshil 31 May '07

31 May '07

Author: voroshil Date: Thu May 31 19:49:51 2007 New Revision: 23440 Log: New "automute" tv:// option. Will switch off sound and show blue screen instead of video with noise when signal level (in 0-255 scale) is less than specified value. Modified: trunk/cfg-common.h trunk/stream/tv.c trunk/stream/tv.h trunk/stream/tvi_def.h trunk/stream/tvi_v4l.c trunk/stream/tvi_v4l2.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h (original) +++ trunk/cfg-common.h Thu May 31 19:49:51 2007 @@ -429,6 +429,7 @@ m_option_t tvopts_conf[]={ {"channel", &tv_param_channel, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"chanlist", &tv_param_chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"norm", &tv_param_norm, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"automute", &tv_param_automute, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, #ifdef HAVE_TV_V4L2 {"normid", &tv_param_normid, CONF_TYPE_INT, 0, 0, 0, NULL}, #endif Modified: trunk/stream/tv.c ============================================================================== --- trunk/stream/tv.c (original) +++ trunk/stream/tv.c Thu May 31 19:49:51 2007 @@ -55,6 +55,7 @@ int tv_param_outfmt = -1; float tv_param_fps = -1.0; char **tv_param_channels = NULL; int tv_param_audio_id = 0; +int tv_param_automute = 0; #if defined(HAVE_TV_V4L) int tv_param_amode = -1; int tv_param_volume = -1; Modified: trunk/stream/tv.h ============================================================================== --- trunk/stream/tv.h (original) +++ trunk/stream/tv.h Thu May 31 19:49:51 2007 @@ -12,6 +12,7 @@ extern char *tv_param_freq; extern char *tv_param_channel; extern char *tv_param_chanlist; extern char *tv_param_norm; +extern int tv_param_automute; #ifdef HAVE_TV_V4L2 extern int tv_param_normid; #endif Modified: trunk/stream/tvi_def.h ============================================================================== --- trunk/stream/tvi_def.h (original) +++ trunk/stream/tvi_def.h Thu May 31 19:49:51 2007 @@ -52,3 +52,41 @@ static void free_handle(tvi_handle_t *h) free(h); } } + +/** + Fills video frame in given buffer with blue color for yv12,i420,uyvy,yuy2. + Other formats will be filled with 0xC0 +*/ +static inline void fill_blank_frame(char* buffer,int len,int fmt){ + int i; + + switch(fmt){ + case IMGFMT_YV12: + memset(buffer, 0xFF,5*len/6); + memset(buffer+5*len/6, 0xFF,len/6); + break; + case IMGFMT_I420: + memset(buffer, 0xFF,4*len/6); + memset(buffer+4*len/6, 0xFF,len/6); + memset(buffer+5*len/6, 0xFF,len/6); + break; + case IMGFMT_UYVY: + for(i=0;i<len;i+=4){ + buffer[i]=0xFF; + buffer[i+1]=0; + buffer[i+2]=0; + buffer[i+3]=0; + } + break; + case IMGFMT_YUY2: + for(i=0;i<len;i+=4){ + buffer[i]=0; + buffer[i+1]=0xFF; + buffer[i+2]=0; + buffer[i+3]=0; + } + break; + default: + memset(buffer,0xC0,len); + } +} Modified: trunk/stream/tvi_v4l.c ============================================================================== --- trunk/stream/tvi_v4l.c (original) +++ trunk/stream/tvi_v4l.c Thu May 31 19:49:51 2007 @@ -1381,6 +1381,21 @@ static int control(priv_t *priv, int cmd return(TVI_CONTROL_UNKNOWN); } +static int set_mute(priv_t* priv,int value) +{ + if (!priv->capability.audios) { + return 0; + + if(value) + priv->audio[priv->audio_id].flags |=VIDEO_AUDIO_MUTE; + else + priv->audio[priv->audio_id].flags &= ~VIDEO_AUDIO_MUTE; + } + if(ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id])<0) + return 0; + return 1; +} + // copies a video frame // for RGB (i.e. BGR in mplayer) flips the image upside down // for YV12 swaps the 2nd and 3rd plane @@ -1389,6 +1404,16 @@ static inline void copy_frame(priv_t *pr int i; unsigned char *sptr; + if(tv_param_automute>0){ + if (ioctl(priv->video_fd, VIDIOCGTUNER, &priv->tuner) >= 0) { + if(tv_param_automute<<8>priv->tuner.signal){ + fill_blank_frame(dest,priv->bytesperline * priv->height,priv->format); + set_mute(priv,1); + return; + } + } + set_mute(priv,0); + } // YV12 uses VIDEO_PALETTE_YUV420P, but the planes are swapped if (priv->format == IMGFMT_YV12) { memcpy(dest, source, priv->width * priv->height); Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c (original) +++ trunk/stream/tvi_v4l2.c Thu May 31 19:49:51 2007 @@ -1321,6 +1321,16 @@ static inline void copy_frame(priv_t *pr int d = pixfmt2depth(priv->format.fmt.pix.pixelformat); int bytesperline = w*d/8; + if(tv_param_automute>0){ + if (ioctl(priv->video_fd, VIDIOC_G_TUNER, &priv->tuner) >= 0) { + if(tv_param_automute<<8>priv->tuner.signal){ + fill_blank_frame(dest,bytesperline * h,fcc_vl2mp(priv->format.fmt.pix.pixelformat)); + set_mute(priv,1); + return; + } + } + set_mute(priv,0); + } memcpy(dest, source, bytesperline * h); }

1 0

r23437 - trunk/configure
by zuxy 31 May '07

31 May '07

Author: zuxy Date: Thu May 31 15:22:36 2007 New Revision: 23437 Log: Remove no more used TARGET_BUILTIN_VECTOR and TARGET_BUILTIN_3DNOW Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu May 31 15:22:36 2007 @@ -7645,8 +7645,6 @@ TARGET_ARMV5TE = $_armv5te TARGET_ARMV6 = $_armv6 TARGET_IWMMXT = $_iwmmxt TARGET_VIS = $_vis -TARGET_BUILTIN_VECTOR = $_builtin_vector -TARGET_BUILTIN_3DNOW = $_mm3dnow # --- GUI stuff --- GUI = $_gui

1 0

r23436 - in trunk: DOCS/tech/slave.txt command.c
by albeu 31 May '07

31 May '07

Author: albeu Date: Thu May 31 15:07:52 2007 New Revision: 23436 Log: Add new properties percent_pos and time_pos. Modified: trunk/DOCS/tech/slave.txt trunk/command.c Modified: trunk/DOCS/tech/slave.txt ============================================================================== --- trunk/DOCS/tech/slave.txt (original) +++ trunk/DOCS/tech/slave.txt Thu May 31 15:07:52 2007 @@ -401,6 +401,8 @@ stream_start pos 0 stream_end pos 0 X end pos in stream stream_length pos 0 X (end - start) length time X length of file in seconds +percent_pos int 0 100 X X X position in percent +time_pos time 0 X X X position in seconds metadata str list X list of metadata key/value metadata/* string X metadata values volume float 0 100 X X X change volume Modified: trunk/command.c ============================================================================== --- trunk/command.c (original) +++ trunk/command.c Thu May 31 15:07:52 2007 @@ -286,6 +286,63 @@ static int mp_property_length(m_option_t return m_property_time_ro(prop, action, arg, len); } +/// Current position in percent (RW) +static int mp_property_percent_pos(m_option_t * prop, int action, + void *arg, MPContext * mpctx) { + int pos; + + if (!mpctx->demuxer) + return M_PROPERTY_UNAVAILABLE; + + switch(action) { + case M_PROPERTY_SET: + if(!arg) return M_PROPERTY_ERROR; + M_PROPERTY_CLAMP(prop, *(int*)arg); + pos = *(int*)arg; + break; + case M_PROPERTY_STEP_UP: + case M_PROPERTY_STEP_DOWN: + pos = demuxer_get_percent_pos(mpctx->demuxer); + pos += (arg ? *(int*)arg : 10) * + (action == M_PROPERTY_STEP_UP ? 1 : -1); + M_PROPERTY_CLAMP(prop, pos); + break; + default: + return m_property_int_ro(prop, action, arg, + demuxer_get_percent_pos(mpctx->demuxer)); + } + + abs_seek_pos = 3; + rel_seek_secs = pos / 100.0; + return M_PROPERTY_OK; +} + +/// Current position in seconds (RW) +static int mp_property_time_pos(m_option_t * prop, int action, + void *arg, MPContext * mpctx) { + if (!(mpctx->sh_video || (mpctx->sh_audio && mpctx->audio_out))) + return M_PROPERTY_UNAVAILABLE; + + switch(action) { + case M_PROPERTY_SET: + if(!arg) return M_PROPERTY_ERROR; + M_PROPERTY_CLAMP(prop, *(double*)arg); + abs_seek_pos = 1; + rel_seek_secs = *(double*)arg; + return M_PROPERTY_OK; + case M_PROPERTY_STEP_UP: + case M_PROPERTY_STEP_DOWN: + rel_seek_secs += (arg ? *(double*)arg : 10.0) * + (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0); + return M_PROPERTY_OK; + } + return m_property_time_ro(prop, action, arg, + mpctx->sh_video ? mpctx->sh_video->pts : + playing_audio_pts(mpctx->sh_audio, + mpctx->d_audio, + mpctx->audio_out)); +} + /// Demuxer meta data static int mp_property_metadata(m_option_t * prop, int action, void *arg, MPContext * mpctx) { @@ -1385,6 +1442,10 @@ static m_option_t mp_properties[] = { M_OPT_MIN, 0, 0, NULL }, { "length", mp_property_length, CONF_TYPE_TIME, M_OPT_MIN, 0, 0, NULL }, + { "percent_pos", mp_property_percent_pos, CONF_TYPE_INT, + M_OPT_RANGE, 0, 100, NULL }, + { "time_pos", mp_property_time_pos, CONF_TYPE_TIME, + M_OPT_MIN, 0, 0, NULL }, { "metadata", mp_property_metadata, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },

1 0

r23435 - in trunk: DOCS/tech/slave.txt command.c
by albeu 31 May '07

31 May '07

Author: albeu Date: Thu May 31 15:02:51 2007 New Revision: 23435 Log: Make the length property use the time type. Modified: trunk/DOCS/tech/slave.txt trunk/command.c Modified: trunk/DOCS/tech/slave.txt ============================================================================== --- trunk/DOCS/tech/slave.txt (original) +++ trunk/DOCS/tech/slave.txt Thu May 31 15:02:51 2007 @@ -400,7 +400,7 @@ stream_pos pos 0 stream_start pos 0 X start pos in stream stream_end pos 0 X end pos in stream stream_length pos 0 X (end - start) -length double X length of file in seconds +length time X length of file in seconds metadata str list X list of metadata key/value metadata/* string X metadata values volume float 0 100 X X X change volume Modified: trunk/command.c ============================================================================== --- trunk/command.c (original) +++ trunk/command.c Thu May 31 15:02:51 2007 @@ -1383,8 +1383,8 @@ static m_option_t mp_properties[] = { M_OPT_MIN, 0, 0, NULL }, { "stream_length", mp_property_stream_length, CONF_TYPE_POSITION, M_OPT_MIN, 0, 0, NULL }, - { "length", mp_property_length, CONF_TYPE_DOUBLE, - 0, 0, 0, NULL }, + { "length", mp_property_length, CONF_TYPE_TIME, + M_OPT_MIN, 0, 0, NULL }, { "metadata", mp_property_metadata, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },

1 0

r23434 - in trunk: command.c m_property.c m_property.h
by albeu 31 May '07

31 May '07

Author: albeu Date: Thu May 31 14:42:02 2007 New Revision: 23434 Log: Move the time printing code out of the length property. Modified: trunk/command.c trunk/m_property.c trunk/m_property.h Modified: trunk/command.c ============================================================================== --- trunk/command.c (original) +++ trunk/command.c Thu May 31 14:42:02 2007 @@ -283,28 +283,7 @@ static int mp_property_length(m_option_t !(int) (len = demuxer_get_time_length(mpctx->demuxer))) return M_PROPERTY_UNAVAILABLE; - switch (action) { - case M_PROPERTY_PRINT: - if (!arg) - return M_PROPERTY_ERROR; - else { - int h, m, s = len; - h = s / 3600; - s -= h * 3600; - m = s / 60; - s -= m * 60; - *(char **) arg = malloc(20); - if (h > 0) - sprintf(*(char **) arg, "%d:%02d:%02d", h, m, s); - else if (m > 0) - sprintf(*(char **) arg, "%d:%02d", m, s); - else - sprintf(*(char **) arg, "%d", s); - return M_PROPERTY_OK; - } - break; - } - return m_property_double_ro(prop, action, arg, len); + return m_property_time_ro(prop, action, arg, len); } /// Demuxer meta data Modified: trunk/m_property.c ============================================================================== --- trunk/m_property.c (original) +++ trunk/m_property.c Thu May 31 14:42:02 2007 @@ -318,6 +318,31 @@ int m_property_double_ro(m_option_t* pro return M_PROPERTY_NOT_IMPLEMENTED; } +int m_property_time_ro(m_option_t* prop,int action, + void* arg,double var) { + switch(action) { + case M_PROPERTY_PRINT: + if (!arg) + return M_PROPERTY_ERROR; + else { + int h, m, s = var; + h = s / 3600; + s -= h * 3600; + m = s / 60; + s -= m * 60; + *(char **) arg = malloc(20); + if (h > 0) + sprintf(*(char **) arg, "%d:%02d:%02d", h, m, s); + else if (m > 0) + sprintf(*(char **) arg, "%d:%02d", m, s); + else + sprintf(*(char **) arg, "%d", s); + return M_PROPERTY_OK; + } + } + return m_property_double_ro(prop,action,arg,var); +} + int m_property_string_ro(m_option_t* prop,int action,void* arg,char* str) { switch(action) { case M_PROPERTY_GET: Modified: trunk/m_property.h ============================================================================== --- trunk/m_property.h (original) +++ trunk/m_property.h Thu May 31 14:42:02 2007 @@ -185,6 +185,10 @@ int m_property_delay(m_option_t* prop,in int m_property_double_ro(m_option_t* prop,int action, void* arg,double var); +/// Implement print +int m_property_time_ro(m_option_t* prop,int action, + void* arg,double var); + /// get/print the string int m_property_string_ro(m_option_t* prop,int action,void* arg, char* str);

1 0