January 2015 - MPlayer-dev-eng - lists.mplayerhq.hu

Homepage skin download issue
by Ingo Brückl 09 Sep '15

09 Sep '15

Yesterday, I updated hwswskin to 1.3, but it still isn't downloadable. Is the generation of the skin download tarballs working? Ingo

3 8

[PATCH] configure: remove support for internal libdvd*.
by Reimar Döffinger 04 Jun '15

04 Jun '15

--- configure | 134 +++----------------------------------------------------------- 1 file changed, 6 insertions(+), 128 deletions(-) diff --git a/configure b/configure index ba31428..b27b800 100755 --- a/configure +++ b/configure @@ -359,8 +359,6 @@ Optional features: --disable-bluray disable Blu-ray support [autodetect] --disable-dvdnav disable libdvdnav [autodetect] --disable-dvdread disable libdvdread [autodetect] - --disable-dvdread-internal disable internal libdvdread and libdvdnav [autodetect] - --disable-libdvdcss-internal disable internal libdvdcss [autodetect] --disable-cdparanoia disable cdparanoia [autodetect] --disable-cddb disable cddb [autodetect] --disable-bitmap-font disable bitmap font support [enable] @@ -750,8 +748,6 @@ type dvdnav-config >/dev/null 2>&1 && _dvdnavconfig=dvdnav-config _dvdreadconfig="pkg-config dvdread" type dvdread-config >/dev/null 2>&1 && _dvdnavconfig=dvdread-config _dvdread=auto -_dvdread_internal=auto -_libdvdcss_internal=auto _xanim=auto _real=auto _live=auto @@ -921,11 +917,9 @@ for ac_option do ;; --with-dvdnav-config=*) _dvdnavconfig=$(option_value $ac_option) - _dvdread_internal=no ;; --with-dvdread-config=*) _dvdreadconfig=$(option_value $ac_option) - _dvdread_internal=no ;; --extra-cflags=*) @@ -1170,10 +1164,6 @@ for ac_option do --disable-bluray) _bluray=no ;; --enable-dvdread) _dvdread=yes ;; --disable-dvdread) _dvdread=no ;; - --enable-dvdread-internal) _dvdread_internal=yes ;; - --disable-dvdread-internal) _dvdread_internal=no ;; - --enable-libdvdcss-internal) _libdvdcss_internal=yes ;; - --disable-libdvdcss-internal) _libdvdcss_internal=no ;; --enable-dvdnav) _dvdnav=yes ;; --disable-dvdnav) _dvdnav=no ;; --enable-xanim) _xanim=yes ;; @@ -6086,15 +6076,6 @@ fi echores "$_bluray" echocheck "dvdread" -if test "$_dvdread_internal" = auto ; then - _dvdread_internal=no - if linux || freebsd || netbsd || openbsd || dragonfly || sunos || hpux || - darwin || win32 || os2; then - _dvdread_internal=yes - _dvdread=yes - extra_cflags="-Ilibdvdread4 $extra_cflags" - fi -fi if test "$_dvdread" = auto ; then _dvdread=no if test "$_dl" = yes; then @@ -6104,20 +6085,14 @@ if test "$_dvdread" = auto ; then _dvdread=yes extra_cflags="$extra_cflags $_dvdreadcflags" extra_ldflags="$extra_ldflags $_dvdreadlibs" - res_comment="external" fi fi fi -if test "$_dvdread_internal" = yes; then - def_dvdread='#define CONFIG_DVDREAD 1' - inputmodules="dvdread(internal) $inputmodules" - res_comment="internal" -elif test "$_dvdread" = yes; then +if test "$_dvdread" = yes; then def_dvdread='#define CONFIG_DVDREAD 1' - extra_ldflags="$extra_ldflags -ldvdread" - inputmodules="dvdread(external) $inputmodules" - res_comment="external" + extra_ldflags="$extra_ldflags" + inputmodules="dvdread $inputmodules" else def_dvdread='#undef CONFIG_DVDREAD' noinputmodules="dvdread $noinputmodules" @@ -6125,83 +6100,6 @@ fi echores "$_dvdread" -echocheck "internal libdvdcss" -def_broken_mkdir='#undef HAVE_BROKEN_MKDIR' -def_dvdio='#undef DVD_STRUCT_IN_SYS_DVDIO_H' -def_dvd='#undef DVD_STRUCT_IN_DVD_H' -def_cdio='#undef DVD_STRUCT_IN_SYS_CDIO_H' -def_cdrom='#undef DVD_STRUCT_IN_LINUX_CDROM_H' -def_hpux_scsi_h='#undef HPUX_SCTL_IO' -def_sol_scsi_h='#undef SOLARIS_USCSI' -def_sys_uio_h='#undef HAVE_SYS_UIO_H' -_dvdio=no -_dvd=no -_cdio=no -_cdrom=no -_sol_scsi_h=no -_hpux_scsi_h=no -if test "$_libdvdcss_internal" = auto && test "$_dvdread_internal" = yes ; then - _libdvdcss_internal=no - test -d libdvdcss && _libdvdcss_internal=yes - - if header_check linux/cdrom.h ; then - _cdrom=yes - def_cdrom='#define DVD_STRUCT_IN_LINUX_CDROM_H 1' - # FreeBSD 8.1 has broken dvdio.h - elif header_check_broken sys/types.h sys/dvdio.h ; then - _dvdio=yes - def_dvdio='#define DVD_STRUCT_IN_SYS_DVDIO_H 1' - elif header_check dvd.h ; then - _dvd=yes - def_dvd='#define DVD_STRUCT_IN_DVD_H 1' - # at least OpenSolaris has a broken cdio.h - elif header_check_broken sys/types.h sys/cdio.h ; then - _cdio=yes - def_cdio='#define DVD_STRUCT_IN_SYS_CDIO_H 1' - fi - - if sunos; then - header_check sys/scsi/scsi_types.h && - header_check_broken sys/types.h sys/scsi/impl/uscsi.h && - _sol_scsi_h=yes && def_sol_scsi_h='#define SOLARIS_USCSI 1' - elif hpux; then - # also used by AIX, but AIX does not support VCD and/or libdvdread - header_check sys/scsi.h && _hpux_scsi_h=yes && - def_hpux_scsi_h='#define HPUX_SCTL_IO 1' || - _libdvdcss_internal=no - fi - - statement_check_broken stddef.h sys/stat.h 'mkdir(NULL, 0)' || - def_broken_mkdir='#define HAVE_BROKEN_MKDIR 1' - - header_check "sys/uio.h" && - def_sys_uio_h='#define HAVE_SYS_UIO_H 1' - -fi -if test "$_libdvdcss_internal" = yes ; then - if linux || netbsd || openbsd || wine ; then - def_dvd_linux='#define HAVE_LINUX_DVD_STRUCT 1' - openbsd && def_dvd_openbsd='#define HAVE_OPENBSD_DVD_STRUCT 1' - elif freebsd || dragonfly ; then - def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1' - elif darwin ; then - def_dvd_darwin='#define DARWIN_DVD_IOCTL' - extra_ldflags="$extra_ldflags -framework IOKit -framework Carbon" - elif cygwin ; then - cflags_libdvdcss="-D_WIN32_IE=0x0500 -mwin32" - elif mingw32 ; then - cflags_libdvdcss="-D_WIN32_IE=0x0500" - libs_mplayer="$libs_mplayer -lshfolder" - fi - cflags_libdvdcss_dvdread="-Ilibdvdcss" - def_dvdcss="#define HAVE_DVDCSS_DVDCSS_H 1" - inputmodules="libdvdcss(internal) $inputmodules" -else - noinputmodules="libdvdcss(internal) $noinputmodules" -fi -echores "$_libdvdcss_internal" - - echocheck "libcdio" if test "$_libcdio" = auto ; then cat > $TMPC << EOF @@ -8123,22 +8021,7 @@ CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -# This must be the last test to be performed. Any other tests following it -# could fail due to linker errors. libdvdnavmini is intentionally not linked -# against libdvdread (to permit MPlayer to use its own copy of the library). -# So any compilation using the flags added here but not linking against -# libdvdread can fail. echocheck "DVD support (libdvdnav)" -dvdnav_internal=no -if test "$_dvdnav" = auto ; then - if test "$_dvdread_internal" = yes ; then - _dvdnav=yes - dvdnav_internal=yes - res_comment="internal" - else - $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no - fi -fi if test "$_dvdnav" = auto ; then _dvdnav=no _dvdnavdir=$($_dvdnavconfig --cflags) @@ -8147,14 +8030,9 @@ if test "$_dvdnav" = auto ; then fi if test "$_dvdnav" = yes ; then def_dvdnav='#define CONFIG_DVDNAV 1' - if test "$dvdnav_internal" = yes ; then - cflags_libdvdnav="-Ilibdvdnav" - inputmodules="dvdnav(internal) $inputmodules" - else - extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)" - extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)" - inputmodules="dvdnav $inputmodules" - fi + extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)" + extra_ldflags="$extra_ldflags $($_dvdnavconfig --libs)" + inputmodules="dvdnav $inputmodules" else def_dvdnav='#undef CONFIG_DVDNAV' noinputmodules="dvdnav $noinputmodules" -- 2.1.1

