February 2021 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] configure: Do not try to detect GnuTLS if OpenSSL was enabled
by Alexander Strasser 24 Feb '22

24 Feb '22

Enabling GnuTLS via auto detection could have us end up with both libraries enabled. This won't build anymore. IIRC at some point it did build, though it was not easy to figure out which implementation would be used in the end. This change is done in the light of having no auto detection for OpenSSL and probably never will, because of the OpenSSL license. --- Also Cc to mplayer-users. I hoped the original reporter of the build problem would test it, but it seems it didn't happen. So now I am posting it for review. This needs some more testing, I had this in my tree for a while, but forgot about testing it further, so I will only push after a bit more testing. Probably in a week or so. As explained in the commit message this change is assuming quite a bit. I think the risk of OpenSSL auto detection being added in the future is very low, so I feel it is worth it, because of the lower complexity and smaller patch. Comments welcome! configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d21df0ff7..91b6f9534 100755 --- a/configure +++ b/configure @@ -4531,7 +4531,7 @@ fi echocheck "GnuTLS" -if test "$_gnutls" = auto ; then +if test "$_gnutls" = auto && test "$_openssl" != "yes" ; then _gnutls=no if $_pkg_config --exists gnutls ; then statement_check gnutls/gnutls.h 'gnutls_global_init()' $($_pkg_config --libs --cflags gnutls) && --

1 2

Preparing MPlayer 1.5 Release
by Alexander Strasser 27 Mar '21

27 Mar '21

Hi all, I intent to do an MPlayer release in the next weeks. I would be grateful for any help. Please consider compiling latest MPlayer SVN on supported platforms and compilers available to you. Some additional testing would be awesome. Also if you know or come to know about issues that seem important to you please mention them here in this thread. Thanks in advance, Alexander

3 3

[PATCH 1/6] vo_png: switch to new FFmpeg API.
by Reimar Döffinger 27 Mar '21

27 Mar '21

--- libvo/vo_png.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 5696a1f3e..7523dca74 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -150,8 +150,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin static uint32_t draw_image(mp_image_t* mpi){ AVFrame *pic; - int buffersize; - int res, got_pkt; + int res; char buf[100]; FILE *outfile; AVPacket pkt; @@ -174,26 +173,25 @@ static uint32_t draw_image(mp_image_t* mpi){ pic->format = imgfmt2pixfmt(png_format); pic->data[0] = mpi->planes[0]; pic->linesize[0] = mpi->stride[0]; - buffersize = mpi->w * mpi->h * 8; - if (outbuffer_size < buffersize) { - av_freep(&outbuffer); - outbuffer = av_malloc(buffersize); - outbuffer_size = buffersize; - } av_init_packet(&pkt); - pkt.data = outbuffer; - pkt.size = outbuffer_size; - res = avcodec_encode_video2(avctx, &pkt, pic, &got_pkt); + res = avcodec_send_frame(avctx, pic); + if (res >= 0) { + res = avcodec_receive_packet(avctx, &pkt); + if (res == AVERROR(EAGAIN)) { + avcodec_send_frame(avctx, NULL); + res = avcodec_receive_packet(avctx, &pkt); + } + } av_frame_free(&pic); - if (res < 0 || !got_pkt) { + if (res < 0) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_PNG_ErrorInCreatePng); } else { - fwrite(outbuffer, pkt.size, 1, outfile); + fwrite(pkt.data, pkt.size, 1, outfile); } fclose(outfile); - av_free_packet(&pkt); + av_packet_unref(&pkt); return VO_TRUE; } @@ -251,7 +249,6 @@ static int preinit(const char *arg) if (subopt_parse(arg, subopts) != 0) { return -1; } - avcodec_register_all(); return 0; } -- 2.29.2

4 17

Homepage DOCS needs update
by Ingo Brückl 26 Feb '21

26 Feb '21

Someone please update http://mplayerhq.hu/DOCS/HTML/{en,de}. Thanks, Ingo

2 1

Localized messages and locale in GUI
by Ingo Brückl 25 Feb '21

25 Feb '21

I know the issue and I know that MPlayer and therefore the GUI must run in the C locale. However, since it would be desirable for the GUI (not to say absolutely taken for granted for a contemporary program) to provide localized messages instead of being translated in one specific language, I wonder whether a setlocale(LC_MESSAGES, "") would be uncritical for MPlayer. If this is the case, *.po files could be generated from the help strings during compilation of the GUI, and the *.mo files compiled from them could then be installed. I' ve successfully proved the concept, but am unsure about MPlayer's locale issues. Ingo

2 6

[PATCH] Localized messages and locale in GUI
by Ingo Brückl 24 Feb '21

24 Feb '21

