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

r36252 - trunk/libvo/vo_gl.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 09:18:47 2013 New Revision: 36252 Log: Remove pointless function arguments. The have the same value as vo_dwidth/vo_dheight and whether those are used or the arguments is completely random, making the code hard to follow. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Wed May 8 14:39:56 2013 (r36251) +++ trunk/libvo/vo_gl.c Thu May 9 09:18:47 2013 (r36252) @@ -177,7 +177,7 @@ static void redraw(void); static float video_matrix[16]; -static void resize(int x,int y){ +static void resize(void) { // simple orthogonal projection for 0-image_width;0-image_height memset(video_matrix, 0, sizeof(video_matrix)); video_matrix[0] = 2.0/image_width; @@ -185,14 +185,14 @@ static void resize(int x,int y){ video_matrix[12] = -1; video_matrix[13] = 1; video_matrix[15] = 1; - mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y); + mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n", vo_dwidth, vo_dheight); if (WinID >= 0) { - int left = 0, top = 0, w = x, h = y; + int left = 0, top = 0, w = vo_dwidth, h = vo_dheight; geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight); - top = y - h - top; + top = vo_dheight - h - top; mpglViewport(left, top, w, h); } else - mpglViewport( 0, 0, x, y ); + mpglViewport(0, 0, vo_dwidth, vo_dheight); ass_border_x = ass_border_y = 0; if (aspect_scaling() && use_aspect) { @@ -202,8 +202,8 @@ static void resize(int x,int y){ panscan_calc_windowed(); new_w += vo_panscan_x; new_h += vo_panscan_y; - scale_x = (double)new_w / (double)x; - scale_y = (double)new_h / (double)y; + scale_x = (double)new_w / (double)vo_dwidth; + scale_y = (double)new_h / (double)vo_dheight; video_matrix[0] *= scale_x; video_matrix[12] *= scale_x; video_matrix[5] *= scale_y; @@ -547,7 +547,7 @@ static GLint get_scale_type(int chroma) * \brief Initialize a (new or reused) OpenGL context. * set global gl-related variables to their default values */ -static int initGl(uint32_t d_width, uint32_t d_height) { +static int initGl(void) { GLint scale_type = get_scale_type(0); autodetectGlExtensions(); using_tex_rect = gl_format == GL_YCBCR_422_APPLE || use_rectangle == 1; @@ -623,7 +623,7 @@ static int initGl(uint32_t d_width, uint update_yuvconv(); } - resize(d_width, d_height); + resize(); mpglClearColor( 0.0f,0.0f,0.0f,0.0f ); mpglClear( GL_COLOR_BUFFER_BIT ); @@ -702,7 +702,7 @@ static int create_window(uint32_t d_widt static void osx_redraw(void) { // resize will call redraw to refresh the screen - resize(vo_dwidth, vo_dheight); + resize(); } #endif @@ -744,7 +744,7 @@ config(uint32_t width, uint32_t height, mp_msg(MSGT_VO, MSGL_ERR, "Can not enable mesa-buffer because AllocateMemoryMESA was not found\n"); mesa_buffer = 0; } - initGl(vo_dwidth, vo_dheight); + initGl(); #ifdef CONFIG_GL_OSX vo_osx_redraw_func = osx_redraw; @@ -757,9 +757,9 @@ static void check_events(void) int e=glctx.check_events(); if(e&VO_EVENT_REINIT) { uninitGl(); - initGl(vo_dwidth, vo_dheight); + initGl(); } - if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight); + if(e&VO_EVENT_RESIZE) resize(); else if(e&VO_EVENT_EXPOSE) redraw(); } @@ -1480,18 +1480,18 @@ static int control(uint32_t request, voi return VO_TRUE; case VOCTRL_FULLSCREEN: glctx.fullscreen(); - resize(vo_dwidth, vo_dheight); + resize(); return VO_TRUE; case VOCTRL_BORDER: glctx.border(); - resize(vo_dwidth, vo_dheight); + resize(); return VO_TRUE; case VOCTRL_GET_PANSCAN: if (!use_aspect) return VO_NOTIMPL; return VO_TRUE; case VOCTRL_SET_PANSCAN: if (!use_aspect) return VO_NOTIMPL; - resize(vo_dwidth, vo_dheight); + resize(); return VO_TRUE; case VOCTRL_GET_EQUALIZER: if (is_yuv) {

1 0

r36251 - trunk/gui/util/list.c
by ib 08 May '13

08 May '13

Author: ib Date: Wed May 8 14:39:56 2013 New Revision: 36251 Log: Fix resource leak. Modified: trunk/gui/util/list.c Modified: trunk/gui/util/list.c ============================================================================== --- trunk/gui/util/list.c Wed May 8 14:37:28 2013 (r36250) +++ trunk/gui/util/list.c Wed May 8 14:39:56 2013 (r36251) @@ -367,8 +367,10 @@ int add_to_gui_playlist(const char *what item = calloc(1, sizeof(plItem)); - if (!item) + if (!item) { + free(path); return False; + } mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[list] adding %s/%s\n", path, file);

1 0

r36250 - trunk/gui/util/list.c
by ib 08 May '13

08 May '13

Author: ib Date: Wed May 8 14:37:28 2013 New Revision: 36250 Log: Check return value to avoid segmentation fault. Modified: trunk/gui/util/list.c Modified: trunk/gui/util/list.c ============================================================================== --- trunk/gui/util/list.c Tue May 7 22:39:18 2013 (r36249) +++ trunk/gui/util/list.c Wed May 8 14:37:28 2013 (r36250) @@ -357,6 +357,9 @@ int add_to_gui_playlist(const char *what file = mp_basename(what); path = strdup(what); + if (!path) + return False; + if (file > what) path[file - what - 1] = 0; else

1 0

r36249 - trunk/input/input.c
by reimar 07 May '13

07 May '13

Author: reimar Date: Tue May 7 22:39:18 2013 New Revision: 36249 Log: Avoid dead code and a memleak. Modified: trunk/input/input.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Tue May 7 22:39:17 2013 (r36248) +++ trunk/input/input.c Tue May 7 22:39:18 2013 (r36249) @@ -1587,6 +1587,7 @@ static void strmove(char *dst, const cha static int mp_input_parse_config(char *file) { + int res = 0; int fd; int eof = 0,comments = 0; char *iter,*end; @@ -1614,16 +1615,15 @@ mp_input_parse_config(char *file) { if(errno == EINTR) continue; mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingInputConfig,file,strerror(errno)); - close(fd); - return 0; + break; } eof = r == 0; } // Empty buffer : return if(!buffer[0]) { mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds); - close(fd); - return 1; + res = 1; + break; } iter = buffer; @@ -1660,7 +1660,7 @@ mp_input_parse_config(char *file) { if(!end[0]) { // Key name doesn't fit in the buffer if(buffer == iter) { mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter); - return 0; + break; } strmove(buffer,iter); continue; @@ -1668,8 +1668,7 @@ mp_input_parse_config(char *file) { end[0] = 0; if(! mp_input_get_input_from_name(iter,keys)) { mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,iter); - close(fd); - return 0; + break; } strmove(buffer,end+1); continue; @@ -1691,8 +1690,7 @@ mp_input_parse_config(char *file) { if(!end[0]) { if(iter == buffer) { mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer); - close(fd); - return 0; + break; } strmove(buffer,iter); continue; @@ -1705,10 +1703,8 @@ mp_input_parse_config(char *file) { continue; } } - mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrWhyHere); close(fd); - mp_input_set_section(NULL); - return 0; + return res; } void

1 0

r36248 - trunk/input/input.c
by reimar 07 May '13

07 May '13

Author: reimar Date: Tue May 7 22:39:17 2013 New Revision: 36248 Log: Make 0 termination code more robust against future changes. Modified: trunk/input/input.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Tue May 7 22:39:16 2013 (r36247) +++ trunk/input/input.c Tue May 7 22:39:17 2013 (r36248) @@ -1608,6 +1608,8 @@ mp_input_parse_config(char *file) { int bs = strlen(buffer); if(! eof && bs < BS_MAX-1) { int r = read(fd,buffer+bs,BS_MAX-1-bs); + if (r > 0) bs += r; + buffer[bs] = 0; if(r < 0) { if(errno == EINTR) continue; @@ -1616,8 +1618,6 @@ mp_input_parse_config(char *file) { return 0; } eof = r == 0; - bs += r; - buffer[bs] = 0; } // Empty buffer : return if(!buffer[0]) {

1 0

r36247 - trunk/libmenu/menu_txt.c
by reimar 07 May '13

07 May '13

Author: reimar Date: Tue May 7 22:39:16 2013 New Revision: 36247 Log: Ensure 0-termination. Modified: trunk/libmenu/menu_txt.c Modified: trunk/libmenu/menu_txt.c ============================================================================== --- trunk/libmenu/menu_txt.c Tue May 7 22:39:15 2013 (r36246) +++ trunk/libmenu/menu_txt.c Tue May 7 22:39:16 2013 (r36247) @@ -153,6 +153,8 @@ static int open_txt(menu_t* menu, char* while(1) { r = fread(buf+pos,1,BUF_SIZE-pos-1,fd); + if (r > 0) pos += r; + buf[pos] = '\0'; if(r <= 0) { if(pos > 0) { mpriv->lines = realloc(mpriv->lines,(mpriv->num_lines + 1)*sizeof(char*)); @@ -162,8 +164,6 @@ static int open_txt(menu_t* menu, char* fclose(fd); break; } - pos += r; - buf[pos] = '\0'; while((l = strchr(buf,'\n')) != NULL) { s = l-buf;

1 0

r36246 - trunk/libmpcodecs/ve_lavc.c
by reimar 07 May '13

07 May '13

Author: reimar Date: Tue May 7 22:39:15 2013 New Revision: 36246 Log: Fix incorrect error printing code. The code worked during testing by pure dumb luck, the right pointer ended up just at the right place by chance. Modified: trunk/libmpcodecs/ve_lavc.c Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Tue May 7 22:39:14 2013 (r36245) +++ trunk/libmpcodecs/ve_lavc.c Tue May 7 22:39:15 2013 (r36246) @@ -667,8 +667,9 @@ static int config(struct vf_instance *vf return 0; } if (av_dict_count(opts)) { - AVDictionaryEntry *e = av_dict_get(opts, "", NULL, 0); - mp_msg(MSGT_MENCODER,MSGL_ERR,"Unknown option %s\n"); + AVDictionaryEntry *e = NULL; + while ((e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX))) + mp_msg(MSGT_MENCODER,MSGL_ERR,"Unknown option %s\n", e->key); return 0; } av_dict_free(&opts);

1 0

r36245 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 07 May '13

07 May '13

Author: reimar Date: Tue May 7 22:39:14 2013 New Revision: 36245 Log: Split init_vo and call only the necessary part from get_buffer. This unbreaks mencoder which would run into a libavcodec assert when trying to open the encoder from inside the open function of the decoder. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Tue May 7 22:39:13 2013 (r36244) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue May 7 22:39:14 2013 (r36245) @@ -494,37 +494,20 @@ static void draw_slice(struct AVCodecCon } } - -static int init_vo(sh_video_t *sh, enum AVPixelFormat pix_fmt) -{ +static void update_configuration(sh_video_t *sh, enum AVPixelFormat pix_fmt) { vd_ffmpeg_ctx *ctx = sh->context; - AVCodecContext *avctx = ctx->avctx; - float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height; - int width, height; - - width = avctx->width; - height = avctx->height; - - // HACK! - // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. - // use dimensions from BIH to avoid black borders at the right and bottom. - if (sh->bih && sh->ImageDesc) { - width = sh->bih->biWidth>>lavc_param_lowres; - height = sh->bih->biHeight>>lavc_param_lowres; - } - + const AVCodecContext *avctx = ctx->avctx; // it is possible another vo buffers to be used after vo config() // lavc reset its buffers on width/heigh change but not on aspect change!!! if (av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio) || - width != sh->disp_w || - height != sh->disp_h || pix_fmt != ctx->pix_fmt || !ctx->vo_initialized) { + float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height; ctx->vo_initialized = 0; // this is a special-case HACK for MPEG-1/2 VDPAU that uses neither get_format nor // sets the value correctly in avcodec_open. - set_format_params(avctx, avctx->pix_fmt); + set_format_params(avctx, pix_fmt); mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); // Do not overwrite s->aspect on the first call, so that a container @@ -535,10 +518,35 @@ static int init_vo(sh_video_t *sh, enum if (sh->aspect == 0 || ctx->last_sample_aspect_ratio.den) sh->aspect = aspect; ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio; - sh->disp_w = width; - sh->disp_h = height; ctx->pix_fmt = pix_fmt; ctx->best_csp = pixfmt2imgfmt(pix_fmt); + } +} + +static int init_vo(sh_video_t *sh, enum AVPixelFormat pix_fmt) +{ + vd_ffmpeg_ctx *ctx = sh->context; + const AVCodecContext *avctx = ctx->avctx; + int width, height; + + width = avctx->width; + height = avctx->height; + + // HACK! + // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. + // use dimensions from BIH to avoid black borders at the right and bottom. + if (sh->bih && sh->ImageDesc) { + width = sh->bih->biWidth>>lavc_param_lowres; + height = sh->bih->biHeight>>lavc_param_lowres; + } + if (width != sh->disp_w || height != sh->disp_h) + ctx->vo_initialized = 0; + + update_configuration(sh, pix_fmt); + if (!ctx->vo_initialized) + { + sh->disp_w = width; + sh->disp_h = height; if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp)) return -1; ctx->vo_initialized = 1; @@ -1004,7 +1012,7 @@ static enum AVPixelFormat get_format(str selected_format = fmt[i]; if (selected_format == PIX_FMT_NONE) { selected_format = avcodec_default_get_format(avctx, fmt); - init_vo(sh, selected_format); + update_configuration(sh, selected_format); } set_format_params(avctx, selected_format); return selected_format;

1 0

r36244 - trunk/Changelog
by reimar 07 May '13

07 May '13

Author: reimar Date: Tue May 7 22:39:13 2013 New Revision: 36244 Log: Some changelog updates. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Sun May 5 20:03:28 2013 (r36243) +++ trunk/Changelog Tue May 7 22:39:13 2013 (r36244) @@ -6,7 +6,9 @@ MPlayer Other: * "run" slave/keybinding command now supports expanding properties * better support for > 8 bit formats in -vo gl + * support for XYZ color space in -vo gl * -vo gl now supports OSD (not EOSD though) with GLES backend. + * GLES backend now uses GLES v2 with YUV support via shaders * -vo gl now has an OSX/Cocoa backend, so it should be a better alternative to -vo corevideo now. * -vo gl2 renamed to -vo gl_tiled to stop people from assuming it is

1 0

r36243 - branches/1.1/DOCS/tech/release.sh
by reimar 05 May '13

05 May '13

Author: reimar Date: Sun May 5 20:03:28 2013 New Revision: 36243 Log: Update release script for 1.1 branch. Modified: branches/1.1/DOCS/tech/release.sh Modified: branches/1.1/DOCS/tech/release.sh ============================================================================== --- branches/1.1/DOCS/tech/release.sh Sun May 5 19:18:01 2013 (r36242) +++ branches/1.1/DOCS/tech/release.sh Sun May 5 20:03:28 2013 (r36243) @@ -1,9 +1,9 @@ #!/bin/bash # will create checkouts and tarballs in the current dir -ver=1.1 +ver=1.1.1 dst=MPlayer-$ver #svnurl=svn://svn.mplayerhq.hu/mplayer/trunk -svnurl=svn://svn.mplayerhq.hu/mplayer/branches/$ver +svnurl=svn://svn.mplayerhq.hu/mplayer/branches/1.1 rm -rf $dst/ $dst-DOCS/ $dst.tar* @@ -25,7 +25,7 @@ mv $dst-DOCS/DOCS/HTML $dst/DOCS rm -rf $dst-DOCS/ # git archive unfortunately is refused -git clone --depth 1 git://git.videolan.org/ffmpeg.git $dst/ffmpeg +git clone --depth 1 -b release/0.11 git://git.videolan.org/ffmpeg.git $dst/ffmpeg rm -rf $dst/.git* $dst/ffmpeg/.git* # create .tar.gz and .tar.xz files

1 0