October 2020 - 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] configure: set minimum arch to i586 on --enable-runtime-cpudetection
by KO Myung-Hun 30 Nov '20

30 Nov '20

__atomic_fecth_add(___sync_fetch_and_add) builtin requires i586 at least. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1882f208c..4b8ec235f 100755 --- a/configure +++ b/configure @@ -2291,8 +2291,8 @@ case "$host_arch" in fi else # if test "$_runtime_cpudetection" = no _mcpu="$cpuopt=generic" - # at least i486 required, for bswap instruction - _march="-march=i486" + # at least i586 required, for __atomic_fetch_add builtin + _march="-march=i586" cflag_check $_mcpu || _mcpu="$cpuopt=i686" cflag_check $_mcpu || _mcpu="" cflag_check $_march $_mcpu || _march="" -- 2.22.0

2 2

[PATCH] ad_spdif: Use avformat_free_context to free context.
by Reimar Döffinger 01 Nov '20

01 Nov '20

This avoids memleaks and in newest FFmpeg versions also compile errors. --- libmpcodecs/ad_spdif.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c index 1fc237b6d..8ee472429 100644 --- a/libmpcodecs/ad_spdif.c +++ b/libmpcodecs/ad_spdif.c @@ -298,14 +298,8 @@ static void uninit(sh_audio_t *sh) if (spdif_ctx->header_written) av_write_trailer(lavf_ctx); av_freep(&lavf_ctx->pb); - if (lavf_ctx->streams) { - av_freep(&lavf_ctx->streams[0]->codec); - av_freep(&lavf_ctx->streams[0]->info); - av_freep(&lavf_ctx->streams[0]); - } - av_freep(&lavf_ctx->streams); - av_freep(&lavf_ctx->priv_data); + avformat_free_context(lavf_ctx); + lavf_ctx = NULL; } - av_freep(&lavf_ctx); av_freep(&spdif_ctx); } -- 2.29.1

2 2

[PATCH] vf_scale: add generic libswscale options support.
by Reimar Döffinger 01 Nov '20

01 Nov '20