This is how I see the configuration and installation of localized messages for the GUI. Without enable-nls there is no change. (There isn't even a change with a single user-defined message language.) About configure (and enable-nls): * if language_msg=all then en is the main language * without enable-gui there is no nls * with nls and a missing msgfmt there is a configure error * language_msg can be multiple languages * if language_msg is user-defined the first language is the main one * the help file is the main language one * the message language (MSG_LANGS) are passed to the Makefile About Makefile: * help_create_po.sh (yet to write) creates a po file in help/po from the respective help file if either the respective help file has changed or the main one (en) which provides the msgids. * install-gui-msg installs mo files for all message languages but the first one (which messages have been compiled in by including help_mp.h) Ingo

1 0

[PATCH] Fix dependencies on libavutil/mem_internal.h
by Reimar Döffinger 13 Feb '21

13 Feb '21

Especially relevant once DECLARE_ALIGNED will be removed from mem.h. While keeping our own copy is a bit ugly and wasteful, it seems like the best option overall, even if I'd prefer that mem_internal functionality was instead available to users of FFmpeg. --- libmpcodecs/vf_filmdint.c | 1 + libmpcodecs/vf_fspp.c | 2 +- libmpcodecs/vf_gradfun.c | 2 +- libmpcodecs/vf_ow.c | 2 +- libmpcodecs/vf_pp7.c | 1 + libmpcodecs/vf_spp.c | 2 +- libmpcodecs/vf_uspp.c | 2 +- m_config.h | 2 +- mpmem.h | 89 +++++++++++++++++++++++++++++++++++++++ sub/osd.c | 2 +- 10 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 mpmem.h diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index 3adb76f9f..aaeeaf168 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -24,6 +24,7 @@ #include "mp_msg.h" #include "cpudetect.h" #include "osdep/timer.h" +#include "mpmem.h" #include "img_format.h" #include "mp_image.h" diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index 9bb967710..f9c4c693d 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -50,7 +50,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" +#include "mpmem.h" #include "mpx86asm.h" #include "libavcodec/avcodec.h" diff --git a/libmpcodecs/vf_gradfun.c b/libmpcodecs/vf_gradfun.c index 5e451cf12..472080bb2 100644 --- a/libmpcodecs/vf_gradfun.c +++ b/libmpcodecs/vf_gradfun.c @@ -40,7 +40,7 @@ #include "libvo/fastmemcpy.h" #include "libavutil/avutil.h" #include "libavutil/common.h" -#include "libavutil/mem.h" +#include "mpmem.h" #include "mpx86asm.h" struct vf_priv_s { diff --git a/libmpcodecs/vf_ow.c b/libmpcodecs/vf_ow.c index af4bdbc2c..23295b770 100644 --- a/libmpcodecs/vf_ow.c +++ b/libmpcodecs/vf_ow.c @@ -32,7 +32,7 @@ #include <inttypes.h> #include <math.h> -#include "libavutil/mem_internal.h" +#include "mpmem.h" #include "mp_msg.h" #include "img_format.h" #include "mp_image.h" diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index 6d6963db6..3a0422a0e 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -35,6 +35,7 @@ #endif #include "libavutil/mem.h" +#include "mpmem.h" #include "img_format.h" #include "mp_image.h" diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index 84b467286..59c71bb94 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -34,12 +34,12 @@ #include "config.h" +#include "mpmem.h" #include "mp_msg.h" #include "cpudetect.h" #include "libavutil/common.h" #include "libavutil/internal.h" -#include "libavutil/mem_internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/pixblockdsp.h" diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c index 851f16a31..786a46596 100644 --- a/libmpcodecs/vf_uspp.c +++ b/libmpcodecs/vf_uspp.c @@ -30,7 +30,7 @@ #include "mp_msg.h" #include "cpudetect.h" -#include "libavutil/mem.h" +#include "mpmem.h" #include "libavcodec/avcodec.h" #include "img_format.h" diff --git a/m_config.h b/m_config.h index 293717be5..553d2396d 100644 --- a/m_config.h +++ b/m_config.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_M_CONFIG_H #define MPLAYER_M_CONFIG_H -#include "libavutil/mem_internal.h" +#include "mpmem.h" /// \defgroup Config Config manager /// diff --git a/mpmem.h b/mpmem.h new file mode 100644 index 000000000..4f61c4d74 --- /dev/null +++ b/mpmem.h @@ -0,0 +1,89 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_MPMEM_H +#define MPLAYER_MPMEM_H + +// copy of libavutil/mem_internal.h code for the +// benefit of compiling against shared FFmpeg libs + +#include "config.h" + +#ifndef DECLARE_ALIGNED +#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ASM_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v +#elif defined(__DJGPP__) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v + #define DECLARE_ASM_ALIGNED(n,t,v) t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v + #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v +#elif defined(__GNUC__) || defined(__clang__) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ASM_ALIGNED(n,t,v) t av_used __attribute__ ((aligned (n))) v + #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v +#elif defined(_MSC_VER) + #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v +#else + #define DECLARE_ALIGNED(n,t,v) t v + #define DECLARE_ASM_ALIGNED(n,t,v) t v + #define DECLARE_ASM_CONST(n,t,v) static const t v +#endif +#endif + +// Some broken preprocessors need a second expansion +// to be forced to tokenize __VA_ARGS__ +#define E1(x) x + +#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ + uint8_t la_##v[sizeof(t s o) + (a)]; \ + t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) + +#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \ + DECLARE_ALIGNED(a, t, la_##v) s o; \ + t (*v) o = la_##v + +#define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__) + +#if HAVE_LOCAL_ALIGNED +# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,)) +#endif + +#if HAVE_LOCAL_ALIGNED +# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,)) +#endif + +#if HAVE_LOCAL_ALIGNED +# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,)) +#endif + +#if HAVE_LOCAL_ALIGNED +# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) +#else +# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,)) +#endif + +#endif /* MPLAYER_MPMEM_H */ diff --git a/sub/osd.c b/sub/osd.c index 879060e8f..f20b06095 100644 --- a/sub/osd.c +++ b/sub/osd.c @@ -28,7 +28,7 @@ #include "mp_msg.h" #include <inttypes.h> #include <stdlib.h> -#include "libavutil/mem_internal.h" +#include "mpmem.h" #include "libmpcodecs/img_format.h" #include "cpudetect.h" -- 2.30.0

1 1

[PATCH] Use public header libavutil/mem.h instead of an internal one
by Ingo Brückl 12 Feb '21

12 Feb '21

This fixes broken shared FFmpeg compilation since r38235. Index: libmpcodecs/vf_ow.c =================================================================== --- libmpcodecs/vf_ow.c (revision 38245) +++ libmpcodecs/vf_ow.c (working copy) @@ -32,7 +32,7 @@ #include <inttypes.h> #include <math.h> -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" #include "mp_msg.h" #include "img_format.h" #include "mp_image.h" Index: libmpcodecs/vf_spp.c =================================================================== --- libmpcodecs/vf_spp.c (revision 38245) +++ libmpcodecs/vf_spp.c (working copy) @@ -39,7 +39,7 @@ #include "libavutil/common.h" #include "libavutil/internal.h" -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/pixblockdsp.h" Index: m_config.h =================================================================== --- m_config.h (revision 38245) +++ m_config.h (working copy) @@ -19,7 +19,7 @@ #ifndef MPLAYER_M_CONFIG_H #define MPLAYER_M_CONFIG_H -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" /// \defgroup Config Config manager /// Index: sub/osd.c =================================================================== --- sub/osd.c (revision 38245) +++ sub/osd.c (working copy) @@ -28,7 +28,7 @@ #include "mp_msg.h" #include <inttypes.h> #include <stdlib.h> -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" #include "libmpcodecs/img_format.h" #include "cpudetect.h"

2 4

[MPlayer-cvslog] r38250 - in trunk: Makefile compatinc compatinc/unistd.h configure cpudetect.c inp
by Ingo Brückl 11 Feb '21

11 Feb '21

> Author: reimar > Date: Sun Feb 7 14:56:44 2021 > New Revision: 38250 > Log: > configure: Add basic support for compiling with MSVC. This breaks ./configure --enable-gui --disable-ffmpeg_a: Checking for assembler (cc ) ... failed (Upgrade binutils to 2.16.92 or use --disable-ssse3 etc.) Error: obsolete binutils version My binutils are 2.29.1, cc is gcc 4.9.3. Ingo

2 2

Debian packages of MPlayer skins
by Ingo Brückl 11 Feb '21

11 Feb '21

Hi. Although Debian finally updated the skin "Blue" from its ancient version 1.11 to 1.13, this remains the only skin available as a Debian package due to the lack of maintainers for all MPlayer packages. Although the skin is visually convincing, its character set (ASCII and nine glyphs from ISO-8859-2, ISO-8859-13 and ISO-8859-16) is limited - at least there should be alternatives. Since the process of becoming a Debian maintainer is extremely complex and time consuming, the easiest way would be to simply provide ready-to-use Debian packages from the actively maintained skins here at our site. I could create these packages, but am asking myself whether and how they would get into the mplayerhq.hu/MPlayer/skins directory. They could then simply be linked in the download section of the website. I am aware that this is not the best way to handle this. Is it even worth the effort? Ingo

2 3