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

r29401 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 17:41:34 2009 New Revision: 29401 Log: Close /dev/tty again on uninit. Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 17:39:35 2009 (r29400) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 17:41:34 2009 (r29401) @@ -1057,6 +1057,8 @@ static void uninit(void) mp_msg(MSGT_VO, MSGL_WARN, "Can't restore text mode: %s\n", strerror(errno)); } vt_set_textarea(0, fb_orig_vinfo.yres); + if (vt_fp) + fclose(vt_fp); close(fb_tty_fd); close(fb_dev_fd); if (frame_buffer)

1 0

r29400 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 17:39:35 2009 New Revision: 29400 Log: Fix indentation broken in last patch Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 17:38:40 2009 (r29399) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 17:39:35 2009 (r29400) @@ -972,7 +972,7 @@ static int config(uint32_t width, uint32 mp_msg(MSGT_VO, MSGL_ERR, "can't fopen /dev/tty: %s\n", strerror(errno)); } - vt_set_textarea(last_row, fb_yres); + vt_set_textarea(last_row, fb_yres); return 0; } @@ -1056,7 +1056,7 @@ static void uninit(void) if (ioctl(fb_tty_fd, KDSETMODE, KD_TEXT) < 0) mp_msg(MSGT_VO, MSGL_WARN, "Can't restore text mode: %s\n", strerror(errno)); } - vt_set_textarea(0, fb_orig_vinfo.yres); + vt_set_textarea(0, fb_orig_vinfo.yres); close(fb_tty_fd); close(fb_dev_fd); if (frame_buffer)

1 0

r29399 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 17:38:40 2009 New Revision: 29399 Log: Get rid of completely pointless vt_doit variable Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 17:28:30 2009 (r29398) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 17:38:40 2009 (r29399) @@ -556,7 +556,6 @@ static fb_mode_t *fb_mode = NULL; /* vt related variables */ static FILE *vt_fp = NULL; -static int vt_doit = 1; /* vo_fbdev related variables */ static int fb_dev_fd; @@ -969,12 +968,10 @@ static int config(uint32_t width, uint32 if (fs || vm) memset(frame_buffer, '\0', fb_line_len * fb_yres); } - if (vt_doit && !(vt_fp = fopen("/dev/tty", "w"))) { + if (!(vt_fp = fopen("/dev/tty", "w"))) { mp_msg(MSGT_VO, MSGL_ERR, "can't fopen /dev/tty: %s\n", strerror(errno)); - vt_doit = 0; } - if (vt_doit) vt_set_textarea(last_row, fb_yres); return 0; @@ -1059,7 +1056,6 @@ static void uninit(void) if (ioctl(fb_tty_fd, KDSETMODE, KD_TEXT) < 0) mp_msg(MSGT_VO, MSGL_WARN, "Can't restore text mode: %s\n", strerror(errno)); } - if (vt_doit) vt_set_textarea(0, fb_orig_vinfo.yres); close(fb_tty_fd); close(fb_dev_fd);

1 0

