June 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

mpcommon.c + bug +review
by Hainan Ren (任海男) 09 Jul '15

09 Jul '15

hi, when i get some src codes ,i want to figure how mplayer decode the mp3 format audio and play it, then i find a bug,which i sincerely think so. mpcommon.c calc_a_pts line 551 a_pts = sh_audio->ptr; the there is obviously not a ptr member in sh_audio ,which i think maybe it comes from d_audio thanks,again!

3 2

donation
by "Mag. Dr. René Weissensteiner" 09 Jul '15

09 Jul '15

Dear mplayer-Team, since I am using mplayer for a while with great pleasure, it is time to donate a moderate amount of money. I am not using credit cards or any other digital money service. Could you provide a(n old fashioned?) bank account for the transfer? With my very best regards, René Weissensteiner

2 1

[PATCH] vo_vdpau: Add support for VDPAU accelerated HEVC decoding
by Philip Langdale 27 Jun '15

27 Jun '15

This change adds support for decoding HEVC content through VDPAU. Note that as things currently stand, the nvidia drivers are buggy and the output is not watcheable (its interlacing the top and bottom halves of each frame), but that should be fixed within the driver, hopefully without any further changes here. --- codec-cfg.c | 1 + configure | 4 ++++ etc/codecs.conf | 10 ++++++++++ libmpcodecs/img_format.c | 1 + libmpcodecs/img_format.h | 1 + libmpcodecs/vd_ffmpeg.c | 1 + libvo/vo_vdpau.c | 19 ++++++++++++++++++- 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/codec-cfg.c b/codec-cfg.c index b6825cc..aaa2080 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -256,6 +256,7 @@ static const struct { {"VDPAU_WMV3", IMGFMT_VDPAU_WMV3}, {"VDPAU_VC1", IMGFMT_VDPAU_VC1}, {"VDPAU_MPEG4", IMGFMT_VDPAU_MPEG4}, + {"VDPAU_HEVC", IMGFMT_VDPAU_HEVC}, {NULL, 0} }; diff --git a/configure b/configure index b90d34f..f796ed5 100755 --- a/configure +++ b/configure @@ -4721,6 +4721,7 @@ if test "$_vdpau" = auto && test "$_x11" = yes ; then _vdpau=no if test "$_dl" = yes ; then return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 -lvdpau && _vdpau=yes + return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_DECODER_PROFILE_HEVC_MAIN -lvdpau && _vdpau_hevc=yes fi fi if test "$_vdpau" = yes ; then @@ -4728,6 +4729,9 @@ if test "$_vdpau" = yes ; then libs_mplayer="$libs_mplayer -lvdpau" vomodules="vdpau $vomodules" libavhwaccels="$libavhwaccels H263_VDPAU_HWACCEL H264_VDPAU_HWACCEL MPEG1_VDPAU_HWACCEL MPEG2_VDPAU_HWACCEL MPEG4_VDPAU_HWACCEL VC1_VDPAU_HWACCEL WMV3_VDPAU_HWACCEL" + if test "$_vdpau_hevc" = yes ; then + libavhwaccels="$libavhwaccels HEVC_VDPAU_HWACCEL" + fi else def_vdpau='#define CONFIG_VDPAU 0' novomodules="vdpau $novomodules" diff --git a/etc/codecs.conf b/etc/codecs.conf index c2c34d3..f4b6e76 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1398,6 +1398,16 @@ videocodec ffhevc out 422P,422P9,422P10,444P12 out 444P,444P9,444P10,444P12 +videocodec ffhevcvdpau + info "FFmpeg HEVC / H.265 (VDPAU)" + status buggy + fourcc HEVC + fourcc hvc1 + fourcc hev1 + driver ffmpeg + dll hevc + out VDPAU_HEVC + videocodec ffh264 info "FFmpeg H.264" status working diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c index 085b38b..32a869f 100644 --- a/libmpcodecs/img_format.c +++ b/libmpcodecs/img_format.c @@ -142,6 +142,7 @@ const char *vo_format_name(int format) case IMGFMT_VDPAU_MPEG4: return "MPEG-4 Part 2 VDPAU acceleration"; case IMGFMT_VDPAU_WMV3: return "WMV3 VDPAU acceleration"; case IMGFMT_VDPAU_VC1: return "VC1 VDPAU acceleration"; + case IMGFMT_VDPAU_HEVC: return "HEVC VDPAU acceleration"; } snprintf(unknown_format,20,"Unknown 0x%04x",format); return unknown_format; diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 5f42378..68581f5 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -290,6 +290,7 @@ static inline int normalize_yuvp16(int fmt) { #define IMGFMT_VDPAU_WMV3 (IMGFMT_VDPAU|0x04) #define IMGFMT_VDPAU_VC1 (IMGFMT_VDPAU|0x05) #define IMGFMT_VDPAU_MPEG4 (IMGFMT_VDPAU|0x06) +#define IMGFMT_VDPAU_HEVC (IMGFMT_VDPAU|0x07) #define IMGFMT_IS_HWACCEL(fmt) (IMGFMT_IS_VDPAU(fmt) || IMGFMT_IS_XVMC(fmt)) diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index efcd278..a373458 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -235,6 +235,7 @@ static int pixfmt2imgfmt2(enum AVPixelFormat fmt, enum AVCodecID cid) case AV_CODEC_ID_MPEG4: return IMGFMT_VDPAU_MPEG4; case AV_CODEC_ID_WMV3: return IMGFMT_VDPAU_WMV3; case AV_CODEC_ID_VC1: return IMGFMT_VDPAU_VC1; + case AV_CODEC_ID_HEVC: return IMGFMT_VDPAU_HEVC; } return pixfmt2imgfmt(fmt); } diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 8203a31..f9a8057 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -620,6 +620,12 @@ static int create_vdp_decoder(uint32_t format, uint32_t width, uint32_t height, case IMGFMT_VDPAU_MPEG4: vdp_decoder_profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP; break; +#ifdef VDP_DECODER_PROFILE_HEVC_MAIN; + case IMGFMT_VDPAU_HEVC: + vdp_decoder_profile = VDP_DECODER_PROFILE_HEVC_MAIN; + mp_msg(MSGT_VO, MSGL_V, "[vdpau] Creating HEVC hardware decoder for %d reference frames.\n", max_refs); + break; +#endif default: goto err_out; } @@ -1028,7 +1034,17 @@ static int draw_slice(uint8_t *image[], int stride[], int w, int h, { VdpStatus vdp_st; struct vdpau_frame_data *rndr = (struct vdpau_frame_data *)image[0]; - int max_refs = image_format == IMGFMT_VDPAU_H264 ? ((VdpPictureInfoH264 *)rndr->info)->num_ref_frames : 2; + int max_refs; + switch (image_format) { + case IMGFMT_VDPAU_H264: + max_refs = ((VdpPictureInfoH264 *)rndr->info)->num_ref_frames; + break; + case IMGFMT_VDPAU_HEVC: + max_refs = 16; + break; + default: + max_refs = 2; + } if (handle_preemption() < 0) return VO_TRUE; @@ -1151,6 +1167,7 @@ static int query_format(uint32_t format) case IMGFMT_VDPAU_WMV3: case IMGFMT_VDPAU_VC1: case IMGFMT_VDPAU_MPEG4: + case IMGFMT_VDPAU_HEVC: // Note: this will break the current decoder // Not all implementations support safely instantiating // a second decoder, so this is the "lesser evil" -- 2.1.4

2 1

[PATCH] Don't depend on FFmpeg internal raw_packet_buffer_remaining_size
by Ingo Brückl 10 Jun '15

10 Jun '15

Fortunately, FFmpeg's avformat_alloc_context() already sets it, so there is no need for MPlayer to do it. This is related to svn r37372 which was a quick hack. Ingo

3 4

[PATCH] Support compiling without CPU optimization
by Ingo Brückl 08 Jun '15

08 Jun '15

Those who have configured their gcc to already compile CPU specific, optimized code don't want any automatic optimization by the use of -march/-mtune/-mcpu. Add an option to disable optimization. Ingo

2 6

[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