January 2020 - MPlayer-dev-eng - lists.mplayerhq.hu

[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

dav1d threading
by sylvain.bertrand＠gmail.com 25 Apr '20

25 Apr '20

Hi, I cannot decode in realtime av1 videos from youtube. After a bit of digging: dav1d is configured with only 1 thread for tiles decoding and only 1 thread for frames decoding. Is this a ffmpeg or mplayer configuration issue? regards, -- Sylvain

2 7

offer to include gopher protocol support
by Vincenzo Nicosia 02 Feb '20

02 Feb '20

Dear mplayer devs, I am contacting you to ask whether you would accept a patch to include gopher protocol support in mplayer. If you wonder "why on Earth we should we do that?", well, you would probably be surprised to know that there is still a lot of life in gopherspace, and a lot of multimedia content is shared via gopher (yes, I know it's 2020). I had a similar patch submitted and included in VLC recently, and support for gopher has been added in mpv as well by Leonardo Taccari. I have looked at the other stream modules in mplayer, and adding a stream_gopher.c looks quite easy. Would you accept a patch for that? Thanks in advance

6 14

[PATCH] stream: add fallback to ffmpeg for unknown streams
by Vincenzo Nicosia 17 Jan '20

17 Jan '20

Dear devs, please find attached a preliminary attempt to let open_stream_full fallback to ffmpeg if the url does not belong to any known scheme. This allows to open stuff like: mplayer gopher://bitreich.org/9/memecache/firewall.webm but instead of working just for gopher, it works for any scheme supported by ffmpeg (and not supported by any of the stream plugins enabled in mplayer). Comments are welcome. If the patch looks good to you, I will also add a patch to the manpage, so that the behaviour is appropriately documented. HND Index: stream/stream.c =================================================================== --- stream/stream.c (revision 38159) +++ stream/stream.c (working copy) @@ -38,6 +38,7 @@ #endif #include "mp_msg.h" +#include "mp_strings.h" #include "help_mp.h" #include "osdep/shmem.h" #include "osdep/timer.h" @@ -220,31 +221,41 @@ stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format) { int i,j; + char first=1; + char *fname; + fname=mp_asprintf("%s", filename); + +retry: for(i = 0 ; auto_open_streams[i] ; i++) { const stream_info_t *sinfo = auto_open_streams[i]; for(j = 0 ; sinfo->protocols[j] ; j++) { int l = strlen(sinfo->protocols[j]); // l == 0 => Don't do protocol matching (ie network and filenames) - if((l == 0 && !strstr(filename, "://")) || - ((strncasecmp(sinfo->protocols[j],filename,l) == 0) && - (strncmp("://",filename+l,3) == 0))) { + if((l == 0 && !strstr(fname, "://")) || + ((strncasecmp(sinfo->protocols[j],fname,l) == 0) && + (strncmp("://",fname+l,3) == 0))) { int r; char *redirected_url = NULL; stream_t* s; *file_format = DEMUXER_TYPE_UNKNOWN; - s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r, + s = open_stream_plugin(sinfo,fname,mode,options,file_format,&r, &redirected_url); - if(s) return s; + if(s) { + free(fname); + return s; + } if(r == STREAM_REDIRECTED && redirected_url) { mp_msg(MSGT_OPEN,MSGL_V, "[%s] open %s redirected to %s\n", - sinfo->info, filename, redirected_url); + sinfo->info, fname, redirected_url); s = open_stream_full(redirected_url, mode, options, file_format); free(redirected_url); + free(fname); return s; } else if(r != STREAM_UNSUPPORTED) { - mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); + mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,fname); + free(fname); return NULL; } break; @@ -251,7 +262,17 @@ } } } - +#ifdef CONFIG_FFMPEG + /* If everything else failed, make a last try via ffmpeg */ + if (first){ + first=0; + free(fname); + fname=mp_asprintf("ffmpeg://%s",filename); + mp_msg(MSGT_OPEN,MSGL_WARN, "No stream plugin matched. Trying via ffmpeg now\n"); + goto retry; + } +#endif + free(fname); mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_StreamCantHandleURL,filename); return NULL; }

3 5

[PATCH 0/2] configure: Detect AV1 libs
by Alexander Strasser 15 Jan '20

15 Jan '20

This is a follow up patch set to the codecs.conf patches I already committed. It will detect the AV1 libs and automatically enable them when building with internal FFmpeg. Not exactly sure if libaom should be autodetected, but I guess it's better than having no AV1 support at all. Testers and comments welcome! If I hear no comments I will intent to commit somewhen this weekend. Alexander Strasser (2): configure: Detect libdav1d and enable the lavc libdav1d decoder configure: Detect libaom and enable the lavc libaom-av1 decoder configure | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) --

1 4