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

[PATCH] Have sndio check use the pkg-config file
by Brad Smith 27 Mar '22

27 Mar '22

Have the sndio check use the pkg-config file. BTW, looking at other examples to take inspiration for this I noticed the Pulse and JACK bits use libs_mplayer vs extra_ldflags and echores is higher up. Little inconsistencies are kind of annoying when looking at code to get an idea of how to do things. Index: configure =================================================================== --- configure (revision 38348) +++ configure (working copy) @@ -6358,12 +6358,16 @@ echocheck "sndio audio" if test "$_sndio" = auto ; then _sndio=no - statement_check sndio.h 'sio_open(SIO_DEVANY, SIO_PLAY, 0)' -lsndio && _sndio=yes + if $_pkg_config --exists 'sndio' ; then + header_check sndio.h $($_pkg_config --libs --cflags sndio) && + _sndio=yes + fi fi if test "$_sndio" = yes ; then def_sndio='#define CONFIG_SNDIO_AUDIO 1' aomodules="sndio $aomodules" - extra_ldflags="$extra_ldflags -lsndio" + extra_ldflags="$extra_ldflags $($_pkg_config --libs sndio)" + extra_cflags="$extra_cflags $($_pkg_config --cflags sndio)" else def_sndio='#undef CONFIG_SNDIO_AUDIO' noaomodules="sndio $noaomodules"

2 5

Re: [MPlayer-dev-eng] [MPlayer-users] [feature request] subtitles in separate window or console
by Reimar Döffinger 28 Feb '22

28 Feb '22

> On 1 Feb 2022, at 18:49, Nicolas George <george(a)nsup.org> wrote: > > Reimar Döffinger (12022-02-01): >> But it seem a very special feature to add an option or something for it really... > > I agree. > > On the other hand, an option to send the subtitles to -identify output > would rather make sense I thin, and it would allow to implement the > feature easily. Patch to just always send subtitle text to -identify, without extra option. Does that seem reasonable?

4 8

[PATCH] add initial RISC-V support
by Brad Smith 27 Feb '22

27 Feb '22

OpenBSD only supports riscv64 but this is an attempt at adding some of the initial bits for RISC-V support. Index: configure =================================================================== --- configure (revision 38313) +++ configure (working copy) @@ -289,6 +289,13 @@ esac } +riscv() { + case "$host_arch" in + riscv*) return 0;; + *) return 1;; + esac +} + # Use this before starting a check echocheck() { echo "============ Checking for $@ ============" >> "$TMPLOG" @@ -1991,7 +1998,10 @@ if arm ; then cc_check && host_arch=aarch64 || host_arch=arm fi +if riscv ; then + cc_check && host_arch=riscv64 || host_arch=riscv32 fi +fi echo "Detected operating system: $system_name" echo "Detected host architecture: $host_arch" @@ -2836,6 +2846,15 @@ iproc='arc' ;; + riscv*) + arch='riscv' + iproc='riscv' + + if test "$host_arch" = "riscv64" ; then + def_fast_64bit='#define HAVE_FAST_64BIT 1' + fi + ;; + *) echo "The architecture of your CPU ($host_arch) is not supported by this configure script" echo "It seems nobody has ported MPlayer to your OS or CPU type yet."

3 2

configure: use case instead of grep
by Reimar Döffinger 27 Feb '22

27 Feb '22

Replace the grep with a case. This is about 20% faster on macOS and 3x faster in WSL1 on Windows. (sorry for not quite right email format, on the wrong computer ATM)

2 2

Fix display of ASS subtitles
by Oneric 27 Feb '22

27 Feb '22

Some parts of ASS depend on the video’s storage size, so libass needs to be told about this via ass_set_storage_size (which is already available in the vendored version in mplayer). Can be tested on e.g. the files found here: https://code.videolan.org/videolan/vlc/uploads/b54e0761d0d3f4f79b2947ffb83a… Index: sub/ass_mp.c =================================================================== --- sub/ass_mp.c (revision 38348) +++ sub/ass_mp.c (working copy) @@ -340,6 +340,7 @@ ass_configure(ass_renderer, res->w, res->h, res->unscaled); ass_set_margins(ass_renderer, res->mt + ass_top_margin, res->mb + ass_bottom_margin, res->ml, res->mr); ass_set_aspect_ratio(ass_renderer, dar, (double)res->srcw / res->srch); + ass_set_storage_size(ass_renderer, res->srcw, res->srch); src->initialized = 1; ass_force_reload = 0; }

2 1

Release prep
by Reimar Döffinger 25 Feb '22

25 Feb '22

Hello everyone! Me and Alexander discussed that it's high time to prepare a release, e.g. to get the FFmpeg compatibility updates out there. Please reach out if there's something you want to get in before. One of the last things on my list I'm currently debugging is fixing buggy video with retina displays on MacOS. Thanks, Reimar

2 1