Allows setting any of the options exposed by libswscale, in particular for example source and destination colorspace range. --- DOCS/man/en/mplayer.1 | 5 +++++ av_opts.c | 6 ++++++ cfg-common.h | 1 + libmpcodecs/vf_scale.c | 25 ++++++++++++++++++++++++- libmpcodecs/vf_scale.h | 1 + 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 7c01ca2c8..8e28024de 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -5405,6 +5405,11 @@ The description of the scale video filter has further information. .RE . .TP +.B \-swsopts <software scaler options> +Specify advanced software scaler options provided by libswscale. +Set to "help" to get a list of supported options. +. +.TP .B \-vc <[\-|+]codec1,[\-|+]codec2,...[,]> Specify a priority list of video codecs to be used, according to their codec name in codecs.conf. diff --git a/av_opts.c b/av_opts.c index e10e92e90..30e049db2 100644 --- a/av_opts.c +++ b/av_opts.c @@ -30,6 +30,12 @@ int parse_avopts(void *v, char *str){ if (!v) return -1; + if (!str) + return 0; + if (strcmp(str, "help") == 0) { + av_opt_show2(v, NULL, -1, 0); + return -1; + } start= str= strdup(str); diff --git a/cfg-common.h b/cfg-common.h index ca4e9c9cb..bfb815790 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -521,6 +521,7 @@ const m_option_t common_opts[] = { // scaling: {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, + {"swsopts", &sws_opts, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL}, diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index ef50261ea..e48a2ad45 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -32,9 +32,11 @@ #include "fmt-conversion.h" #include "mpbswap.h" +#include "libavutil/opt.h" #include "libswscale/swscale.h" #include "vf_scale.h" +#include "av_opts.h" #include "m_option.h" #include "m_struct.h" @@ -588,6 +590,7 @@ static int vf_open(vf_instance_t *vf, char *args){ //global sws_flags from the command line int sws_flags=2; +char *sws_opts; //global srcFilter static SwsFilter *src_filter= NULL; @@ -648,6 +651,7 @@ struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, { int flags; SwsFilter *dstFilterParam, *srcFilterParam; + struct SwsContext *ctx; enum AVPixelFormat dfmt, sfmt; dfmt = imgfmt2pixfmt(dstFormat); @@ -655,7 +659,26 @@ struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8; sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam); - return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags, srcFilterParam, dstFilterParam, NULL); + ctx = sws_alloc_context(); + if (!ctx) return NULL; + // set it first to allow swsopts to override/add to it + av_opt_set_int(ctx, "sws_flags", flags, 0); + if (parse_avopts(ctx, sws_opts) < 0) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "Your options /%s/ look like gibberish to me pal.\n", sws_opts); + return NULL; + } + // always override these + av_opt_set_int(ctx, "srcw", srcW, 0); + av_opt_set_int(ctx, "srch", srcH, 0); + av_opt_set_int(ctx, "src_format", sfmt, 0); + av_opt_set_int(ctx, "dstw", dstW, 0); + av_opt_set_int(ctx, "dsth", dstH, 0); + av_opt_set_int(ctx, "dst_format", dfmt, 0); + if (sws_init_context(ctx, srcFilterParam, dstFilterParam) < 0) { + sws_freeContext(ctx); + return NULL; + } + return ctx; } /// An example of presets usage diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h index 4de3b48ec..5890b5713 100644 --- a/libmpcodecs/vf_scale.h +++ b/libmpcodecs/vf_scale.h @@ -28,6 +28,7 @@ extern float sws_chr_sharpen; extern float sws_lum_sharpen; extern int sws_flags; +extern char *sws_opts; struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); -- 2.28.0

1 1

[PATCH] stream_ffmpeg: add -lavfstreamopts option.
by Reimar Döffinger 01 Nov '20

01 Nov '20

Allows specifying options to ffmpeg-based streams. --- DOCS/man/en/mplayer.1 | 4 ++++ cfg-common.h | 1 + stream/stream.h | 1 + stream/stream_ffmpeg.c | 19 ++++++++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 2a143cb..d8e9b3b 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -1806,6 +1806,10 @@ Skip the proxy for IPv6 addresses. It will still be used for IPv4 connections. . .TP +.B \-lavfstreamopts <options> +Specify extra options for libavformat based streams. +. +.TP .B \-loadidx <index file> The file from which to read the video index data saved by \-saveidx. This index will be used for seeking, overriding any index data diff --git a/cfg-common.h b/cfg-common.h index 3a422cf..ca4e9c9 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -545,6 +545,7 @@ const m_option_t common_opts[] = { #ifdef CONFIG_FFMPEG {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"lavfstreamopts", &lavfstreamopts, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif #ifdef CONFIG_XVID4 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, diff --git a/stream/stream.h b/stream/stream.h index 615f579..388c353 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -392,6 +392,7 @@ extern char *dvd_device; extern const m_option_t dvbin_opts_conf[]; extern char *rtsp_destination; +extern char *lavfstreamopts; typedef struct { int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index 57d45e4..1883af3 100644 --- a/stream/stream_ffmpeg.c +++ b/stream/stream_ffmpeg.c @@ -27,6 +27,8 @@ #include "av_helpers.h" #include "libmpdemux/demuxer.h" +char *lavfstreamopts; + static int fill_buffer(stream_t *s, char *buffer, int max_len) { int r = avio_read(s->priv, buffer, max_len); @@ -90,6 +92,7 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) { int flags = 0; const char *filename; + AVDictionary *avopts = NULL; AVIOContext *ctx = NULL; int res = STREAM_ERROR; int64_t size; @@ -125,9 +128,23 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) dummy = !strncmp(filename, "rtsp:", 5) || !strncmp(filename, "dummy:", 6); mp_msg(MSGT_OPEN, MSGL_V, "[ffmpeg] Opening %s\n", filename); - if (!dummy && avio_open(&ctx, filename, flags) < 0) + if (lavfstreamopts && av_dict_parse_string(&avopts, lavfstreamopts, "=", ",", 0) < 0) { + mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavfstreamopts); + goto out; + } + + if (!dummy && avio_open2(&ctx, filename, flags, NULL, &avopts) < 0) goto out; + if (!dummy && av_dict_count(avopts)) { + AVDictionaryEntry *e = NULL; + while ((e = av_dict_get(avopts, "", e, AV_DICT_IGNORE_SUFFIX))) { + mp_msg(MSGT_HEADER,MSGL_ERR,"Unknown option %s\n", e->key); + } + goto out; + } + av_dict_free(&avopts); + stream->priv = ctx; size = dummy ? 0 : avio_size(ctx); if (size >= 0) -- 2.7.0

1 1

Re: [MPlayer-dev-eng] [MPlayer-cvslog] r38194 - trunk/configure
by Alexander Strasser 01 Nov '20

01 Nov '20

On 2020-08-30 18:27 +0300, reimar wrote: > Author: reimar > Date: Sun Aug 30 18:27:41 2020 > New Revision: 38194 > > Log: > configure: Fix arm CPU extension selection > > If runtime cpudetection is off, we need to set all of > march, mcpu and mfpu. > Otherwise compiling on e.g. Rasbian will result in > a build with no NEON support even when the CPU > supports it. > > Modified: > trunk/configure > > Modified: trunk/configure > ============================================================================== > --- trunk/configure Sat Aug 22 00:13:38 2020 (r38193) > +++ trunk/configure Sun Aug 30 18:27:41 2020 (r38194) > @@ -2478,6 +2478,9 @@ case "$host_arch" in > aarch64) > arch='aarch64' > iproc='aarch64' > + if test "$_runtime_cpudetection" = no ; then > + cflag_check -march=native -mcpu=native -mfpu=auto && _march="-march=native -mcpu=native -mfpu=auto" > + fi > ;; > > arm*) > @@ -2487,6 +2490,9 @@ case "$host_arch" in > def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' > def_local_aligned='#define HAVE_LOCAL_ALIGNED 1' > test $_fast_clz = "auto" && _fast_clz=yes > + if test "$_runtime_cpudetection" = no ; then > + cflag_check -march=native -mcpu=native -mfpu=auto && _march="-march=native -mcpu=native -mfpu=auto" > + fi > ;; > > avr32) > @@ -9416,8 +9422,11 @@ $def_openssl > #define CONFIG_VAAPI 0 > > #define HAVE_ALIGNED_STACK 1 > +#define HAVE_AS_ARCH_DIRECTIVE 1 > #define HAVE_AS_DN_DIRECTIVE 1 > +#define HAVE_AS_FPU_DIRECTIVE 1 > #define HAVE_AS_FUNC 1 > +#define HAVE_AS_OBJECT_ARCH 1 These changes seem a bit underrepresented in the commit message. Are they necessary for a good and optimized ARM build? > #define HAVE_ASM_MOD_Q 1 > #define HAVE_ATOMICS_GCC 1 > #define HAVE_COPYSIGN 1 Alexander

2 1

[PATCH] ad_spdif: Use avformat_free_context to free context.
by Reimar Döffinger 31 Oct '20

31 Oct '20

This avoids memleaks and in newest FFmpeg versions also compile errors. --- libmpcodecs/ad_spdif.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c index 1fc237b6d..8ee472429 100644 --- a/libmpcodecs/ad_spdif.c +++ b/libmpcodecs/ad_spdif.c @@ -298,14 +298,8 @@ static void uninit(sh_audio_t *sh) if (spdif_ctx->header_written) av_write_trailer(lavf_ctx); av_freep(&lavf_ctx->pb); - if (lavf_ctx->streams) { - av_freep(&lavf_ctx->streams[0]->codec); - av_freep(&lavf_ctx->streams[0]->info); - av_freep(&lavf_ctx->streams[0]); - } - av_freep(&lavf_ctx->streams); - av_freep(&lavf_ctx->priv_data); + avformat_free_context(lavf_ctx); + lavf_ctx = NULL; } - av_freep(&lavf_ctx); av_freep(&spdif_ctx); } -- 2.29.1

2 1