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

r32777 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp...
by cboesch 18 Jun '11

18 Jun '11

Author: cboesch Date: Mon Jan 10 20:18:51 2011 New Revision: 32777 Log: Add size based support for -endpos in MPlayer. Modified: trunk/mplayer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/mplayer.c Mon Jan 10 20:18:51 2011 (r32777) @@ -3654,11 +3654,6 @@ if (seek_to_sec) { end_at.pos += seek_to_sec; } -if (end_at.type == END_AT_SIZE) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased); - end_at.type = END_AT_NONE; -} - #ifdef CONFIG_DVDNAV mp_dvdnav_context_free(mpctx); if (mpctx->stream->type == STREAMTYPE_DVDNAV) { @@ -3702,7 +3697,8 @@ if(!mpctx->sh_video) { if(!quiet) print_status(a_pos, 0, 0); - if(end_at.type == END_AT_TIME && end_at.pos < a_pos) + if(end_at.type == END_AT_TIME && end_at.pos < a_pos || + end_at.type == END_AT_SIZE && end_at.pos < stream_tell(mpctx->stream)) mpctx->eof = PT_NEXT_ENTRY; update_subtitles(NULL, a_pos, mpctx->d_sub, 0); update_osd_msg(); @@ -3810,10 +3806,9 @@ if(auto_quality>0){ if (play_n_frames <= 0) mpctx->eof = PT_NEXT_ENTRY; } - -// FIXME: add size based support for -endpos - if (end_at.type == END_AT_TIME && - !frame_time_remaining && end_at.pos <= mpctx->sh_video->pts) + if (!frame_time_remaining && + ((end_at.type == END_AT_TIME && mpctx->sh_video->pts >= end_at.pos) || + (end_at.type == END_AT_SIZE && stream_tell(mpctx->stream) >= end_at.pos))) mpctx->eof = PT_NEXT_ENTRY; } // end if(mpctx->sh_video)

4 9

r33523 - trunk/libvo/x11_common.c
by iive 06 Jun '11

06 Jun '11