[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

[PATCH 1/4] libmpdemux/mf: Replace sprintf by mp_asprintf
by Alexander Strasser 24 Feb '22

24 Feb '22

It's not a good idea to use sprintf. Especially in this case where the format string is supplied by the user. Signed-off-by: Alexander Strasser <eclipse7(a)gmx.net> --- libmpdemux/mf.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index 7cdd533d7..d4f5be98b 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -37,6 +37,7 @@ #include "mp_msg.h" #include "help_mp.h" #include "stream/stream.h" +#include "mp_strings.h" #include "mf.h" @@ -110,10 +111,10 @@ mf_t* open_mf(char * filename){ goto exit_mf; } - fname=malloc( strlen( filename ) + 32 ); - if ( !strchr( filename,'%' ) ) { + fname=malloc( strlen( filename ) + 32 ); + strcpy( fname,filename ); if ( !strchr( filename,'*' ) ) strcat( fname,"*" ); @@ -142,19 +143,23 @@ mf_t* open_mf(char * filename){ while ( error_count < 5 ) { - sprintf( fname,filename,count++ ); + fname = mp_asprintf( filename,count++ ); + if ( stat( fname,&fs ) ) { error_count++; mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname ); + free(fname); } else { mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) ); - mf->names[mf->nr_of_files]=strdup( fname ); + mf->names[mf->nr_of_files]=fname; // mp_msg( MSGT_STREAM,MSGL_V,"[mf] added file %d.: %s\n",mf->nr_of_files,mf->names[mf->nr_of_files] ); mf->nr_of_files++; } + + fname = NULL; } mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files ); --

2 6

[PATCH] Remove OSS support for OpenBSD
by Brad Smith 23 Feb '22

23 Feb '22

Garbage collect the OSS bits for OpenBSD support. OpenBSD has not used OSS for a long time. Index: configure =================================================================== --- configure (revision 38331) +++ configure (working copy) @@ -4438,19 +4438,12 @@ echocheck "soundcard.h" _soundcard_h=no -def_soundcard_h='#undef HAVE_SOUNDCARD_H' def_sys_soundcard_h='#undef HAVE_SYS_SOUNDCARD_H' -for _soundcard_header in "sys/soundcard.h" "soundcard.h"; do - header_check $_soundcard_header && _soundcard_h=yes && - res_comment="$_soundcard_header" && break -done +header_check sys/soundcard.h && _soundcard_h=yes && + res_comment="sys/soundcard.h" if test "$_soundcard_h" = yes ; then - if test $_soundcard_header = "sys/soundcard.h"; then - def_sys_soundcard_h='#define HAVE_SYS_SOUNDCARD_H 1' - else - def_soundcard_h='#define HAVE_SOUNDCARD_H 1' - fi + def_sys_soundcard_h='#define HAVE_SYS_SOUNDCARD_H 1' fi echores "$_soundcard_h" @@ -6113,17 +6106,17 @@ echocheck "OSS Audio" if test "$_ossaudio" = auto ; then _ossaudio=no - return_check $_soundcard_header SNDCTL_DSP_SETFRAGMENT && _ossaudio=yes + return_check sys/soundcard.h SNDCTL_DSP_SETFRAGMENT && _ossaudio=yes fi if test "$_ossaudio" = yes ; then def_ossaudio='#define CONFIG_OSS_AUDIO 1' aomodules="oss $aomodules" _real_ossaudio=no - cpp_condition_check "$_soundcard_header" OPEN_SOUND_SYSTEM && + cpp_condition_check "sys/soundcard.h" OPEN_SOUND_SYSTEM && _real_ossaudio=yes if test "$_real_ossaudio" = yes; then def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' - elif netbsd || openbsd ; then + elif netbsd ; then def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' extra_ldflags="$extra_ldflags -lossaudio" else @@ -9213,7 +9206,6 @@ $def_malloc_h $def_mman_h $def_mman_has_map_failed -$def_soundcard_h $def_sys_soundcard_h $def_sys_sysinfo_h $def_sys_videoio_h Index: libao2/ao_oss.c =================================================================== --- libao2/ao_oss.c (revision 38331) +++ libao2/ao_oss.c (working copy) @@ -38,11 +38,7 @@ #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> -#else -#ifdef HAVE_SOUNDCARD_H -#include <soundcard.h> #endif -#endif #include "libaf/af_format.h" Index: stream/ai_oss.c =================================================================== --- stream/ai_oss.c (revision 38331) +++ stream/ai_oss.c (working copy) @@ -29,12 +29,8 @@ #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> #else -#ifdef HAVE_SOUNDCARD_H -#include <soundcard.h> -#else #include <linux/soundcard.h> #endif -#endif #include "audio_in.h" #include "mp_msg.h" Index: stream/stream_radio.c =================================================================== --- stream/stream_radio.c (revision 38331) +++ stream/stream_radio.c (working copy) @@ -71,12 +71,8 @@ #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> #else -#ifdef HAVE_SOUNDCARD_H -#include <soundcard.h> -#else #include <linux/soundcard.h> #endif -#endif #endif Index: stream/tvi_bsdbt848.c =================================================================== --- stream/tvi_bsdbt848.c (revision 38331) +++ stream/tvi_bsdbt848.c (working copy) @@ -70,12 +70,8 @@ #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> #else -#ifdef HAVE_SOUNDCARD_H -#include <soundcard.h> -#else #include <machine/soundcard.h> #endif -#endif #include "libaf/af_format.h" #include "libmpcodecs/img_format.h"

2 2

[PATCH] Fix building with Clang
by Brad Smith 18 Feb '22

18 Feb '22

Fix building with Clang. ./stream/stream.h:322:46: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%"PRIX64"\n", pos); ^ ./stream/stream.h:326:49: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] "Invalid seek to negative position %"PRIx64"!\n", pos); ^ Index: stream/stream.h =================================================================== --- stream/stream.h (revision 38327) +++ stream/stream.h (working copy) @@ -319,11 +319,11 @@ static inline int stream_seek(stream_t *s, int64_t pos) { - mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%"PRIX64"\n", pos); + mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%" PRIX64 "\n", pos); if (pos < 0) { mp_msg(MSGT_DEMUX, MSGL_ERR, - "Invalid seek to negative position %"PRIx64"!\n", pos); + "Invalid seek to negative position %" PRIx64 "!\n", pos); pos = 0; } if (s->buf_len == 0 && s->pos == pos)

2 8