r29398 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 17:28:30 2009 New Revision: 29398 Log: 10l, use fopen directly instead of open + fdopen Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 17:22:15 2009 (r29397) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 17:28:30 2009 (r29398) @@ -749,7 +749,6 @@ static int config(uint32_t width, uint32 struct fb_cmap *cmap; int vm = flags & VOFLAG_MODESWITCHING; int zoom = flags & VOFLAG_SWSCALE; - int vt_fd; fs = flags & VOFLAG_FULLSCREEN; @@ -970,12 +969,8 @@ static int config(uint32_t width, uint32 if (fs || vm) memset(frame_buffer, '\0', fb_line_len * fb_yres); } - if (vt_doit && (vt_fd = open("/dev/tty", O_WRONLY)) == -1) { - mp_msg(MSGT_VO, MSGL_ERR, "can't open /dev/tty: %s\n", strerror(errno)); - vt_doit = 0; - } - if (vt_doit && !(vt_fp = fdopen(vt_fd, "w"))) { - mp_msg(MSGT_VO, MSGL_ERR, "can't fdopen /dev/tty: %s\n", strerror(errno)); + if (vt_doit && !(vt_fp = fopen("/dev/tty", "w"))) { + mp_msg(MSGT_VO, MSGL_ERR, "can't fopen /dev/tty: %s\n", strerror(errno)); vt_doit = 0; }

1 0

r29397 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 17:22:15 2009 New Revision: 29397 Log: Use a single err_out in fb_preinit, also fixes a leak when vo_dbpp has an unexpected value. Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 17:14:48 2009 (r29396) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 17:22:15 2009 (r29397) @@ -673,6 +673,8 @@ static int fb_preinit(int reset) if (fb_preinit_done) return fb_works; + fb_dev_fd = fb_tty_fd = -1; + if (!fb_dev_name && !(fb_dev_name = getenv("FRAMEBUFFER"))) fb_dev_name = strdup("/dev/fb0"); mp_msg(MSGT_VO, MSGL_V, "using %s\n", fb_dev_name); @@ -683,7 +685,7 @@ static int fb_preinit(int reset) } if (ioctl(fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo)) { mp_msg(MSGT_VO, MSGL_ERR, "Can't get VSCREENINFO: %s\n", strerror(errno)); - goto err_out_fd; + goto err_out; } fb_orig_vinfo = fb_vinfo; @@ -696,13 +698,13 @@ static int fb_preinit(int reset) if (fb_bpp == 8 && !vo_dbpp) { mp_msg(MSGT_VO, MSGL_ERR, "8 bpp output is not supported.\n"); - goto err_out_tty_fd; + goto err_out; } if (vo_dbpp) { if (vo_dbpp != 15 && vo_dbpp != 16 && vo_dbpp != 24 && vo_dbpp != 32) { mp_msg(MSGT_VO, MSGL_ERR, "can't switch to %d bpp\n", vo_dbpp); - goto err_out_fd; + goto err_out; } fb_bpp = vo_dbpp; } @@ -713,13 +715,13 @@ static int fb_preinit(int reset) fb_preinit_done = 1; fb_works = 1; return 1; -err_out_tty_fd: +err_out: + if (fb_tty_fd != -1) close(fb_tty_fd); fb_tty_fd = -1; -err_out_fd: + if (fb_dev_fd != -1) close(fb_dev_fd); fb_dev_fd = -1; -err_out: fb_preinit_done = 1; fb_works = 0; return 0;

1 0

r29396 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 17:14:48 2009 New Revision: 29396 Log: Use FFALIGN and FFMAX3 Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 16:43:03 2009 (r29395) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 17:14:48 2009 (r29396) @@ -46,6 +46,7 @@ #endif #include "aspect.h" #include "mp_msg.h" +#include "libavutil/common.h" static const vo_info_t info = { "Framebuffer Device", @@ -491,7 +492,7 @@ static fb_mode_t *find_best_mode(int xre static void set_bpp(struct fb_var_screeninfo *p, int bpp) { - p->bits_per_pixel = (bpp + 1) & ~1; + p->bits_per_pixel = FFALIGN(bpp, 2); p->red.msb_right = p->green.msb_right = p->blue.msb_right = p->transp.msb_right = 0; p->transp.offset = p->transp.length = 0; p->blue.offset = 0; @@ -610,8 +611,7 @@ static struct fb_cmap *make_directcolor_ bcols = 1 << var->blue.length; /* Make our palette the length of the deepest color */ - cols = rcols > gcols ? rcols : gcols; - cols = cols > bcols ? cols : bcols; + cols = FFMAX3(rcols, gcols, bcols); red = malloc(cols * sizeof(red[0])); if (!red) {

1 0

r29395 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 16:43:03 2009 New Revision: 29395 Log: Remove useless casts Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 16:40:31 2009 (r29394) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 16:43:03 2009 (r29395) @@ -185,7 +185,7 @@ static int parse_fbmode_cfg(char *cfgfil return -1; } - if ((line = (char *) malloc(MAX_LINE_LEN + 1)) == NULL) { + if ((line = malloc(MAX_LINE_LEN + 1)) == NULL) { mp_msg(MSGT_VO, MSGL_V, "can't get memory for 'line': %s\n", strerror(errno)); return -2; } @@ -212,7 +212,7 @@ static int parse_fbmode_cfg(char *cfgfil if (!validate_mode(mode)) goto err_out_not_valid; loop_enter: - if (!(fb_modes = (fb_mode_t *) + if (!(fb_modes = realloc(fb_modes, sizeof(fb_mode_t) * (nr_modes + 1)))) { mp_msg(MSGT_VO, MSGL_V, "can't realloc 'fb_modes' (nr_modes = %d):" " %s\n", nr_modes, strerror(errno)); @@ -949,8 +949,8 @@ static int config(uint32_t width, uint32 int x_offset = 0, y_offset = 0; geometry(&x_offset, &y_offset, &out_width, &out_height, fb_xres, fb_yres); - frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE, - MAP_SHARED, fb_dev_fd, 0); + frame_buffer = mmap(0, fb_size, PROT_READ | PROT_WRITE, + MAP_SHARED, fb_dev_fd, 0); if (frame_buffer == (uint8_t *) -1) { mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno)); return 1;

1 0

r29394 - trunk/libvo/vo_fbdev.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 16:40:31 2009 New Revision: 29394 Log: fbdev: remove pointless () Modified: trunk/libvo/vo_fbdev.c Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri Jun 26 15:54:22 2009 (r29393) +++ trunk/libvo/vo_fbdev.c Fri Jun 26 16:40:31 2009 (r29394) @@ -610,8 +610,8 @@ static struct fb_cmap *make_directcolor_ bcols = 1 << var->blue.length; /* Make our palette the length of the deepest color */ - cols = (rcols > gcols ? rcols : gcols); - cols = (cols > bcols ? cols : bcols); + cols = rcols > gcols ? rcols : gcols; + cols = cols > bcols ? cols : bcols; red = malloc(cols * sizeof(red[0])); if (!red) { @@ -763,7 +763,7 @@ static int config(uint32_t width, uint32 mp_msg(MSGT_VO, MSGL_ERR, "-fbmode can only be used with -vm\n"); return 1; } - if (vm && (parse_fbmode_cfg(fb_mode_cfgfile) < 0)) + if (vm && parse_fbmode_cfg(fb_mode_cfgfile) < 0) return 1; if (d_width && (fs || vm)) { out_width = d_width; @@ -1095,19 +1095,19 @@ static int preinit(const char *vo_subdev } } if (!pre_init_err) - return pre_init_err = (fb_preinit(0) ? 0 : -1); + return pre_init_err = fb_preinit(0) ? 0 : -1; return -1; } static uint32_t get_image(mp_image_t *mpi) { if (!IMGFMT_IS_BGR(mpi->imgfmt) || - (IMGFMT_BGR_DEPTH(mpi->imgfmt) != fb_bpp) || - ((mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) || + IMGFMT_BGR_DEPTH(mpi->imgfmt) != fb_bpp || + (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP) || (mpi->flags & MP_IMGFLAG_PLANAR) || (mpi->flags & MP_IMGFLAG_YUV) || - (mpi->width != in_width) || - (mpi->height != in_height) + mpi->width != in_width || + mpi->height != in_height ) return VO_FALSE; @@ -1123,7 +1123,7 @@ static int control(uint32_t request, voi case VOCTRL_GET_IMAGE: return get_image(data); case VOCTRL_QUERY_FORMAT: - return query_format(*((uint32_t*)data)); + return query_format(*(uint32_t*)data); } #ifdef CONFIG_VIDIX

1 0

r29393 - trunk/stream/tcp.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 15:54:22 2009 New Revision: 29393 Log: Replace incorrect use of strncpy by av_strlcpy. Only a real issue if inet_ntoa can actually return a string of more than 255 bytes. Modified: trunk/stream/tcp.c Modified: trunk/stream/tcp.c ============================================================================== --- trunk/stream/tcp.c Fri Jun 26 15:41:01 2009 (r29392) +++ trunk/stream/tcp.c Fri Jun 26 15:54:22 2009 (r29393) @@ -33,6 +33,7 @@ #include "network.h" #include "stream.h" #include "tcp.h" +#include "libavutil/avstring.h" /* IPv6 options */ int network_prefer_ipv4 = 0; @@ -163,7 +164,7 @@ connect2Server_with_af(char *host, int p } #if HAVE_INET_ATON || defined(HAVE_WINSOCK2_H) - strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255); + av_strlcpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255); #else inet_ntop(af, our_s_addr, buf, 255); #endif

1 0

r29392 - trunk/libvo/geometry.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 15:41:01 2009 New Revision: 29392 Log: Use the RESET_GEOMETRY macro in one more place instead of duplicating its code. Modified: trunk/libvo/geometry.c Modified: trunk/libvo/geometry.c ============================================================================== --- trunk/libvo/geometry.c Fri Jun 26 15:34:40 2009 (r29391) +++ trunk/libvo/geometry.c Fri Jun 26 15:41:01 2009 (r29392) @@ -39,7 +39,7 @@ int geometry(int *xpos, int *ypos, int * { int width, height, xoff, yoff, xper, yper; - width = height = xoff = yoff = xper = yper = INT_MIN; + RESET_GEOMETRY if(vo_geometry != NULL) { if(sscanf(vo_geometry, "%ix%i+%i+%i", &width, &height, &xoff, &yoff) != 4 )

1 0