December 2019 - 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

unsubscribe
by Can Wu 28 Dec '19

28 Dec '19

unsubscribe

1 0

[RFC] Move away from SVN
by Alexander Strasser 27 Dec '19

27 Dec '19

Hi all! Every now and than I think we should move away from Subversion. While from the versioning perspective SVN gives us all we need on the server side, it's kind of hassle to work with. I exclusively use Git locally nowadays. So switching into Subversion only to do the final MPlayer commits is a bit annoying; even more so if new files were added or existing files deleted. Additionally for the releasing procedure knowledge of the Subversion branching is needed. For potential new contributors the SVN might also not be very attractive, and we don't advertise the git mirror repo much I think. For the short term I think we have more important tasks to do, but for me it seems like a goal we should tackle soon, also because it simplifies some background work. What do you think? Alexander

4 3

[PATCH 0/3] codecs.conf: AV1 and version bump
by Alexander Strasser 24 Dec '19

24 Dec '19

Hi all! Here is a small patch set to update codecs.conf for AV1. I intend to commit soonish. Comments and testers welcome! I'm working on updating configure, so those decoders will be automatically enabled for embedded FFmpeg if the needed libs are found. Alexander Strasser (3): codecs.conf: Add AV1 decoder dav1d via FFmpeg codecs.conf: Add AOM AV1 decoder via FFmpeg codecs.conf: Bump version etc/codecs.conf | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) -- Alexander

2 5

ffmpeg av1 decoding with dav1d
by sylvain.bertrand＠gmail.com 04 Dec '19

04 Dec '19

Hi, I made a build of a recent snapshot of mplayer with a git ffmpeg where I did enable av1 decoding using dav1d. It seems mplayer misses codecs.conf entries for av1. I did copy grossely the libvpxvp9 codecs.conf section: videocodec fflibdav1d info "FFmpeg libdav1d" status working ; mkv format 0x31307661 ; mp4 format 0x31305641 driver ffmpeg dll libdav1d out YV12,420P10,420P12 out 422P,422P10,422P12 out 440P,440P10,440P12 out 444P,444P10,444P12 out GBR10P,GBR12P,GBR24P Then I could read youtube av1 encoded test videos from https://www.youtube.com/playlist?list=PLyqf6gJt7KuHBmeVzZteZUlNUQAVLwrZS downloaded with youtube-dl (which uses an av1/dav1d enabled ffmpeg build for mkv remuxing) Could an experienced dev with commit access add proper av1 entries in the built-in codecs.conf of mplayer? thx and best regards, -- Sylvain

2 2