5 12

[PATCH] Enable energy saving option and screensaver mode when the video is paused.
by Ferenc Czumbil 09 Feb '15

09 Feb '15

Hi, Currently, by default, energy saving and the screensaver is disabled when mplayer starts and is re-enabled on exit. This re-enables them when the video is paused. Fixes bug #2112 This is my first patch submission, so any feedback is appreciated. Regards, sisco311.

3 9

[PATCH] Add support for AArch64 architecture (64-bit ARM)
by Marcin Juszkiewicz 05 Feb '15

05 Feb '15

As I got X11 running on AArch64 hardware I decided to use my standard test and play something with MPlayer. Following patch is all what was needed. Index: configure =================================================================== --- configure (revision 37360) +++ configure (working copy) @@ -1724,6 +1724,7 @@ nios2) host_arch=nios2 ;; vax) host_arch=vax ;; xtensa*) host_arch=xtensa ;; + aarch64*) host_arch=aarch64 ;; *) host_arch=UNKNOWN ;; esac } @@ -2668,6 +2669,10 @@ arch='arc' iproc='arc' ;; + aarch64) + arch='aarch64' + iproc='aarch64' + ;; *) echo "The architecture of your CPU ($host_arch) is not supported by this configure script"

2 5

[patch] stricmp
by Stephen Sheldon 19 Jan '15