Author: iive Date: Mon May 30 01:00:14 2011 New Revision: 33523 Log: Make vo_x11_create_smooth_window() use its parameter mRoot instead of the global variable mRootWin. Fixes warning. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Mon May 30 00:46:52 2011 (r33522) +++ trunk/libvo/x11_common.c Mon May 30 01:00:14 2011 (r33523) @@ -1045,7 +1045,7 @@ Window vo_x11_create_smooth_window(Displ xswa.bit_gravity = StaticGravity; ret_win = - XCreateWindow(mDisplay, mRootWin, x, y, width, height, 0, depth, + XCreateWindow(mDisplay, mRoot, x, y, width, height, 0, depth, CopyFromParent, vis, xswamask, &xswa); XSetWMProtocols(mDisplay, ret_win, &XAWM_DELETE_WINDOW, 1); if (f_gc == None)

3 2

r33532 - trunk/configure
by iive 01 Jun '11

01 Jun '11

Author: iive Date: Tue May 31 22:45:39 2011 New Revision: 33532 Log: Automatically add "-fno-tree-vectorize" in CFLAGS. Automatic tree vectorization is enabled for high optimization levels (-O3 and above). However it have long history of breaking code. Latest been with gcc-4.6.0 and "-march=corei7-avx -O3". FFmpeg also disables it. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon May 30 23:31:31 2011 (r33531) +++ trunk/configure Tue May 31 22:45:39 2011 (r33532) @@ -2587,6 +2587,7 @@ else fi if test "$cc_vendor" = "gnu" ; then + cflag_check -fno-tree-vectorize && CFLAGS="$CFLAGS -fno-tree-vectorize" cflag_check -Wundef && WARNFLAGS="-Wundef $WARNFLAGS" cflag_check -std=gnu99 && WARN_CFLAGS="-std=gnu99 $WARN_CFLAGS" cflag_check -Wdeclaration-after-statement && WARN_CFLAGS="-Wdeclaration-after-statement $WARN_CFLAGS"

2 1

r33533 - trunk/configure
by iive 31 May '11

31 May '11

Author: iive Date: Tue May 31 23:15:14 2011 New Revision: 33533 Log: Check if compiler is functioning properly before trying to test additional options. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue May 31 22:45:39 2011 (r33532) +++ trunk/configure Tue May 31 23:15:14 2011 (r33533) @@ -1679,6 +1679,10 @@ else fi # icc test "$cc_fail" = yes && die "unsupported compiler version" +echocheck "working compiler" +cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." +echo "yes" + if test -z "$_target" && x86 ; then cat > $TMPC << EOF int main(void) {

1 0

r33531 - trunk/libmpcodecs/vf_divtc.c
by reimar 30 May '11

30 May '11

Author: reimar Date: Mon May 30 23:31:31 2011 New Revision: 33531 Log: Fix code incorrectly assuming "char" is signed. Modified: trunk/libmpcodecs/vf_divtc.c Modified: trunk/libmpcodecs/vf_divtc.c ============================================================================== --- trunk/libmpcodecs/vf_divtc.c Mon May 30 23:25:32 2011 (r33530) +++ trunk/libmpcodecs/vf_divtc.c Mon May 30 23:31:31 2011 (r33531) @@ -42,7 +42,7 @@ struct vf_priv_s ocount, sum[5]; double threshold; FILE *file; - char *bdata; + int8_t *bdata; unsigned int *csdata; int *history; }; @@ -384,8 +384,8 @@ static int analyze(struct vf_priv_s *p) { int *buf=0, *bp, bufsize=0, n, b, f, i, j, m, s; unsigned int *cbuf=0, *cp; - char *pbuf; - char lbuf[256]; + int8_t *pbuf; + int8_t lbuf[256]; int sum[5]; double d;

1 0

r33530 - trunk/libmpcodecs/vf_dint.c
by reimar 30 May '11

30 May '11

Author: reimar Date: Mon May 30 23:25:32 2011 New Revision: 33530 Log: Fix code assuming that "char" is signed. Modified: trunk/libmpcodecs/vf_dint.c Modified: trunk/libmpcodecs/vf_dint.c ============================================================================== --- trunk/libmpcodecs/vf_dint.c Mon May 30 23:16:37 2011 (r33529) +++ trunk/libmpcodecs/vf_dint.c Mon May 30 23:25:32 2011 (r33530) @@ -81,10 +81,10 @@ static int config (struct vf_instance *v static int put_image (struct vf_instance *vf, mp_image_t *mpi, double pts) { - char rrow0[MAXROWSIZE]; - char rrow1[MAXROWSIZE]; - char rrow2[MAXROWSIZE]; - char *row0 = rrow0, *row1 = rrow1, *row2 = rrow2/*, *row3 = rrow3*/; + int8_t rrow0[MAXROWSIZE]; + int8_t rrow1[MAXROWSIZE]; + int8_t rrow2[MAXROWSIZE]; + int8_t *row0 = rrow0, *row1 = rrow1, *row2 = rrow2/*, *row3 = rrow3*/; int rowsize = mpi->width; uint32_t nok = 0, max = vf->priv->max; int diff = vf->priv->diff;

1 0

r33529 - trunk/libmpcodecs/vf_dint.c
by reimar 30 May '11

30 May '11

Author: reimar Date: Mon May 30 23:16:37 2011 New Revision: 33529 Log: Use int as type, there is no reason to use char which also causes issues since it may be either signed or unsigned. Modified: trunk/libmpcodecs/vf_dint.c Modified: trunk/libmpcodecs/vf_dint.c ============================================================================== --- trunk/libmpcodecs/vf_dint.c Mon May 30 22:59:48 2011 (r33528) +++ trunk/libmpcodecs/vf_dint.c Mon May 30 23:16:37 2011 (r33529) @@ -32,7 +32,7 @@ struct vf_priv_s { float sense; // first parameter float level; // second parameter unsigned int imgfmt; - char diff; + int diff; uint32_t max; // int dfr; // int rdfr; @@ -73,7 +73,7 @@ static int config (struct vf_instance *v vf->priv->diff = 31; mp_msg (MSGT_VFILTER, MSGL_INFO, "Drop-interlaced: %dx%d diff %d / level %u\n", vf->priv->pmpi->width, vf->priv->pmpi->height, - (int)vf->priv->diff, (unsigned int)vf->priv->max); + vf->priv->diff, (unsigned int)vf->priv->max); // vf->priv->rdfr = vf->priv->dfr = 0; vf->priv->was_dint = 0; return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);

1 0

r33528 - trunk/libmpcodecs/vf_detc.c
by reimar 30 May '11

30 May '11

Author: reimar Date: Mon May 30 22:59:48 2011 New Revision: 33528 Log: Add const to match actual type of string literal that are assigned. Modified: trunk/libmpcodecs/vf_detc.c Modified: trunk/libmpcodecs/vf_detc.c ============================================================================== --- trunk/libmpcodecs/vf_detc.c Mon May 30 22:23:45 2011 (r33527) +++ trunk/libmpcodecs/vf_detc.c Mon May 30 22:59:48 2011 (r33528) @@ -382,7 +382,7 @@ static void uninit(struct vf_instance *v } static struct { - char *name; + const char *name; int (*func)(struct vf_priv_s *p, mp_image_t *new, mp_image_t *old); int needread; } anal_funcs[] = {

1 0

r33527 - trunk/configure
by reimar 30 May '11

30 May '11

Author: reimar Date: Mon May 30 22:23:45 2011 New Revision: 33527 Log: Fix compilation with latest FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon May 30 17:11:30 2011 (r33526) +++ trunk/configure Mon May 30 22:23:45 2011 (r33527) @@ -8138,8 +8138,7 @@ YASMDEP = $_yasm YASMFLAGS = $YASMFLAGS CONFIG_STATIC = yes -SRC_PATH = ../../ -BUILD_ROOT = .. +SRC_PATH = ../ LIBPREF = lib LIBSUF = .a LIBNAME = \$(LIBPREF)\$(NAME)\$(LIBSUF) @@ -8739,7 +8738,7 @@ for part in $arch $subarch; do done echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" -cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm +cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm fi @@ -8748,6 +8747,10 @@ cat > ffmpeg/config.mak << EOF include ../../config.mak EOF +cat > ffmpeg/config.h << EOF +#include "../config.h" +EOF + ############################################################################# cat << EOF

1 0

r33522 - in trunk/libvo: vo_xv.c vo_xvmc.c
by iive 30 May '11

30 May '11

Author: iive Date: Mon May 30 00:46:52 2011 New Revision: 33522 Log: Fix xv/xvmc window background clearing. Set background color only when using ck-method=background. In the other cases clearing of the non-video image area should be done manually. Not drawing on the video image area prevents flickering (visible when resizing). Modified: trunk/libvo/vo_xv.c trunk/libvo/vo_xvmc.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Mon May 30 00:41:52 2011 (r33521) +++ trunk/libvo/vo_xv.c Mon May 30 00:46:52 2011 (r33522) @@ -168,7 +168,7 @@ static void deallocate_xvimage(int foo); static void resize(void) { calc_src_dst_rects(image_width, image_height, &src_rect, &dst_rect, NULL, NULL); - vo_x11_clearwindow_part(mDisplay, vo_window, dst_rect.width, dst_rect.height, vo_fs); +// vo_x11_clearwindow_part(mDisplay, vo_window, dst_rect.width, dst_rect.height, vo_fs); vo_xv_draw_colorkey(dst_rect.left, dst_rect.top, dst_rect.width, dst_rect.height); } @@ -240,13 +240,13 @@ static int config(uint32_t width, uint32 depth = 24; XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); - xswa.background_pixel = 0; + xswa.border_pixel = 0; + xswamask = CWBorderPixel; if (xv_ck_info.method == CK_METHOD_BACKGROUND) { xswa.background_pixel = xv_colorkey; + xswamask |= CWBackPixel; } - xswa.border_pixel = 0; - xswamask = CWBackPixel | CWBorderPixel; vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, vo_dwidth, vo_dheight, flags, CopyFromParent, "xv", title); Modified: trunk/libvo/vo_xvmc.c ============================================================================== --- trunk/libvo/vo_xvmc.c Mon May 30 00:41:52 2011 (r33521) +++ trunk/libvo/vo_xvmc.c Mon May 30 00:46:52 2011 (r33522) @@ -666,11 +666,12 @@ skip_surface_allocation: if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24; XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); - xswa.background_pixel = 0; - if (xv_ck_info.method == CK_METHOD_BACKGROUND) - xswa.background_pixel = xv_colorkey; xswa.border_pixel = 0; - xswamask = CWBackPixel | CWBorderPixel; + xswamask = CWBorderPixel; + if (xv_ck_info.method == CK_METHOD_BACKGROUND){ + xswa.background_pixel = xv_colorkey; + xswamask |= CWBackPixel; + } vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height, flags, CopyFromParent, "xvmc", title);

2 1