November 2020 - MPlayer-cvslog - lists.mplayerhq.hu

r38203 - trunk/configure
by komh 30 Nov '20

30 Nov '20

Author: komh Date: Mon Nov 30 13:16:39 2020 New Revision: 38203 Log: configure: set minimum arch to i586 on --enable-runtime-cpudetection __atomic_fetch_add(__sync_fetch_and_add) builtin requires i586 at least. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Nov 1 17:07:49 2020 (r38202) +++ trunk/configure Mon Nov 30 13:16:39 2020 (r38203) @@ -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=""

1 0

r38195 - trunk/configure
by reimar 01 Nov '20

01 Nov '20

Author: reimar Date: Sun Aug 30 18:51:28 2020 New Revision: 38195 Log: configure: allow using --enable-runtime-cpudetection for Arm builds. This is mostly to allow undoing the effects of the previous patch which adds -march=native if it is not set Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Aug 30 18:27:41 2020 (r38194) +++ trunk/configure Sun Aug 30 18:51:28 2020 (r38195) @@ -1920,7 +1920,7 @@ fi echo "Detected operating system: $system_name" echo "Detected host architecture: $host_arch" -if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then +if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc && ! arm; then die "Runtime CPU detection only works for x86, x86-64 and PPC!" fi @@ -9716,6 +9716,14 @@ If you suspect a bug, please read DOCS/H EOF +if test "$_runtime_cpudetection" = yes && arm; then + cat << EOF +WARNING: --enable-runtime-cpudetection is not fully supported on Arm, +it only compiles for your compilers default target instead of the host +CPU (-match=native). +EOF +fi + if test "$warn_cflags" = yes; then cat <<EOF

3 2

r38202 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h stream/stream.h stream/stream_ffmpeg.c
by reimar 01 Nov '20

01 Nov '20

Author: reimar Date: Sun Nov 1 17:07:49 2020 New Revision: 38202 Log: stream_ffmpeg: add -lavfstreamopts option. Allows specifying options to ffmpeg-based streams. Modified: trunk/cfg-common.h trunk/stream/stream.h trunk/stream/stream_ffmpeg.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Nov 1 17:07:47 2020 (r38201) +++ trunk/cfg-common.h Sun Nov 1 17:07:49 2020 (r38202) @@ -546,6 +546,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}, Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Sun Nov 1 17:07:47 2020 (r38201) +++ trunk/stream/stream.h Sun Nov 1 17:07:49 2020 (r38202) @@ -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 Modified: trunk/stream/stream_ffmpeg.c ============================================================================== --- trunk/stream/stream_ffmpeg.c Sun Nov 1 17:07:47 2020 (r38201) +++ trunk/stream/stream_ffmpeg.c Sun Nov 1 17:07:49 2020 (r38202) @@ -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 { 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 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)

1 0

r38201 - in trunk: DOCS/man/en/mplayer.1 av_opts.c cfg-common.h libmpcodecs/vf_scale.c libmpcodecs/vf_scale.h
by reimar 01 Nov '20

01 Nov '20

Author: reimar Date: Sun Nov 1 17:07:47 2020 New Revision: 38201 Log: vf_scale: add generic libswscale options support. Allows setting any of the options exposed by libswscale, in particular for example source and destination colorspace range. Modified: trunk/av_opts.c trunk/cfg-common.h trunk/libmpcodecs/vf_scale.c trunk/libmpcodecs/vf_scale.h Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/av_opts.c ============================================================================== --- trunk/av_opts.c Sun Nov 1 17:07:45 2020 (r38200) +++ trunk/av_opts.c Sun Nov 1 17:07:47 2020 (r38201) @@ -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); Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Nov 1 17:07:45 2020 (r38200) +++ trunk/cfg-common.h Sun Nov 1 17:07:47 2020 (r38201) @@ -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}, Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c Sun Nov 1 17:07:45 2020 (r38200) +++ trunk/libmpcodecs/vf_scale.c Sun Nov 1 17:07:47 2020 (r38201) @@ -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, ch //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_getContextFromCmd { int flags; SwsFilter *dstFilterParam, *srcFilterParam; + struct SwsContext *ctx; enum AVPixelFormat dfmt, sfmt; dfmt = imgfmt2pixfmt(dstFormat); @@ -655,7 +659,26 @@ struct SwsContext *sws_getContextFromCmd 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 Modified: trunk/libmpcodecs/vf_scale.h ============================================================================== --- trunk/libmpcodecs/vf_scale.h Sun Nov 1 17:07:45 2020 (r38200) +++ trunk/libmpcodecs/vf_scale.h Sun Nov 1 17:07:47 2020 (r38201) @@ -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);

1 0

r38200 - trunk/configure
by reimar 01 Nov '20

01 Nov '20

Author: reimar Date: Sun Nov 1 17:07:45 2020 New Revision: 38200 Log: configure: Fix typo in warning message. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Nov 1 17:07:44 2020 (r38199) +++ trunk/configure Sun Nov 1 17:07:45 2020 (r38200) @@ -9722,7 +9722,7 @@ if test "$_runtime_cpudetection" = yes & cat << EOF WARNING: --enable-runtime-cpudetection is not fully supported on Arm, it only compiles for your compilers default target instead of the host -CPU (-match=native). +CPU (-march=native). EOF fi

1 0

r38199 - trunk/libmpcodecs/ad_spdif.c
by reimar 01 Nov '20

01 Nov '20

Author: reimar Date: Sun Nov 1 17:07:44 2020 New Revision: 38199 Log: ad_spdif: Use avformat_free_context to free context. This avoids memleaks and in newest FFmpeg versions also compile errors. Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Sun Oct 11 09:36:37 2020 (r38198) +++ trunk/libmpcodecs/ad_spdif.c Sun Nov 1 17:07:44 2020 (r38199) @@ -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); }

1 0