19 Jan '15

Something has changed in Cygwin, and it no longer has a definition for "stricmp". I changed the sole occurence to strcasecmp, which is used elsewhere in mplayer. This is strange code, and I did not attempt to understand why it was doing such a test for NULL.

6 12

Mplayer fpr Windws CE 7.0
by Carsten Oms (GPSoverIP GmbH) 18 Jan '15

18 Jan '15

Hello, do you also have a Mediaplayer (Mplayer) for Windows CE 7.0 ? CE= Compact Embedded Thanks for your Reply, Carsten Oms

2 1

[PATCH] video_out: fix and extend doxy for calc_src_dst_rects().
by Nicolas George 14 Jan '15

14 Jan '15

--- libvo/video_out.c | 20 ++++++++++++++++++-- libvo/video_out.h | 4 ++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/libvo/video_out.c b/libvo/video_out.c index fbf9009..38f43fa 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -429,9 +429,25 @@ static void src_dst_split_scaling(int src_size, int dst_size, int scaled_src_siz * get a correctly scaled picture, including pan-scan. * Can be extended to take future cropping support into account. * - * \param crop specifies the cropping border size in the left, right, top and bottom members, may be NULL + * \param src_width width of the source video + * \param src_height height of the source video + * + * \param src displayed rectangle in the source video, + * can be less than the full image due to panscan and crop; + * (left,top) and (right,bottom) are the coordinates of the extreme vertices; + * width = right - left; height = bottom - top + * + * \param dst painted rectangle on the output device, + * can beless than the full device due to letterbox borders; + * see src above for the meaning of each field + * * \param borders the border values as e.g. EOSD (ASS) and properly placed DVD highlight support requires, - * may be NULL and only left and top are currently valid. + * may be NULL; left, top, right and bottom are the number of pixels, in output resolution, + * of each margin, like mp_eosd_settings fields ml, mt, mr and mb; + * width and height are unset. + * + * \param crop specifies the cropping border size in the left, right, top and bottom members, may be NULL, + * currently used by no caller */ void calc_src_dst_rects(int src_width, int src_height, struct vo_rect *src, struct vo_rect *dst, struct vo_rect *borders, const struct vo_rect *crop) { diff --git a/libvo/video_out.h b/libvo/video_out.h index 712703e..bc32884 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -285,6 +285,10 @@ int lookup_keymap_table(const struct mp_keymap *map, int key); struct vo_rect { int left, right, top, bottom, width, height; }; +/** + * Calculate the appropriate source and destination rectangle. + * See video_out.c for the full documentation. + */ void calc_src_dst_rects(int src_width, int src_height, struct vo_rect *src, struct vo_rect *dst, struct vo_rect *borders, const struct vo_rect *crop); void vo_mouse_movement(int posx, int posy); -- 2.1.4

1 0

[PATCH] vo_gl: fix border-pos interaction with EOSD.
by Nicolas George 12 Jan '15

12 Jan '15

--- libvo/vo_gl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) The current version causes very visible distortions when pos is far from 0.5. diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 0de64c9..ac0cec6 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -166,7 +166,7 @@ static int texture_width; static int texture_height; static int mpi_flipped; static int vo_flipped; -static int ass_border_x, ass_border_y; +static int ass_border_l, ass_border_r, ass_border_t, ass_border_b; static unsigned int slice_height = 1; @@ -214,7 +214,7 @@ static void resize(void) { } } - ass_border_x = ass_border_y = 0; + ass_border_l = ass_border_t = 0; if (aspect_scaling() && use_aspect) { int new_w, new_h; double scale_x, scale_y; @@ -235,8 +235,10 @@ static void resize(void) { if (vo_rotate & 1) { int tmp = new_w; new_w = new_h; new_h = tmp; } - ass_border_x = apply_border_pos(draw_width, new_w, vo_border_pos_x); - ass_border_y = apply_border_pos(draw_height, new_h, vo_border_pos_y); + ass_border_l = apply_border_pos(draw_width, new_w, vo_border_pos_x); + ass_border_t = apply_border_pos(draw_height, new_h, vo_border_pos_y); + ass_border_r = draw_width - new_w - ass_border_l; + ass_border_b = draw_height - new_h - ass_border_t; } mpglLoadMatrixf(video_matrix); @@ -840,7 +842,7 @@ static void draw_osd(void) clearOSD(); osd_w = scaled_osd ? image_width : draw_width; osd_h = scaled_osd ? image_height : draw_height; - vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, + vo_draw_text_ext(osd_w, osd_h, ass_border_l, ass_border_t, ass_border_r, ass_border_b, image_width, image_height, create_osd_texture); } if (vo_doublebuffering) do_render_osd(RENDER_OSD); @@ -1432,8 +1434,10 @@ static int control(uint32_t request, void *data) r->mt = r->mb = r->ml = r->mr = 0; if (scaled_osd) {r->w = image_width; r->h = image_height;} else if (aspect_scaling()) { - r->ml = r->mr = ass_border_x; - r->mt = r->mb = ass_border_y; + r->ml = ass_border_l; + r->ml = ass_border_r; + r->mt = ass_border_t; + r->mb = ass_border_b; } } return VO_TRUE; -- 2.1.4

2 6